diff options
author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-06-10 20:27:05 +0300 |
---|---|---|
committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-06-10 20:39:58 +0300 |
commit | 630aeb31eb7728789d1f7659ec0e12ea5a5fd59c (patch) | |
tree | 588dc6ed3474b7decbe871ba584560ff4f091171 /app/assets/stylesheets | |
parent | 67a18f34e93ce8aa990794558371096f8f3a4e4c (diff) |
Add back sidebar counters and username
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/framework/gitlab-theme.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/header.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 17 |
4 files changed, 20 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss index 245e8b285e9..408d4a68e1e 100644 --- a/app/assets/stylesheets/framework/gitlab-theme.scss +++ b/app/assets/stylesheets/framework/gitlab-theme.scss @@ -10,8 +10,12 @@ .page-with-sidebar { .collapse-nav a { - color: $white-light; + color: $color-light; background: $color; + + &:hover { + color: $white-light; + } } .sidebar-wrapper { diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 824f5cd21b4..c07b2753f4d 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -28,6 +28,7 @@ header { height: $header-height; background-color: $background-color; border: none; + border-bottom: 1px solid $border-color; @media (max-width: $screen-xs-min) { padding: 0 16px; diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index 793d4e0479f..ffdd8e7e0d4 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -172,7 +172,6 @@ > form { display: inline-block; margin-top: -1px; - margin-bottom: 12px; } .icon-label { diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index a96ce022309..b7ec3f70bfb 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -115,6 +115,12 @@ } } } + + .count { + float: right; + padding: 0 8px; + @include border-radius(6px); + } } .sidebar-subnav { @@ -131,9 +137,10 @@ position: fixed; top: 0; left: 0; - font-size: 13px; + padding: 5px 0; + font-size: 18px; background: transparent; - height: 40px; + height: 50px; text-align: center; line-height: 40px; transition-duration: .3s; @@ -157,7 +164,7 @@ width: 0; .nav-sidebar { - width: $sidebar_collapsed_width; + width: 0; li { width: auto; @@ -172,6 +179,10 @@ .collapse-nav a { width: 0; + + i { + display: none; + } } .sidebar-user { |