From c7c926d74a332a53f613543b91a1e6278c1d3426 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 9 Jul 2020 11:35:04 +0200 Subject: [PATCH 1/4] remove unused header color animation Signed-off-by: Sebastiaan van Stijn --- _scss/_layout.scss | 61 +----------------------------------------- _scss/_navigation.scss | 4 +-- _scss/_night-mode.scss | 1 - 3 files changed, 3 insertions(+), 63 deletions(-) diff --git a/_scss/_layout.scss b/_scss/_layout.scss index ef3224f7ea..7d1767c174 100755 --- a/_scss/_layout.scss +++ b/_scss/_layout.scss @@ -41,71 +41,12 @@ */ .header { - background: $bg-secondary; - // animation: gradientswitch 80s infinite; - // -webkit-animation: gradientswitch 80s infinite; + background-color: $bg-secondary; position: relative; z-index: 1; transition: all 0.1s ease; } -// @keyframes gradientswitch { -// 0% { -// background: #0087C9; -// } -// 16% { -// background: #EF4A53; -// } -// 32% { -// background: #FFB463; -// } -// 49% { -// background: #33D5D4; -// } -// 65% { -// background: #254356; -// } -// 81% { -// background: #5B4097 -// } -// 100% { -// background: #0087C9 -// } -// } - -// @-webkit-keyframes gradientswitch { -// 0% { -// background: #0087C9; -// } -// 16% { -// background: #EF4A53; -// } -// 32% { -// background: #FFB463; -// } -// 49% { -// background: #33D5D4; -// } -// 65% { -// background: #254356; -// } -// 81% { -// background: #5B4097 -// } -// 100% { -// background: #0087C9 -// } -// } - -// .fan { -// // background: linear-gradient(-120deg, rgba(245, 33, 33, 0) 87%, rgba(255, 255, 255, 0.08) 15%), linear-gradient(-110deg, rgba(27, 0, 255, 0) 85%, rgba(255, 255, 255, 0.08) 15%), linear-gradient(-103deg, rgba(255, 33, 33, 0) 84%, rgba(255, 255, 255, 0.08) 15%), radial-gradient(circle, rgba(0, 135, 201, 0) 0%, rgba(0, 135, 201, 0) 100%); - -// position: absolute; -// height: 100%; -// width: 100%; -// z-index: -1; -// } - .columns, .col-body { display: flex; diff --git a/_scss/_navigation.scss b/_scss/_navigation.scss index 97b848f01c..8adcce7c5e 100755 --- a/_scss/_navigation.scss +++ b/_scss/_navigation.scss @@ -57,7 +57,7 @@ */ .nav-secondary { - background: $bg-secondary; + background-color: $bg-secondary; box-shadow: 0 1px 13px rgba(0, 0, 0, 0.24); height: 55px; } @@ -76,7 +76,7 @@ position: absolute; width: 100%; &.affix { - background: $bg-secondary; + background-color: $bg-secondary; box-shadow: 0 1px 13px rgba(0, 0, 0, 0.24); top: 0; position: fixed; diff --git a/_scss/_night-mode.scss b/_scss/_night-mode.scss index 5794d15be3..097ada3a99 100755 --- a/_scss/_night-mode.scss +++ b/_scss/_night-mode.scss @@ -31,7 +31,6 @@ body.night { } .header { background-color: #101c29!important; - animation: none!important; } hr { border-top: 1px solid #4f6071; From fbee311fe5d62e159bf5e61e916b9d43962c0389 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 24 Jul 2020 13:00:08 +0200 Subject: [PATCH 2/4] Rename $body-text-color variables Signed-off-by: Sebastiaan van Stijn --- _scss/_base.scss | 2 +- _scss/_content.scss | 2 +- _scss/_landing.scss | 4 ++-- _scss/_night-mode.scss | 8 ++++---- _scss/_typography.scss | 4 ++-- _scss/_variables.scss | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/_scss/_base.scss b/_scss/_base.scss index 42df2cf63e..21fe08d1e3 100755 --- a/_scss/_base.scss +++ b/_scss/_base.scss @@ -14,7 +14,7 @@ html { body { background-color: $bg-body; - color: $body-text-color; + color: $body-text; font-family: $font; font-size: $body-text-size; margin: $clear; diff --git a/_scss/_content.scss b/_scss/_content.scss index b71bcd88fb..be25d3d598 100755 --- a/_scss/_content.scss +++ b/_scss/_content.scss @@ -129,7 +129,7 @@ h3:hover > a.anchorLink } a.glossary { - color: $body-text-color; + color: $body-text; text-decoration: none; outline: none; &:hover { diff --git a/_scss/_landing.scss b/_scss/_landing.scss index fadc243cbd..62f2c7610c 100644 --- a/_scss/_landing.scss +++ b/_scss/_landing.scss @@ -6,7 +6,7 @@ $bg-card-night: #0F161E; body#landing { background-color: $bg-sidebar; - color: $body-text-color; + color: $body-text; font-size: $body-text-size; margin: $clear; padding: $clear; @@ -392,7 +392,7 @@ body#landing { body#landing.night { background-color: $bg-body-night; - color: $body-text-color-night; + color: $body-text-night; .header { background-color: $bg-body-night; diff --git a/_scss/_night-mode.scss b/_scss/_night-mode.scss index 097ada3a99..1a6618b390 100755 --- a/_scss/_night-mode.scss +++ b/_scss/_night-mode.scss @@ -6,11 +6,11 @@ body.night { background-color: $bg-body-night; - color: $body-text-color-night; + color: $body-text-night; p, .rating-nero-value, .reading-time { - color: $body-text-color-night!important; + color: $body-text-night!important; } h1, h2, @@ -145,7 +145,7 @@ body.night { } a.glossary, .toc-nav i.fa{ - color: $body-text-color-night; + color: $body-text-night; } .component img, .component-full-icon img { opacity: 1; @@ -297,7 +297,7 @@ body.night { body.night { /* accordion */ .panel { - color: #d3d4d4; + color: $body-text-night; margin-bottom: 20px; background-color: #24394c; } diff --git a/_scss/_typography.scss b/_scss/_typography.scss index 0fa06f8f86..82442d7a2d 100755 --- a/_scss/_typography.scss +++ b/_scss/_typography.scss @@ -27,7 +27,7 @@ h4, h5, h6 { font-family: $headings; - color: $body-text-color; + color: $body-text; clear: both; line-height: 26px; } @@ -61,7 +61,7 @@ h6 { } p { - color: $body-text-color; + color: $body-text; font-family: $font; font-size: $body-text-size; line-height: 24px; diff --git a/_scss/_variables.scss b/_scss/_variables.scss index 328d855c93..06ac625131 100755 --- a/_scss/_variables.scss +++ b/_scss/_variables.scss @@ -32,7 +32,7 @@ $bg-body: #fff; $heading-color: #254356; -$body-text-color: #33444C;//grey #11 in color palette +$body-text: #33444C; $bg-footer: #fff; @@ -63,7 +63,7 @@ $table-head: #CFD2D4; $bg-body-night: #061F2F; -$body-text-color-night: #d3d4d4; +$body-text-night: #d3d4d4; $bg-secondary-night: #27343B; From 796e6330df50dab9bc4e02a032d86cb9dc95aeca Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 9 Jul 2020 12:27:49 +0200 Subject: [PATCH 3/4] Fix top-navigation color, and some small cleanups Signed-off-by: Sebastiaan van Stijn --- _includes/body-landing.html | 2 +- _scss/_base.scss | 12 ++----- _scss/_landing.scss | 27 +++------------ _scss/_layout.scss | 11 +++--- _scss/_night-mode.scss | 12 +++---- _scss/_variables.scss | 69 ++++++++++--------------------------- 6 files changed, 37 insertions(+), 96 deletions(-) diff --git a/_includes/body-landing.html b/_includes/body-landing.html index 4bdb37d648..a7f22ce1b4 100644 --- a/_includes/body-landing.html +++ b/_includes/body-landing.html @@ -1,4 +1,4 @@ - +