From f20838c17e15ceb9b058690b5f73d45ee7b9c011 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 30 May 2018 15:39:20 -0400 Subject: [PATCH] fix os windows top border color --- src/app/services.module.ts | 7 ++++--- src/scss/environment.scss | 12 +++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/app/services.module.ts b/src/app/services.module.ts index 68a1ce0cc27..b0a6f3c9a80 100644 --- a/src/app/services.module.ts +++ b/src/app/services.module.ts @@ -119,10 +119,11 @@ export function initFactory(): Function { const htmlEl = window.document.documentElement; htmlEl.classList.add('os_' + platformUtilsService.getDeviceString()); htmlEl.classList.add('locale_' + i18nService.translationLocale); - const theme = await storageService.get(ConstantsService.themeKey); - if (theme != null) { - htmlEl.classList.add('theme_' + theme); + let theme = await storageService.get(ConstantsService.themeKey); + if (theme == null) { + theme = 'light'; } + htmlEl.classList.add('theme_' + theme); stateService.save(ConstantsService.disableFaviconKey, await storageService.get(ConstantsService.disableFaviconKey)); diff --git a/src/scss/environment.scss b/src/scss/environment.scss index bd684540008..a6d3fff831d 100644 --- a/src/scss/environment.scss +++ b/src/scss/environment.scss @@ -1,11 +1,9 @@ -@import "variables.scss"; - -html.os_windows { +html.os_windows { body { - border-top: 1px solid #000000; + border-top: 1px solid #dddddd; + } - @include themify($themes) { - border-top-color: themed('borderColorDark'); - } + &.theme_dark body { + border-top-color: #000000; } }