From 7a988ea3783a2ea635d2435f8523a15123b92af8 Mon Sep 17 00:00:00 2001 From: Xaver Maierhofer Date: Sun, 29 May 2016 17:39:56 +0200 Subject: [PATCH] [TASK] Box-shadow variable --- scss/modules/_button.scss | 20 ++++++++++++-------- scss/modules/_sidebar.scss | 11 ++++++++--- scss/modules/_tabs.scss | 7 ++++++- scss/modules/_variables.scss | 3 +++ 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/scss/modules/_button.scss b/scss/modules/_button.scss index 38c332f..cd47c2f 100644 --- a/scss/modules/_button.scss +++ b/scss/modules/_button.scss @@ -21,22 +21,26 @@ button { color: $color-primary; } - &.shadow { - @include shadow(1); + @if $shadows == 1 { + &.shadow { + @include shadow(1); - &:hover { - @include shadow(2); - } + &:hover { + @include shadow(2); + } - &:active { - box-shadow: inset 0 5px 20px rgba($color-black, .19), inset 0 3px 6px rgba($color-black, .23); + &:active { + box-shadow: inset 0 5px 20px rgba($color-black, .19), inset 0 3px 6px rgba($color-black, .23); + } } } &.close { background: none; border-radius: 0; - box-shadow: none; + @if $shadows == 1 { + box-shadow: none; + } color: rgba($color-black, .5); float: right; font-size: 20pt; diff --git a/scss/modules/_sidebar.scss b/scss/modules/_sidebar.scss index 57cb798..6739802 100644 --- a/scss/modules/_sidebar.scss +++ b/scss/modules/_sidebar.scss @@ -53,7 +53,11 @@ } .infobox, .container { - @include shadow(2); + @if $shadows == 1 { + @include shadow(2); + } @else { + border-right: 1px solid darken($color-white, 10%); + } background: rgba($color-white, .97); min-height: 100vh; overflow-y: visible; @@ -66,7 +70,6 @@ } @media screen and (max-width: 80em) { - @include shadow(2); background: $color-white; font-size: .8em; margin: 0; @@ -78,7 +81,9 @@ .container, .infobox { border-radius: 0; - box-shadow: none; + @if $shadows == 1 { + box-shadow: none; + } margin: 0; } } diff --git a/scss/modules/_tabs.scss b/scss/modules/_tabs.scss index 6a84d0b..ab938be 100644 --- a/scss/modules/_tabs.scss +++ b/scss/modules/_tabs.scss @@ -1,5 +1,10 @@ .tabs { - @include shadow(1); + @if $shadows == 1 { + @include shadow(1); + } @else { + border: solid darken($color-white, 10%); + border-width: 1px 0; + } background: rgba($color-black, .02); display: flex; font-family: $font-family; diff --git a/scss/modules/_variables.scss b/scss/modules/_variables.scss index 8902c89..c5c4e17 100644 --- a/scss/modules/_variables.scss +++ b/scss/modules/_variables.scss @@ -20,3 +20,6 @@ $minscreenwidth: 630pt !default; $sidebarwidth: 420pt !default; $sidebarwidthsmall: 320pt !default; $buttondistance: 12pt !default; + +// En/disable box-shadows +$shadows: 1 !default;