From 6a6f24ec6a101d85004190d3dc5680e3a56b43ab Mon Sep 17 00:00:00 2001 From: Vishwa Shah Date: Sun, 9 Aug 2020 11:58:49 -0400 Subject: [PATCH] moved script load, improved color names --- assets/scss/pages/post.scss | 8 ++++---- assets/scss/pages/posts.scss | 2 +- assets/scss/partials/_nav.scss | 1 - assets/scss/partials/_typography.scss | 2 +- assets/scss/partials/_vars.scss | 8 ++++---- layouts/_default/baseof.html | 4 ++-- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/assets/scss/pages/post.scss b/assets/scss/pages/post.scss index 100c32f07..83107f58c 100644 --- 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 index f9917c904..ab17f8cd2 100644 --- 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 index b03d2c825..dd1772048 100644 --- 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 index 7f9dd7a1b..8164ea669 100644 --- 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 index 41563c300..e5838f7e2 100644 --- a/assets/scss/partials/_vars.scss +++ b/assets/scss/partials/_vars.scss @@ -25,10 +25,10 @@ $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, @@ -36,10 +36,10 @@ $themes: ( ), 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 index 338358c48..efca44f5d 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,5 +1,6 @@ - + + {{ if .IsHome }}{{ .Site.Title }}{{ else }}{{ .Title }} | {{ .Site.Title }}{{ end }} @@ -60,7 +61,6 @@ {{ $script := resources.Get "js/index.js" | minify | fingerprint }} - {{ block "scripts" . }} {{ end }}