From cb1f257c572b23e13cf2968c046b18973a626d20 Mon Sep 17 00:00:00 2001 From: Jed Fox Date: Sat, 11 Aug 2018 11:41:07 -0400 Subject: [PATCH] =?UTF-8?q?Remove=20`$inputFocusBorder`=20=F0=9F=94=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/stylesheets/components/_header.scss | 6 ++---- assets/stylesheets/global/_variables-dark.scss | 4 ++-- assets/stylesheets/global/_variables.scss | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/assets/stylesheets/components/_header.scss b/assets/stylesheets/components/_header.scss index 437c36be..8de74c15 100644 --- a/assets/stylesheets/components/_header.scss +++ b/assets/stylesheets/components/_header.scss @@ -169,10 +169,8 @@ &:focus { outline: 0; - @if $inputFocusBorder { - border-color: var(--inputFocusBorder); - box-shadow: 0 0 1px var(--inputFocusBorder); - } + border-color: var(--inputFocusBorder); + box-shadow: 0 0 1px var(--inputFocusBorder); } &[disabled] { diff --git a/assets/stylesheets/global/_variables-dark.scss b/assets/stylesheets/global/_variables-dark.scss index 3045c081..bc2f0a65 100644 --- a/assets/stylesheets/global/_variables-dark.scss +++ b/assets/stylesheets/global/_variables-dark.scss @@ -4,7 +4,7 @@ $selectionText: #fff; $sidebarBackground: #24282a; $headerBackground: #1c1c1c; $contentBackground: #33373a; -$inputFocusBorder: false; + html.dark { --baseFont: -apple-system, BlinkMacSystemFont, 'San Francisco', 'Segoe UI', Roboto, Ubuntu, 'Helvetica Neue', Arial, sans-serif; --monoFont: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace; @@ -26,7 +26,7 @@ html.dark { --textColorLighter: #77787a; --textColorRed: #f44336; - --inputFocusBorder: $inputFocusBorder; + --inputFocusBorder: transparent; --focusBackground: #3f4042; --focusBorder: #000; diff --git a/assets/stylesheets/global/_variables.scss b/assets/stylesheets/global/_variables.scss index 442b38a5..f0ab3122 100644 --- a/assets/stylesheets/global/_variables.scss +++ b/assets/stylesheets/global/_variables.scss @@ -4,9 +4,8 @@ $selectionText: #fff; $sidebarBackground: #f9f9f9; $headerBackground: #eee; $contentBackground: #fff; -$inputFocusBorder: #35b5f4; -html { +html:not(.dark) { --baseFont: -apple-system, BlinkMacSystemFont, 'San Francisco', 'Segoe UI', Roboto, Ubuntu, 'Helvetica Neue', Arial, sans-serif; --monoFont: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace; --boldFontWeight: 500; @@ -27,7 +26,7 @@ html { --textColorLighter: #888; --textColorRed: #f44336; - --inputFocusBorder: $inputFocusBorder; + --inputFocusBorder: #35b5f4; --focusBackground: #e5e5e5; --focusBorder: #d4d4d4;