From f3dde87cd293e8a6a0c534338c2f45b0d2be1912 Mon Sep 17 00:00:00 2001 From: TurtIeSocks <58572875+TurtIeSocks@users.noreply.github.com> Date: Wed, 12 Oct 2022 10:11:36 -0400 Subject: [PATCH] Fix Holiday Animations - For some reason I needed to move the holiday-canvas div to the html template instead of in React... - Reported by @ReuschelCGN - Also lints html/css files, oops --- package.json | 4 +- public/index.html | 144 +++++++++++++++++++++---------------- src/assets/css/holiday.css | 8 ++- src/assets/css/loading.css | 2 +- src/components/Config.jsx | 1 - 5 files changed, 92 insertions(+), 67 deletions(-) diff --git a/package.json b/package.json index cce78bfff..962719e78 100644 --- a/package.json +++ b/package.json @@ -24,8 +24,8 @@ "migrate:latest": "knex --knexfile server/knexfile.cjs migrate:latest", "migrate:rollback": "knex --knexfile server/knexfile.cjs migrate:rollback", "release": "node server/scripts/newRelease.js", - "prettier:check": "prettier --check \"**/*.{js,jsx}\"", - "prettier:fix": "prettier --write \"**/*.{js,jsx}\"", + "prettier:check": "prettier --check \"**/*.{css,html,js,jsx}\"", + "prettier:fix": "prettier --write \"**/*.{css,html,js,jsx}\"", "eslint:check": "eslint \"**/*.{js,jsx}\"", "eslint:fix": "eslint \"**/*.{js,jsx}\" --fix" }, diff --git a/public/index.html b/public/index.html index 364db685a..3686483a8 100644 --- a/public/index.html +++ b/public/index.html @@ -1,65 +1,89 @@ + + + + + + Map + - - - - - - Map - - - -
-
- - - - + +
+
+ + + +
+
+

+
-
-

- -
- -
- - - - - - - - - + + +
+ + + - \ No newline at end of file + + + + + diff --git a/src/assets/css/holiday.css b/src/assets/css/holiday.css index 76858fc27..089f2ba05 100644 --- a/src/assets/css/holiday.css +++ b/src/assets/css/holiday.css @@ -28,7 +28,7 @@ .snow--near { -webkit-animation-duration: 10s; animation-duration: 10s; - background-image: url("https://dl6rt3mwcjzxg.cloudfront.net/assets/snow/snow-large-075d267ecbc42e3564c8ed43516dd557.png"); + background-image: url('https://dl6rt3mwcjzxg.cloudfront.net/assets/snow/snow-large-075d267ecbc42e3564c8ed43516dd557.png'); background-size: contain; } .snow--near + .snow--alt { @@ -38,7 +38,7 @@ .snow--mid { -webkit-animation-duration: 20s; animation-duration: 20s; - background-image: url("https://dl6rt3mwcjzxg.cloudfront.net/assets/snow/snow-medium-0b8a5e0732315b68e1f54185be7a1ad9.png"); + background-image: url('https://dl6rt3mwcjzxg.cloudfront.net/assets/snow/snow-medium-0b8a5e0732315b68e1f54185be7a1ad9.png'); background-size: contain; } .snow--mid + .snow--alt { @@ -48,7 +48,7 @@ .snow--far { -webkit-animation-duration: 30s; animation-duration: 30s; - background-image: url("https://dl6rt3mwcjzxg.cloudfront.net/assets/snow/snow-small-1ecd03b1fce08c24e064ff8c0a72c519.png"); + background-image: url('https://dl6rt3mwcjzxg.cloudfront.net/assets/snow/snow-small-1ecd03b1fce08c24e064ff8c0a72c519.png'); background-size: contain; } .snow--far + .snow--alt { @@ -428,6 +428,8 @@ #holiday-canvas { position: absolute; + height: '100vh'; + width: '100vw'; top: 0; left: 0; z-index: 1000; diff --git a/src/assets/css/loading.css b/src/assets/css/loading.css index fd88fa135..46cf1753d 100644 --- a/src/assets/css/loading.css +++ b/src/assets/css/loading.css @@ -69,7 +69,7 @@ .loading-text { font-size: 1.5625rem; - font-family: "Roboto", "Helvetica", "Arial", sans-serif; + font-family: 'Roboto', 'Helvetica', 'Arial', sans-serif; font-weight: 400; line-height: 1.235; letter-spacing: 0.00735em; diff --git a/src/components/Config.jsx b/src/components/Config.jsx index c21c44381..cb99e0d98 100644 --- a/src/components/Config.jsx +++ b/src/components/Config.jsx @@ -65,7 +65,6 @@ export default function Config() { serverSettings={serverSettings} getServerSettings={getServerSettings} /> -