summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/stylesheets/generic/sidebar.scss20
-rw-r--r--app/assets/stylesheets/themes/gitlab-theme.scss2
2 files changed, 16 insertions, 6 deletions
diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss
index c2bad93ecb5..88d6c7ca6d6 100644
--- a/app/assets/stylesheets/generic/sidebar.scss
+++ b/app/assets/stylesheets/generic/sidebar.scss
@@ -118,21 +118,31 @@
}
@mixin folded-sidebar {
- padding-left: 50px;
+ padding-left: 60px;
transition-duration: .3s;
.sidebar-wrapper {
width: $sidebar_collapsed_width;
- .header-logo a {
- padding-left: 7px;
+ .header-logo {
+ width: $sidebar_collapsed_width;
+
+ a {
+ padding-left: 7px;
+
+ .gitlab-text-container {
+ display: none;
+ }
+ }
}
.nav-sidebar {
width: $sidebar_collapsed_width;
- li a i {
- margin-right: 20px;
+ li a {
+ span {
+ display: none;
+ }
}
}
diff --git a/app/assets/stylesheets/themes/gitlab-theme.scss b/app/assets/stylesheets/themes/gitlab-theme.scss
index 644433f9cbc..d523bb89521 100644
--- a/app/assets/stylesheets/themes/gitlab-theme.scss
+++ b/app/assets/stylesheets/themes/gitlab-theme.scss
@@ -10,7 +10,7 @@
.page-with-sidebar {
.header-logo {
background-color: $color;
- border-color: $color-darker;
+ border-color: $color;
a {
color: $color-light;