summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-04-28 17:03:03 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-04-28 17:03:03 +0200
commit435b1c043e8722c0f42d2b248283b950dbd5a357 (patch)
treeaaf94a478a348eb944135d478075befdfa1e11f9
parent4a3f3bc7029a12d66bbbbf1c29279b3030d761ef (diff)
downloadgitlab-ce-435b1c043e8722c0f42d2b248283b950dbd5a357.tar.gz
Reuse more popular colors
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/assets/stylesheets/framework/header.scss6
-rw-r--r--app/assets/stylesheets/framework/nav.scss2
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index d14317f9c40..5fa10d29a87 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -26,9 +26,9 @@ header {
z-index: 100;
margin-bottom: 0;
min-height: $header-height;
- background-color: $gray-light;
+ background-color: $background-color;
border: none;
- border-bottom: 1px solid #eee;
+ border-bottom: 1px solid $border-color;
.container-fluid {
width: 100% !important;
@@ -47,7 +47,7 @@ header {
text-align: center;
&:hover, &:focus, &:active {
- background-color: $gray-light;
+ background-color: $background-color;
}
}
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 38bea9d462e..5fe687dcec3 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -187,7 +187,7 @@
}
.layout-nav {
- background: $gray-light;
+ background: $background-color;
border-bottom: 1px solid $border-color;
.controls {