From 0cb9c5e5153d070ab51cd2c199e43ba27155745e Mon Sep 17 00:00:00 2001 From: Joshua Ogle Date: Thu, 24 May 2018 11:09:50 -0600 Subject: [PATCH 1/7] Update styles for box shadows --- ui/app/styles/components/global-flash.scss | 2 +- ui/app/styles/components/login-form.scss | 3 +++ ui/app/styles/components/sidebar.scss | 6 ------ ui/app/styles/core.scss | 1 + ui/app/styles/core/buttons.scss | 5 +++-- ui/app/styles/utils/_bulma_variables.scss | 10 ++++++++++ ui/app/templates/components/splash-page.hbs | 2 +- 7 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 ui/app/styles/components/login-form.scss diff --git a/ui/app/styles/components/global-flash.scss b/ui/app/styles/components/global-flash.scss index d1c0597786..f0819100e7 100644 --- a/ui/app/styles/components/global-flash.scss +++ b/ui/app/styles/components/global-flash.scss @@ -15,7 +15,7 @@ z-index: 1; .notification { - box-shadow: 0 0 25px rgba($black, 0.2); + box-shadow: $box-shadow-high; margin: 20px; @include until($desktop) { margin: 1rem 0; diff --git a/ui/app/styles/components/login-form.scss b/ui/app/styles/components/login-form.scss new file mode 100644 index 0000000000..d458abd8f8 --- /dev/null +++ b/ui/app/styles/components/login-form.scss @@ -0,0 +1,3 @@ +.login-form { + box-shadow: $box-shadow, $box-shadow-high; +} \ No newline at end of file diff --git a/ui/app/styles/components/sidebar.scss b/ui/app/styles/components/sidebar.scss index 5e6e213538..8f580a5bc0 100644 --- a/ui/app/styles/components/sidebar.scss +++ b/ui/app/styles/components/sidebar.scss @@ -72,14 +72,8 @@ transition: 250ms border-width; &.is-active { - color: $blue; - background-color: $dark-white; border-right: 4px solid $blue; } - - &:hover { - background-color: $dark-white; - } } } } diff --git a/ui/app/styles/core.scss b/ui/app/styles/core.scss index 3c8acc6437..7005448c43 100644 --- a/ui/app/styles/core.scss +++ b/ui/app/styles/core.scss @@ -54,6 +54,7 @@ @import "./components/linked-block"; @import "./components/list-pagination"; @import "./components/loader"; +@import "./components/login-form"; @import "./components/message-in-page"; @import "./components/page-header"; @import "./components/popup-menu"; diff --git a/ui/app/styles/core/buttons.scss b/ui/app/styles/core/buttons.scss index 5efa15a61e..8534d234c0 100644 --- a/ui/app/styles/core/buttons.scss +++ b/ui/app/styles/core/buttons.scss @@ -1,8 +1,8 @@ $button-box-shadow-standard: 0 3px 1px 0 rgba($black, 0.12); .button { - box-shadow: $button-box-shadow-standard; border: 1px solid $grey-light; + box-shadow: $box-shadow-low; color: $grey-dark; display: inline-block; font-size: $size-small; @@ -57,13 +57,14 @@ $button-box-shadow-standard: 0 3px 1px 0 rgba($black, 0.12); &.is-hovered { background-color: darken($color, 5%); border-color: darken($color, 5%); + box-shadow: $box-shadow-middle; } &:active, &.is-active { background-color: darken($color, 10%); border-color: darken($color, 10%); - box-shadow: none; + box-shadow: $box-shadow-middle; } &:focus, diff --git a/ui/app/styles/utils/_bulma_variables.scss b/ui/app/styles/utils/_bulma_variables.scss index 7d68128498..19c89a7895 100644 --- a/ui/app/styles/utils/_bulma_variables.scss +++ b/ui/app/styles/utils/_bulma_variables.scss @@ -61,6 +61,10 @@ $radius: 2px; //box $box-radius: 0; $box-shadow: 0 0 0 1px rgba($black, 0.1); +$box-shadow-low: 0 5px 1px -2px rgba($black, 0.12), 0 3px 2px -1px rgba($black, 0); +$box-shadow-middle: 0 8px 4px -4px rgba($black, 0.10), 0 6px 8px -2px rgba($black, 0.05); +$box-shadow-high: 0 12px 5px -7px rgba($black, 0.08), 0 11px 10px -3px rgba($black, 0.10); +$box-shadow-highest: 0 16px 6px -10px rgba($black, 0.06), 0 16px 16px -4px rgba($black, 0.20); $link: $blue; $text: $black; @@ -78,6 +82,12 @@ $progress-bar-background-color: lighten($grey-light, 15%); $base-border: 1px solid $grey-light; +//menu +$menu-item-hover-color: $text; +$menu-item-hover-background-color: $grey-lighter; +$menu-item-active-color: $link; +$menu-item-active-background-color: transparent; + // animations $speed: 150ms; $speed-slow: $speed * 2; diff --git a/ui/app/templates/components/splash-page.hbs b/ui/app/templates/components/splash-page.hbs index 4f04020cb1..7b0a2bf9ca 100644 --- a/ui/app/templates/components/splash-page.hbs +++ b/ui/app/templates/components/splash-page.hbs @@ -1,7 +1,7 @@
-
+