From 34bf2b5616ccd70ee1e01e8b79d0f03c15be5c17 Mon Sep 17 00:00:00 2001 From: Julius Haertl Date: Fri, 17 Feb 2017 17:15:24 +0100 Subject: SCSS colors in header.scss Signed-off-by: Julius Haertl --- core/css/header.scss | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'core/css/header.scss') diff --git a/core/css/header.scss b/core/css/header.scss index b158f8b6660..db67fc34820 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -25,8 +25,7 @@ &.menu:after, .menu:after { border: 10px solid transparent; - border-color: transparent; - border-bottom-color: #fff; + border-bottom-color: $color-main-background; bottom: 100%; content: ' '; height: 0; @@ -48,7 +47,7 @@ &:focus { left: 76px; top: -9px; - color: #fff; + color: $color-primary-text; width: auto; height: auto; } @@ -65,7 +64,7 @@ right: 0; z-index: 2000; height: 45px; - background-color: #0082c9; + background-color: $color-primary; box-sizing: border-box; justify-content: space-between; } @@ -91,7 +90,7 @@ #header { .logo { - background-image: url('../img/logo-icon.svg?v=1'); + background-image: url('#{$image-logo}'); background-repeat: no-repeat; background-size: 175px; background-position: center; @@ -102,7 +101,7 @@ .logo-icon { /* display logo so appname can be shown next to it */ display: inline-block; - background-image: url('../img/logo-icon.svg?v=1'); + background-image: url($image-logo); background-repeat: no-repeat; background-position: center center; width: 62px; @@ -177,7 +176,7 @@ .header-appname { display: inline-block; position: relative; - color: #fff; + color: $color-primary-text; font-size: 16px; font-weight: 300; margin: 0; @@ -204,8 +203,8 @@ nav { max-height: 85%; margin-top: 0; padding-bottom: 10px; - background-color: rgba(255, 255, 255, .97); - box-shadow: 0 1px 10px rgba(150, 150, 150, .75); + background-color: $color-main-background; + box-shadow: 0 1px 10px rgba(lighten($color-main-text, 25%), 0.75); border-radius: 3px; border-top-left-radius: 0; border-top-right-radius: 0; @@ -276,7 +275,7 @@ nav { padding-left: 0; width: 80px; text-align: center; - color: #000; + color: $color-main-text; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -359,7 +358,7 @@ nav { #settings { display: inline-block; - color: #ddd; + color: rgba($color-primary-text, 0.7); cursor: pointer; .icon-loading-small-dark { display: inline-block; @@ -387,7 +386,7 @@ nav { &:hover, &:focus, &:active { - color: #fff; + color: $color-primary-text; img { -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity: 1; @@ -419,8 +418,8 @@ nav { top: 45px; z-index: 2000; display: none; - background: rgb(255, 255, 255); - box-shadow: 0 1px 10px rgba(150, 150, 150, .75); + background: $color-main-background; + box-shadow: 0 1px 10px rgba(lighten($color-main-text-dimmed, 25%), 0.75); border-radius: 3px; border-top-left-radius: 0; border-top-right-radius: 0; @@ -432,10 +431,10 @@ nav { a { display: block; height: 40px; - color: #000; + color: $color-main-text; + opacity: .5; padding: 10px 12px 0; -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)'; - opacity: .5; box-sizing: border-box; img { margin-bottom: -3px; -- cgit v1.2.3 From 19ce6372adc27a68d9e162da28492f37acb3b6d1 Mon Sep 17 00:00:00 2001 From: Julius Haertl Date: Tue, 21 Feb 2017 17:19:23 +0100 Subject: Use one box-shadow color Signed-off-by: Julius Haertl --- core/css/apps.scss | 4 ++-- core/css/header.scss | 4 ++-- core/css/styles.scss | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'core/css/header.scss') diff --git a/core/css/apps.scss b/core/css/apps.scss index 1a8daa6ca64..ef43e9b89e6 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -190,7 +190,7 @@ em { > ul .collapsible.open { &:hover, &:focus { - box-shadow: inset 0 0 3px $color-main-old-dddddd; + box-shadow: inset 0 0 3px $color-box-shadow; } ul { display: block; @@ -502,7 +502,7 @@ em { background: $color-main-old-eeeeee; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; - box-shadow: 0 1px 1px $color-main-old-777777; + box-shadow: 0 1px 1px $color-box-shadow; display: block; margin-right: 0; position: absolute; diff --git a/core/css/header.scss b/core/css/header.scss index db67fc34820..b7c0541c584 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -204,7 +204,7 @@ nav { margin-top: 0; padding-bottom: 10px; background-color: $color-main-background; - box-shadow: 0 1px 10px rgba(lighten($color-main-text, 25%), 0.75); + box-shadow: 0 1px 10px $color-box-shadow; border-radius: 3px; border-top-left-radius: 0; border-top-right-radius: 0; @@ -419,7 +419,7 @@ nav { z-index: 2000; display: none; background: $color-main-background; - box-shadow: 0 1px 10px rgba(lighten($color-main-text-dimmed, 25%), 0.75); + box-shadow: 0 1px 10px $color-box-shadow; border-radius: 3px; border-top-left-radius: 0; border-top-right-radius: 0; diff --git a/core/css/styles.scss b/core/css/styles.scss index f6e3a5983d8..ab2417b0d1a 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -1145,7 +1145,7 @@ span.ui-icon { .popup { background-color: $color-main-background; border-radius: 3px; - box-shadow: 0 0 10px $color-main-old-aaaaaa; + box-shadow: 0 0 10px $color-box-shadow; color: $color-main-old-333333; padding: 10px; position: fixed !important; -- cgit v1.2.3