From 3dbd83ac47f88e8160a5f542b044ae8bcd001fa8 Mon Sep 17 00:00:00 2001 From: Anton Bracke Date: Fri, 11 Feb 2022 15:47:17 +0100 Subject: [PATCH 1/4] load nes.css from npm --- front/dist/index.tmpl.html.tmp | 126 +++++++++++++++++++++++++++++++++ front/package.json | 1 + front/style/fonts.scss | 1 + front/yarn.lock | 5 ++ 4 files changed, 133 insertions(+) create mode 100644 front/dist/index.tmpl.html.tmp diff --git a/front/dist/index.tmpl.html.tmp b/front/dist/index.tmpl.html.tmp new file mode 100644 index 00000000..7a3e210d --- /dev/null +++ b/front/dist/index.tmpl.html.tmp @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WorkAdventure + + +
+ +
+
+
+
+
+ + +
+
+
+ +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+
+ +
+
+ + +
+
+
+ +
+
+
+ +
+
+ + +
+
+
+
+
+
+
+
+
+ + +
+
+ +
+
+ +
+
+ + + + diff --git a/front/package.json b/front/package.json index 86308a89..dee82314 100644 --- a/front/package.json +++ b/front/package.json @@ -42,6 +42,7 @@ "webpack-dev-server": "^3.11.2" }, "dependencies": { + "@16bits/nes.css": "^2.3.2", "@fontsource/press-start-2p": "^4.3.0", "@joeattardi/emoji-button": "^4.6.2", "@types/simple-peer": "^9.11.1", diff --git a/front/style/fonts.scss b/front/style/fonts.scss index a49d3967..7a13ab49 100644 --- a/front/style/fonts.scss +++ b/front/style/fonts.scss @@ -1,4 +1,5 @@ @import "~@fontsource/press-start-2p/index.css"; +@import "~@16bits/nes.css/css/nes.min.css"; *{ font-family: PixelFont-7,monospace; diff --git a/front/yarn.lock b/front/yarn.lock index 3572e44b..3d3aa530 100644 --- a/front/yarn.lock +++ b/front/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@16bits/nes.css@^2.3.2": + version "2.3.2" + resolved "https://registry.yarnpkg.com/@16bits/nes.css/-/nes.css-2.3.2.tgz#e69db834119b33ae8d3cb044f106a07a17cadd6f" + integrity sha512-nEM5PIth+Bab5JSOa4uUR+PMNUsNTYxA55oVlG3gXI/4LoYtWS767Uv9Pu/KCbHXVvnIjt4ZXt13kZw3083qTw== + "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" From 51f7ce10e18b3e3783b48fdd94b5349744d73542 Mon Sep 17 00:00:00 2001 From: Anton Bracke Date: Fri, 11 Feb 2022 15:53:52 +0100 Subject: [PATCH 2/4] remove extenal quill import --- front/src/Components/Menu/TextGlobalMessage.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/Components/Menu/TextGlobalMessage.svelte b/front/src/Components/Menu/TextGlobalMessage.svelte index ec3e7039..be6a57a4 100644 --- a/front/src/Components/Menu/TextGlobalMessage.svelte +++ b/front/src/Components/Menu/TextGlobalMessage.svelte @@ -78,5 +78,5 @@ From 948a674bb2ff0c594106e2bf40205f804f2e4db0 Mon Sep 17 00:00:00 2001 From: Anton Bracke Date: Fri, 11 Feb 2022 16:17:17 +0100 Subject: [PATCH 3/4] use correct file --- front/dist/index.ejs | 1 - front/dist/index.tmpl.html.tmp | 126 --------------------------------- 2 files changed, 127 deletions(-) delete mode 100644 front/dist/index.tmpl.html.tmp diff --git a/front/dist/index.ejs b/front/dist/index.ejs index 07732877..11d33ad0 100644 --- a/front/dist/index.ejs +++ b/front/dist/index.ejs @@ -29,7 +29,6 @@ - WorkAdventure diff --git a/front/dist/index.tmpl.html.tmp b/front/dist/index.tmpl.html.tmp deleted file mode 100644 index 7a3e210d..00000000 --- a/front/dist/index.tmpl.html.tmp +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WorkAdventure - - -
- -
-
-
-
-
- - -
-
-
- -
-
-
-
- -
-
- - -
-
-
- -
-
-
- -
-
- - -
-
-
- -
-
-
- -
-
- - -
-
-
-
-
-
-
-
-
- - -
-
- -
-
- -
-
- - - - From aef64afdb9476a3aadc03400ca8f1e1d12f05ee6 Mon Sep 17 00:00:00 2001 From: Anton Bracke Date: Sun, 13 Feb 2022 20:20:38 +0100 Subject: [PATCH 4/4] fix quill import --- front/src/Components/Menu/TextGlobalMessage.svelte | 4 ---- front/style/TextGlobalMessageSvelte-Style.scss | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/front/src/Components/Menu/TextGlobalMessage.svelte b/front/src/Components/Menu/TextGlobalMessage.svelte index be6a57a4..6b42e42e 100644 --- a/front/src/Components/Menu/TextGlobalMessage.svelte +++ b/front/src/Components/Menu/TextGlobalMessage.svelte @@ -76,7 +76,3 @@
- - diff --git a/front/style/TextGlobalMessageSvelte-Style.scss b/front/style/TextGlobalMessageSvelte-Style.scss index 4baa8c8a..94baa67a 100644 --- a/front/style/TextGlobalMessageSvelte-Style.scss +++ b/front/style/TextGlobalMessageSvelte-Style.scss @@ -1,4 +1,8 @@ //TextGlobalMessage + +// TODO: load on demand with TextGlobalMessage component +@import "quill/dist/quill.snow.css"; + section.section-input-send-text { --height-toolbar: 20%; height: 100%;