From 544792b9cca7e525db84abd1b925a12777d0a953 Mon Sep 17 00:00:00 2001 From: Ilya Daynatovich Date: Mon, 31 Oct 2016 19:21:15 +0200 Subject: [PATCH] Editions in colors --- css/_inlay.scss | 2 +- css/_variables.scss | 3 ++- css/main.scss | 4 ---- css/themes/_light.scss | 5 +++++ css/themes/_main.scss | 5 ----- 5 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 css/themes/_main.scss diff --git a/css/_inlay.scss b/css/_inlay.scss index 2f88c153a..5cbd777f3 100644 --- a/css/_inlay.scss +++ b/css/_inlay.scss @@ -3,7 +3,7 @@ @include border-radius(3px); padding: 40px 38px 44px; color: #fff; - background: lighten($defaultBackground, 20%); + background: lighten(desaturate($defaultBackground, 70%), 20%); text-align: center; &__title { diff --git a/css/_variables.scss b/css/_variables.scss index 421497793..d3c20ae6b 100644 --- a/css/_variables.scss +++ b/css/_variables.scss @@ -1,3 +1,5 @@ +@import "themes/light"; + /** * Style variables */ @@ -23,7 +25,6 @@ $defaultColor: #F1F1F1; $defaultSideBarFontColor: #44A5FF; $defaultSemiDarkColor: #ACACAC; $defaultDarkColor: #2b3d5c; -$defaultBackground: #474747; $tooltipBg: rgba(0,0,0, 0.7); /** diff --git a/css/main.scss b/css/main.scss index c255bc488..cb8e25ab3 100644 --- a/css/main.scss +++ b/css/main.scss @@ -29,10 +29,6 @@ /* Fonts END */ -/* Theme BEGIN */ -@import "themes/main"; -/* Theme END */ - /* Modules BEGIN */ @import 'toastr'; diff --git a/css/themes/_light.scss b/css/themes/_light.scss index 8eadc8724..6db7432b0 100644 --- a/css/themes/_light.scss +++ b/css/themes/_light.scss @@ -22,6 +22,11 @@ $primaryButtonFontWeight: 400; $buttonShadowColor: #192d4f; +/** +* Color variables +**/ +$defaultBackground: #474747; + /** * Connection indicator **/ diff --git a/css/themes/_main.scss b/css/themes/_main.scss deleted file mode 100644 index f49e1594b..000000000 --- a/css/themes/_main.scss +++ /dev/null @@ -1,5 +0,0 @@ -/** -* Switch themes here -*/ - -@import "light"; \ No newline at end of file