gruntfile fix and responsive fix (removed viewport meta)

arthur-adriansens · Jan 1, 2024 · d83d3c9 · d83d3c9
1 parent 613a8d1
commit d83d3c9
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -47,6 +47,12 @@ module.exports = function (grunt) {
                 src: "admin_error.html",
                 dest: "public/",
             },
+            css_dark_mode: {
+                expand: true,
+                cwd: "src/",
+                src: "style-dark.css",
+                dest: "public/",
+            },
             // alpina: {
             //     expand: true,
             //     cwd: "src/js/",
@@ -84,9 +90,21 @@ module.exports = function (grunt) {
                         to: "",
                     },
                     {
-                        from: /<script src="\.[\/\\]js[\/\\]setup\.js"><\/script>\n\s+<script src="\.[\/\\]js[\/\\]tetris\.js"><\/script>\n\s+<script src="\.[\/\\]js[\/\\]pieces\.js"><\/script>/g,
+                        from: '<script src="js/setup.js"></script>',
+                        to: '<script src="tetris.js"></script>',
+                    },
+                    {
+                        from: '<script src="js/setup.js"></script>',
                         to: '<script src="tetris.js"></script>',
                     },
+                    {
+                        from: '<script src="js/game.js"></script>',
+                        to: "",
+                    },
+                    {
+                        from: '<script src="js/piece.js"></script>',
+                        to: "",
+                    },
                     {
                         from: '<div class="scores"></div>',
                         to: `<div class="scores"><ol>{{#if scores}}{{#each scores}}<li><b>{{this.username}}</b>: {{this.highscore}}</li>{{/each}}{{else}}<li style="list-style: none;"><i>It seems like you're first!</i></li>{{/if}}</ol></div>`,

diff --git a/package.json b/package.json
@@ -12,8 +12,8 @@
         "@fastify/formbody": "^7.4.0",
         "@fastify/static": "^6.12.0",
         "@fastify/view": "^8.2.0",
-        "axios": "^1.6.2",
-        "fastify": "^4.24.3",
+        "axios": "^1.6.3",
+        "fastify": "^4.25.2",
         "grunt": "^1.6.1",
         "grunt-contrib-clean": "^2.0.1",
         "grunt-contrib-concat": "^2.1.0",

diff --git a/src/style.css b/src/style.css
@@ -210,7 +210,7 @@ p {
 }
 
 .right.column>div {
-    border-right: none;
+    border-right: none !important;
     border-bottom-right-radius: 0px;
     border-top-right-radius: 0px;
 }