moved script load, improved color names

vishwa35 · vishwa35 · commit 6a6f24ec6a10 · 2020-08-09T11:58:49.000-04:00
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>
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ $tocBreakpoint: 1024px;`
`37`	`37`
`38`	`38`	`.anchor:hover {`
`39`	`39`	`@include theme() {`
`40`		`- color: theme-get('light-text');`
	`40`	`+ color: theme-get('high-neutral');`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`}`
`@@ -49,7 +49,7 @@ $tocBreakpoint: 1024px;`
`49`	`49`
`50`	`50`	`a {`
`51`	`51`	`@include theme() {`
`52`		`- color: theme-get('light-text');`
	`52`	`+ color: theme-get('high-neutral');`
`53`	`53`	`}`
`54`	`54`	`text-decoration: underline;`
`55`	`55`	`}`
`@@ -237,7 +237,7 @@ footer {`
`237`	`237`	`&::before {`
`238`	`238`	`content: "-";`
`239`	`239`	`@include theme() {`
`240`		`- color: theme-get('light-text');`
	`240`	`+ color: theme-get('high-neutral');`
`241`	`241`	`}`
`242`	`242`	`position: absolute;`
`243`	`243`	`margin-left: -15px;`
`@@ -266,7 +266,7 @@ table {`
`266`	`266`
`267`	`267`	`thead {`
`268`	`268`	`@include theme() {`
`269`		`- background: theme-get('dark-bg');`
	`269`	`+ background: theme-get('low-neutral');`
`270`	`270`	`}`
`271`	`271`	`}`
`272`	`272`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`@include theme() {`
`48`	`48`	`color: theme-get('neutral');`
`49`	`49`	`&:hover {`
`50`		`- color: theme-get('light-text');`
	`50`	`+ color: theme-get('high-neutral');`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`}`
`12`	`12`	`visibility: hidden;`
`13`	`13`	`z-index: 1;`
`14`		`-`
`15`	`14`	`@media screen and (min-width: $medium) {`
`16`	`15`	`display: block;`
`17`	`16`	`visibility: visible;`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ blockquote {`
`106`	`106`	`font-style: italic;`
`107`	`107`	`font-size: 0.95em;`
`108`	`108`	`@include theme() {`
`109`		`- color: theme-get('light-text');`
	`109`	`+ color: theme-get('high-neutral');`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`	`}`