kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2015-06-25 13:33:50 +02:00
commit 6288677134
2 changed files with 37 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/stylesheets/generic/header.scss
View file

@ -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 {
@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 {

76
app/assets/stylesheets/generic/sidebar.scss
View file

@ -29,42 +29,44 @@
&.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;
}
a {
color: $gray;
display: block;
text-decoration: none;
padding: 8px 15px;
font-size: 14px;
line-height: 20px;
padding-left: 16px;
&:hover {
text-decoration: none;
} }
&:active, &:focus { a {
color: $gray;
display: block;
text-decoration: none; text-decoration: none;
} padding: 8px 15px;
font-size: 14px;
line-height: 20px;
padding-left: 16px;
i { &:hover {
width: 20px; text-decoration: none;
color: $gray-light; }
margin-right: 23px;
&:active, &:focus {
text-decoration: none;
}
i {
width: 20px;
color: $gray-light;
margin-right: 23px;
}
.count {
float: right;
background: #eee;
padding: 0px 8px;
@include border-radius(6px);
}
} }
} }
} }
@ -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 @@
} }
.sidebar-user { .sidebar-user {
.username { width: $sidebar_collapsed_width;
display: none;
}
} }
} }
} }
@ -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;
} }
} }