From 036dcf082f5207508d8f0972fdbad68a46108cd7 Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Tue, 10 Apr 2018 20:07:58 -0700 Subject: [PATCH] extract Ozark dark theme into separate scss file --- scss/themes/_dark.scss | 28 ++++++++++++++++++++++++++++ scss/themes/ozark.scss | 30 ++---------------------------- 2 files changed, 30 insertions(+), 28 deletions(-) create mode 100644 scss/themes/_dark.scss diff --git a/scss/themes/_dark.scss b/scss/themes/_dark.scss new file mode 100644 index 0000000..508398f --- /dev/null +++ b/scss/themes/_dark.scss @@ -0,0 +1,28 @@ +@mixin darkTheme() { + $deemphasized-color: lighten($main-bg-color, 45%); + + --action-button-deemphasized-fill-color: $deemphasized-color; + --action-button-deemphasized-fill-color-hover: lighten($deemphasized-color, 22%); + --action-button-deemphasized-fill-color-active: lighten($deemphasized-color, 5%); + --action-button-deemphasized-fill-color-pressed: darken($deemphasized-color, 7%); + --action-button-deemphasized-fill-color-pressed-hover: darken($deemphasized-color, 2%); + --action-button-deemphasized-fill-color-pressed-active: darken($deemphasized-color, 15%); + + --loading-bg: #ededed; + + --deemphasized-text-color:$deemphasized-color; + + --very-deemphasized-link-color: rgba($anchor-color, 0.6); + --very-deemphasized-text-color: lighten($main-bg-color, 12%); + + --status-direct-background: darken($body-bg-color, 5%); + --main-theme-color: $main-theme-color; + --warning-color: #c7423d; + --alt-input-bg: rgba($main-bg-color, 0.7); + + --muted-modal-bg: transparent; + --muted-modal-focus: #999; + --muted-modal-hover: rgba(255, 255, 255, 0.2); + + --compose-button-halo: rgba(255, 255, 255, 0.1); +} \ No newline at end of file diff --git a/scss/themes/ozark.scss b/scss/themes/ozark.scss index a2d862e..25a16b9 100644 --- a/scss/themes/ozark.scss +++ b/scss/themes/ozark.scss @@ -11,35 +11,9 @@ $focus-outline: darken($main-theme-color, 10%); $compose-background: darken($main-theme-color, 12%); @import "_base.scss"; +@import "_dark.scss"; body.theme-ozark { @include baseTheme(); - - $deemphasized-color: lighten($main-bg-color, 45%); - - --action-button-deemphasized-fill-color: $deemphasized-color; - --action-button-deemphasized-fill-color-hover: lighten($deemphasized-color, 22%); - --action-button-deemphasized-fill-color-active: lighten($deemphasized-color, 5%); - --action-button-deemphasized-fill-color-pressed: darken($deemphasized-color, 7%); - --action-button-deemphasized-fill-color-pressed-hover: darken($deemphasized-color, 2%); - --action-button-deemphasized-fill-color-pressed-active: darken($deemphasized-color, 15%); - - --loading-bg: #ededed; - - --deemphasized-text-color:$deemphasized-color; - - --very-deemphasized-link-color: rgba($anchor-color, 0.6); - --very-deemphasized-text-color: lighten($main-bg-color, 12%); - - --status-direct-background: darken($body-bg-color, 5%); - --main-theme-color: $main-theme-color; - --warning-color: #c7423d; - --alt-input-bg: rgba($main-bg-color, 0.7); - - --muted-modal-bg: transparent; - --muted-modal-focus: #999; - --muted-modal-hover: rgba(255, 255, 255, 0.2); - - --compose-button-halo: rgba(255, 255, 255, 0.1); - + @include darkTheme(); } \ No newline at end of file