moved script load, improved color names

jakewies · Aug 9, 2020 · 6a6f24e · 6a6f24e
1 parent f71094a
commit 6a6f24e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/assets/scss/pages/post.scss b/assets/scss/pages/post.scss
@@ -37,7 +37,7 @@ $tocBreakpoint: 1024px;
 
     .anchor:hover {
       @include theme() {
-        color: theme-get('light-text');
+        color: theme-get('high-neutral');
       }
     }
   }
@@ -49,7 +49,7 @@ $tocBreakpoint: 1024px;
 
     a {
       @include theme() {
-        color: theme-get('light-text');
+        color: theme-get('high-neutral');
       }
       text-decoration: underline;
     }
@@ -237,7 +237,7 @@ footer {
       &::before {
         content: "-";
         @include theme() {
-          color: theme-get('light-text');
+          color: theme-get('high-neutral');
         }
         position: absolute;
         margin-left: -15px;
@@ -266,7 +266,7 @@ table {
 
   thead {
     @include theme() {
-      background: theme-get('dark-bg');
+      background: theme-get('low-neutral');
     }
   }
 

diff --git a/assets/scss/pages/posts.scss b/assets/scss/pages/posts.scss
@@ -47,7 +47,7 @@
   @include theme() {
   color: theme-get('neutral');
     &:hover {
-      color: theme-get('light-text');
+      color: theme-get('high-neutral');
     }
   }
 }

diff --git a/assets/scss/partials/_nav.scss b/assets/scss/partials/_nav.scss
@@ -11,7 +11,6 @@
   }
   visibility: hidden;
   z-index: 1;
-
   @media screen and (min-width: $medium) {
     display: block;
     visibility: visible;

diff --git a/assets/scss/partials/_typography.scss b/assets/scss/partials/_typography.scss
@@ -106,7 +106,7 @@ blockquote {
     font-style: italic;
     font-size: 0.95em;
     @include theme() {
-      color: theme-get('light-text');
+      color: theme-get('high-neutral');
     }
   }
 }

diff --git a/assets/scss/partials/_vars.scss b/assets/scss/partials/_vars.scss
@@ -25,21 +25,21 @@ $large: 1400px;
 $themes: (
   lightTheme: (
     text: #111,
-    dark-bg: #f7f7f7,
+    low-neutral: #f7f7f7,
     neutral-table-border: #eeeeee,
     neutral: #9b9b9b,
-    light-text: #717171,
+    high-neutral: #717171,
     bg: #fff,
     accent: #9013FE,
     accent-text: #580E99,
     accent-bg: #A56AD9,
   ),
   darkTheme: (
     text: #fff,
-    dark-bg: #717171,
+    low-neutral: #717171,
     neutral-table-border: #eeeeee,
     neutral: #9b9b9b,
-    light-text: #f7f7f7,
+    high-neutral: #f7f7f7,
     bg: #111,
     accent: #9013FE,
     accent-text: #A56AD9,

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
-<html lang="{{ .Site.LanguageCode }}" class="lightTheme" id="theme">
+<script src="/js/dark-mode.js"></script>
+<html lang="{{ .Site.LanguageCode }}" id="theme">
 
 <head>
   <title>{{ if .IsHome }}{{ .Site.Title }}{{ else }}{{ .Title }} | {{ .Site.Title }}{{ end }}</title>
@@ -60,7 +61,6 @@
 
   {{ $script := resources.Get "js/index.js" | minify | fingerprint }}
   <script src="{{ $script.RelPermalink }}" integrity="{{ $script.Data.Integrity | safeHTMLAttr }}" crossorigin="anonymous"></script>
-  <script src="/js/dark-mode.js"></script>
   {{ block "scripts" . }} {{ end }}
 </body>