Commit 62886771 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

parents 482b9605 28830c0d
...@@ -69,6 +69,7 @@ header { ...@@ -69,6 +69,7 @@ header {
float: left; float: left;
height: $header-height; height: $header-height;
width: $sidebar_width; width: $sidebar_width;
overflow: hidden;
transition-duration: .3s; transition-duration: .3s;
a { a {
...@@ -169,10 +170,6 @@ header { ...@@ -169,10 +170,6 @@ header {
@mixin collapsed-header { @mixin collapsed-header {
.header-logo { .header-logo {
width: $sidebar_collapsed_width; width: $sidebar_collapsed_width;
h3 {
display: none;
}
} }
.header-content { .header-content {
......
...@@ -29,16 +29,10 @@ ...@@ -29,16 +29,10 @@
&.navbar-collapse { &.navbar-collapse {
padding: 0px !important; padding: 0px !important;
} }
}
.nav-sidebar li a .count { li {
float: right; width: $sidebar_width;
background: #eee;
padding: 0px 8px;
@include border-radius(6px);
}
.nav-sidebar li {
&.separate-item { &.separate-item {
padding-top: 10px; padding-top: 10px;
margin-top: 10px; margin-top: 10px;
...@@ -66,6 +60,14 @@ ...@@ -66,6 +60,14 @@
color: $gray-light; color: $gray-light;
margin-right: 23px; margin-right: 23px;
} }
.count {
float: right;
background: #eee;
padding: 0px 8px;
@include border-radius(6px);
}
}
} }
} }
...@@ -116,11 +118,6 @@ ...@@ -116,11 +118,6 @@
padding: 8px 15px; padding: 8px 15px;
text-align: left; text-align: left;
padding-left: 16px; padding-left: 16px;
& > span {
display: none;
}
} }
} }
...@@ -130,9 +127,7 @@ ...@@ -130,9 +127,7 @@
} }
.sidebar-user { .sidebar-user {
.username { width: $sidebar_collapsed_width;
display: none;
}
} }
} }
} }
...@@ -182,12 +177,13 @@ ...@@ -182,12 +177,13 @@
.sidebar-user { .sidebar-user {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
width: 100%; width: $sidebar_width;
padding: 10px; padding: 10px;
overflow: hidden; overflow: hidden;
transition-duration: .3s;
.username { .username {
margin-top: 5px; margin-top: 5px;
width: 230px; width: $sidebar_width - 2 * 10px;
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment