summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/stylesheets/generic/sidebar.scss12
-rw-r--r--app/assets/stylesheets/themes/gitlab-theme.scss2
2 files changed, 6 insertions, 8 deletions
diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss
index 603aef79d0e..c2bad93ecb5 100644
--- a/app/assets/stylesheets/generic/sidebar.scss
+++ b/app/assets/stylesheets/generic/sidebar.scss
@@ -138,7 +138,6 @@
.collapse-nav a {
left: 0px;
- opacity: 0.6;
width: $sidebar_collapsed_width;
}
@@ -150,15 +149,14 @@
}
.collapse-nav a {
+ width: $sidebar_width;
position: fixed;
- top: 0;
- left: 202px;
+ bottom: 0;
font-size: 13px;
background: transparent;
- width: 28px;
- height: 28px;
+ height: 40px;
text-align: center;
- line-height: 28px;
+ line-height: 40px;
transition-duration: .3s;
}
@@ -194,7 +192,7 @@
.sidebar-user {
padding: 12px 22px;
position: fixed;
- bottom: 0;
+ bottom: 40px;
width: $sidebar_width;
overflow: hidden;
transition-duration: .3s;
diff --git a/app/assets/stylesheets/themes/gitlab-theme.scss b/app/assets/stylesheets/themes/gitlab-theme.scss
index 57cb8a78b92..644433f9cbc 100644
--- a/app/assets/stylesheets/themes/gitlab-theme.scss
+++ b/app/assets/stylesheets/themes/gitlab-theme.scss
@@ -26,7 +26,7 @@
.collapse-nav a {
color: #FFF;
- background: $color-darker;
+ background: $color;
}
.sidebar-wrapper {