summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/stylesheets/generic/header.scss9
-rw-r--r--app/assets/stylesheets/themes/gitlab-theme.scss7
2 files changed, 3 insertions, 13 deletions
diff --git a/app/assets/stylesheets/generic/header.scss b/app/assets/stylesheets/generic/header.scss
index a86c01d4ce5..b861646191f 100644
--- a/app/assets/stylesheets/generic/header.scss
+++ b/app/assets/stylesheets/generic/header.scss
@@ -76,15 +76,10 @@ header {
}
.navbar-toggle {
- color: $style_color;
+ color: #666;
margin: 0;
- padding: 10px;
border-radius: 0;
- button i { font-size: 22px; }
-
- &.collapsed { background-color: transparent !important;}
-
&:hover {
background-color: #EEE;
}
@@ -106,8 +101,6 @@ header {
.navbar-collapse {
margin-top: 47px;
- padding-right: 0;
- padding-left: 0;
}
.navbar-nav {
diff --git a/app/assets/stylesheets/themes/gitlab-theme.scss b/app/assets/stylesheets/themes/gitlab-theme.scss
index 929c4fa9c30..ee75fe61881 100644
--- a/app/assets/stylesheets/themes/gitlab-theme.scss
+++ b/app/assets/stylesheets/themes/gitlab-theme.scss
@@ -2,15 +2,12 @@
header {
&.navbar-gitlab {
.navbar-inner {
- .navbar-toggle {
- color: #FFF;
- }
+ .app_logo {
+ background-color: $color-darker;
- .app_logo, .navbar-toggle {
a {
color: $color-light;
}
- background-color: $color-darker;
&:hover {
background-color: $color-dark;