From 21846a1adacaf4dafc00e772e6f7430185516f82 Mon Sep 17 00:00:00 2001 From: catarak Date: Wed, 14 Sep 2016 13:03:51 -0400 Subject: [PATCH] more theme stuff --- client/styles/components/_editor.scss | 18 +++++++++++------- client/styles/components/_preferences.scss | 11 ++++++++--- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/client/styles/components/_editor.scss b/client/styles/components/_editor.scss index d7dcd924..12a83530 100644 --- a/client/styles/components/_editor.scss +++ b/client/styles/components/_editor.scss @@ -1,7 +1,9 @@ .CodeMirror { - font-family: Inconsolata, monospace; - height: 100%; - border: 1px solid $ide-border-color; + @include themify() { + border: 1px solid getThemifyVariable('ide-border-color'); + } + font-family: Inconsolata, monospace; + height: 100%; } .CodeMirror-linenumbers { @@ -54,11 +56,13 @@ } .CodeMirror-lint-tooltip { - background-color: $light-modal-background-color; - border: 1px solid $light-modal-border-color; + @include themify() { + background-color: getThemifyVariable('modal-background-color'); + border: 1px solid getThemifyVariable('modal-border-color'); + box-shadow: 0 12px 12px getThemifyVariable('shadow-color'); + } border-radius: 2px; - box-shadow: 0 12px 12px $light-shadow-color; - font-family: Montserrat, sans-serif; + font-family: 'Avenir Next', Montserrat, sans-serif; } .editor__options-button { diff --git a/client/styles/components/_preferences.scss b/client/styles/components/_preferences.scss index a4cd20c2..c539a757 100644 --- a/client/styles/components/_preferences.scss +++ b/client/styles/components/_preferences.scss @@ -39,7 +39,9 @@ flex-wrap: wrap; padding-bottom: #{12 / $base-font-size}rem; & + & { - border-top: 2px dashed $light-button-border-color; + @include themify() { + border-top: 2px dashed getThemifyVariable('button-border-color'); + } } } @@ -56,14 +58,17 @@ } .preference__value { - border: 2px solid $light-button-border-color; + @include themify() { + border: 2px solid getThemifyVariable('button-border-color'); + background-color: getThemifyVariable('button-background-color'); + color: $light-primary-text-color; + } text-align: center; border-radius: 0%; width: #{48 / $base-font-size}rem; height: #{44 / $base-font-size}rem; margin: 0 #{28 / $base-font-size}rem; padding: 0; - background-color: $light-button-background-color; } .preference__label {