From a82a0e2dae2b87dff9884e80f5c6089c38e748ea Mon Sep 17 00:00:00 2001 From: Carl Kittelberger Date: Tue, 19 Nov 2019 04:36:54 +0100 Subject: [PATCH] Fix fonts. --- src/header/_meta.scss | 3 +-- src/header/_nav.scss | 5 ----- src/header/meta/_overlay.scss | 10 ++++++---- src/header/meta/_prefix.scss | 2 +- src/icedream.scss | 2 ++ 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/header/_meta.scss b/src/header/_meta.scss index 167dd1a..be28239 100644 --- a/src/header/_meta.scss +++ b/src/header/_meta.scss @@ -2,8 +2,7 @@ @import 'meta/prefix'; // currently playing track metadata -#meta { - @include icedream-font; +.meta { color: $icedream-text-color; line-height: $icedream-extended-line-height; } diff --git a/src/header/_nav.scss b/src/header/_nav.scss index fdfcf01..5cd28ba 100644 --- a/src/header/_nav.scss +++ b/src/header/_nav.scss @@ -2,11 +2,6 @@ @import 'nav/bgfade'; #nav { - @include icedream-font; - - // push in some air - line-height: $icedream-extended-line-height; - > .active { // apply darker background and brighter text to content background: $icedream-bg-color; diff --git a/src/header/meta/_overlay.scss b/src/header/meta/_overlay.scss index 999ed2e..b9b2f97 100644 --- a/src/header/meta/_overlay.scss +++ b/src/header/meta/_overlay.scss @@ -1,6 +1,6 @@ // metadata overlay tweak @if $icedream-metadata-overlay { - #meta { + .meta { margin: 0; // sass-lint:disable-line variable-for-property position: fixed; bottom: 0; @@ -15,9 +15,11 @@ filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr=#{$icedream-metadata-overlay-background-gradient-from}, endColorstr=#{$icedream-metadata-overlay-background-gradient-to}); } - .page { - &:not(#page_EQ) { - height: calc(100% - 9vmin); + #main { + section { + &:not(#pageEQ) { + height: calc(100% - 9vmin); + } } } } diff --git a/src/header/meta/_prefix.scss b/src/header/meta/_prefix.scss index fe3817c..58306c1 100644 --- a/src/header/meta/_prefix.scss +++ b/src/header/meta/_prefix.scss @@ -1,5 +1,5 @@ @if $icedream-metadata-prefix { - #meta { + #nowplaying { &::before { content: $icedream-metadata-prefix; font-weight: 700; diff --git a/src/icedream.scss b/src/icedream.scss index 60e8c10..a575b58 100644 --- a/src/icedream.scss +++ b/src/icedream.scss @@ -18,6 +18,8 @@ body.icedream { --gradient-stop-1: #{$gradient-stop-1}; --gradient-radial: #{$gradient-radial}; + @include icedream-font; + @import 'header'; @import 'main'; }