diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-07-09 09:16:53 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-07-09 09:16:53 +0000 |
| commit | 440345bd977caac1b604085feca4b46b4c1eea01 (patch) | |
| tree | c680f153498375a888f0c4a09205ff9f98e844a1 | |
| parent | 706f0e595b0f849d328705ab424110d7706626e1 (diff) | |
| parent | 53697439cce04d5b1a75c3fcdb7c27bdc0fd2d2e (diff) | |
| download | gitlab-ce-440345bd977caac1b604085feca4b46b4c1eea01.tar.gz | |
Merge branch 'dz-subnav-darker' into 'master'
Make subnavigation a bit darker color
See merge request !5166
| -rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index 02ea98e9d94..364952d3b4a 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -77,10 +77,10 @@ &.sub-nav { text-align: center; - background-color: $background-color; + background-color: $dark-background-color; .container-fluid { - background-color: $background-color; + background-color: $dark-background-color; margin-bottom: 0; } diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 211a9af2348..4337fab5d87 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -12,10 +12,11 @@ $sidebar-breakpoint: 1024px; /* * UI elements */ -$border-color: #e5e5e5; -$focus-border-color: #3aabf0; -$table-border-color: #f0f0f0; -$background-color: #fafafa; +$border-color: #e5e5e5; +$focus-border-color: #3aabf0; +$table-border-color: #f0f0f0; +$background-color: #fafafa; +$dark-background-color: #f7f7f7; /* * Text @@ -153,9 +154,6 @@ $warning-message-bg: #fbf2d9; $warning-message-color: #9e8e60; $warning-message-border: #f0e2bb; -/* header */ -$light-grey-header: #faf9f9; - /* tanuki logo colors */ $tanuki-red: #e24329; $tanuki-orange: #fc6d26; |