summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-10-06 16:44:54 -0700
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-10-06 16:45:15 -0700
commit9b27f62d86ff8d71710a7e6945414fe115494203 (patch)
treeb0b719f0f0ffe329eaba9abd6b63a3deecd1d159 /app/assets
parent7312b8708fe5e917d14c60d628829d3f79027e8f (diff)
downloadgitlab-ce-9b27f62d86ff8d71710a7e6945414fe115494203.tar.gz
Specify gitlab nav
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/framework/gitlab-theme.scss6
-rw-r--r--app/assets/stylesheets/framework/header.scss6
2 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss
index 45cf9b252a3..52b87de7a3d 100644
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -5,7 +5,7 @@
@mixin gitlab-theme($color-100, $color-200, $color-500, $color-700, $color-800, $color-900, $color-alternate) {
// Header
- header {
+ .navbar-gitlab {
background-color: $color-900;
.navbar-collapse {
@@ -200,9 +200,9 @@ body {
&.ui_light {
@include gitlab-theme($theme-gray-900, $theme-gray-700, $theme-gray-800, $theme-gray-700, $theme-gray-700, $theme-gray-100, $theme-gray-700);
- header {
+ .navbar-gitlab {
background-color: $theme-gray-100;
- box-shadow: 0 2px 0 0 $border-color;
+ box-shadow: 0 1px 0 0 $border-color;
.logo-text svg {
fill: $theme-gray-900;
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 4693b4a18d7..9b4bfae1144 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -2,7 +2,7 @@
margin-top: $header-height;
}
-header {
+.navbar-gitlab {
@include new-style-dropdown;
&.navbar-empty {
@@ -508,7 +508,7 @@ header {
}
@media (max-width: $screen-xs-max) {
- header .container-fluid {
+ .navbar-gitlab .container-fluid {
font-size: 18px;
.navbar-nav {
@@ -567,6 +567,6 @@ header {
border: 1px solid $avatar-border;
}
-.with-performance-bar header.navbar-gitlab {
+.with-performance-bar .navbar-gitlab {
top: $performance-bar-height;
}