summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-04-01 19:51:18 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-04-01 19:51:18 +0200
commitde6360f9048511f55a9c93e6fc848418cb6c71a5 (patch)
treeef76fa58ccc6f5c27ab3f577b3ca217e858f8677 /app/assets/stylesheets
parent03f2dd90ec5c7d9b2f8d9b6254f7853733302896 (diff)
downloadgitlab-ce-de6360f9048511f55a9c93e6fc848418cb6c71a5.tar.gz
Improve styling for new complex sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/framework/gitlab-theme.scss1
-rw-r--r--app/assets/stylesheets/framework/sidebar.scss65
2 files changed, 27 insertions, 39 deletions
diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss
index ad6ade1304e..795a26ce34c 100644
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -63,7 +63,6 @@
.count {
color: $color-light;
- background: $color-dark;
}
}
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index f14433676e7..e55c9e3e429 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -144,7 +144,7 @@
}
a {
- padding: 7px 15px;
+ padding: 7px 12px;
font-size: $gl-font-size;
line-height: 24px;
color: $gray;
@@ -169,10 +169,12 @@
}
.count {
- float: right;
- background: #eee;
- padding: 0 8px;
- @include border-radius(6px);
+ &:before {
+ content: '(';
+ }
+ &:after {
+ content: ')';
+ }
}
&.back-link i {
@@ -288,55 +290,42 @@
}
}
-.page-sidebar-expanded {
- .complex-sidebar {
- display: inline-block;
+.complex-sidebar {
+ display: inline-block;
- .nav-sidebar {
- margin-bottom: 0;
- }
+ .nav-primary {
+ width: 61px;
+ float: left;
+ border-right: 1px solid rgba(255, 255, 255, 0.1);
+ height: 100vh;
- .nav-primary {
+ .nav-sidebar {
width: 60px;
- float: left;
- .nav-sidebar {
+ li a {
width: 60px;
- li a {
- width: 60px;
-
- span {
- display: none;
- }
+ span {
+ display: none;
}
}
}
+ }
- .nav-secondary {
- padding-bottom: 100px;
- border-left: 1px solid rgba(255, 255, 255, 0.1);
- float: left;
+ .nav-secondary {
+ float: left;
+ width: 168px;
+
+ .nav-sidebar {
width: 168px;
- .nav-sidebar {
+ li a {
width: 168px;
- li a {
- width: 168px;
-
- i {
- display: none;
- }
+ i {
+ display: none;
}
}
}
}
}
-
-.page-sidebar-collapsed {
- .nav-secondary {
- display: none;
- transition-duration: .3s;
- }
-}