diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-04-01 18:24:03 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-04-01 18:24:03 +0200 |
| commit | dbc96f05d0c7dd6118a0deeea97650417e42917f (patch) | |
| tree | 062cae89a699dde449d9fb55bf0aed5df2082cc5 /app/assets/stylesheets/framework | |
| parent | 18dd525d0f163b65893fd3df7d09185e72fc7a1e (diff) | |
| download | gitlab-ce-dbc96f05d0c7dd6118a0deeea97650417e42917f.tar.gz | |
Refactor left navigation sidebar to use 2 levels
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets/stylesheets/framework')
| -rw-r--r-- | app/assets/stylesheets/framework/gitlab-theme.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss index c83cf881596..ad6ade1304e 100644 --- a/app/assets/stylesheets/framework/gitlab-theme.scss +++ b/app/assets/stylesheets/framework/gitlab-theme.scss @@ -37,6 +37,7 @@ background: $color-darker; .sidebar-user { + border-top: 1px solid $color; background: $color-darker; color: $color-light; diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index c042684dd71..8d0b0112cdf 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -312,7 +312,6 @@ .page-sidebar-expanded { .complex-sidebar { - margin-bottom: 100px; display: inline-block; .nav-sidebar { @@ -337,6 +336,7 @@ } .nav-secondary { + padding-bottom: 100px; border-left: 1px solid rgba(255, 255, 255, 0.1); float: left; width: 168px; |