Merge pull request #15 from cuhacking/color-scheme-fix

Prefers-color-scheme Fix
cuhacking · Nov 11, 2019 · 6e839b5 · 6e839b5
2 parents decbe17 + e7c4965
commit 6e839b5
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 43 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cuhacking-website",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "private": true,
   "homepage": "https://cuhacking.com",
   "dependencies": {

diff --git a/src/components/navbar.module.css b/src/components/navbar.module.css
@@ -1,12 +1,5 @@
-@media (prefers-color-scheme: light) {
-  * {
-    --navLogo: url('../assets/shortLogo.svg');
-  }
-}
-@media (prefers-color-scheme: dark) {
-  * {
-    --navLogo: url('../assets/shortLogo-dark.svg');
-  }
+* {
+  --navLogo: url('../assets/shortLogo.svg');
 }
 
 #container {
@@ -43,3 +36,9 @@
     justify-content: flex-start;
   }
 }
+
+@media (prefers-color-scheme: dark) {
+  * {
+    --navLogo: url('../assets/shortLogo-dark.svg');
+  }
+}
diff --git a/src/index.css b/src/index.css
@@ -1,27 +1,12 @@
-@media (prefers-color-scheme: light) {
-  * {
-    --textColour: #000000;
-    --secondTextColour: #FFFFFF; 
-    --lightPrimaryColour: #9756D8; 
-    --primaryColour: #5827B8;
-    --darkPrimaryColour: #280749;
-    --secondaryColour: #00D0FE;
-    --background: url('./assets/bkg.svg');
-    --backgroundColour: white; 
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-  * {
-    --textColour: #ffffff;
-    --secondTextColour: #FFFFFF; 
-    --lightPrimaryColour: #9756D8; 
-    --primaryColour: #5827B8;
-    --darkPrimaryColour: #280749;
-    --secondaryColour: #00D0FE;
-    --background: url('./assets/bkg-dark.svg'); 
-    --backgroundColour: black; 
-  }
+* {
+  --textColour: #000000;
+  --secondTextColour: #FFFFFF; 
+  --lightPrimaryColour: #9756D8; 
+  --primaryColour: #5827B8;
+  --darkPrimaryColour: #280749;
+  --secondaryColour: #00D0FE;
+  --background: url('./assets/bkg.svg');
+  --backgroundColour: white; 
 }
 
 a {
@@ -63,3 +48,16 @@ h2 {
   background-position: bottom;
   min-height: 100vh;
 }
+
+@media (prefers-color-scheme: dark) {
+  * {
+    --textColour: #ffffff;
+    --secondTextColour: #FFFFFF; 
+    --lightPrimaryColour: #9756D8; 
+    --primaryColour: #5827B8;
+    --darkPrimaryColour: #280749;
+    --secondaryColour: #00D0FE;
+    --background: url('./assets/bkg-dark.svg'); 
+    --backgroundColour: black; 
+  }
+}
diff --git a/src/pages/home/index.module.css b/src/pages/home/index.module.css
@@ -1,12 +1,5 @@
-@media (prefers-color-scheme: light) {
-  * {
-    --dateSvg: url('../../assets/dateStamp.svg');
-  }
-}
-@media (prefers-color-scheme: dark) {
-  * {
-    --dateSvg: url('../../assets/dateStamp-dark.svg');
-  }
+* {
+  --dateSvg: url('../../assets/dateStamp.svg');
 }
 
 #content {
@@ -246,3 +239,9 @@
     flex-direction: row;
   }
 }
+
+@media (prefers-color-scheme: dark) {
+  * {
+    --dateSvg: url('../../assets/dateStamp-dark.svg');
+  }
+}