diff options
author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-06-02 15:24:34 -0600 |
---|---|---|
committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-06-07 09:16:59 -0500 |
commit | 7c501895a33e2771097e14ddf7171164ccc27d01 (patch) | |
tree | 33d09c3af3105177a99b5e2b244ea3d8d2ee5f9f /app/assets/stylesheets/framework/header.scss | |
parent | 3fd0b364ea54832a861482d609bd25d485d5ac9c (diff) | |
download | gitlab-ce-7c501895a33e2771097e14ddf7171164ccc27d01.tar.gz |
Implement compact side nav
Diffstat (limited to 'app/assets/stylesheets/framework/header.scss')
-rw-r--r-- | app/assets/stylesheets/framework/header.scss | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 0da96c4017d..3be83b0fc65 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -79,13 +79,17 @@ header { &.header-collapsed { padding: 0 16px; + + .side-nav-toggle { + display: block; + } } .side-nav-toggle { display: none; position: absolute; left: -10px; - margin: 6px 0; + margin: 8px 0; padding: 6px 10px; border: none; background-color: $background-color; @@ -97,10 +101,6 @@ header { &:focus { outline: none; } - - @media (max-width: $screen-xs-min) { - display: block; - } } } @@ -171,31 +171,21 @@ header { } } -@mixin collapsed-header { - margin-left: $sidebar_collapsed_width; -} - .header-collapsed { - margin-left: $sidebar_collapsed_width; - - @media (min-width: $screen-md-min) { - @include collapsed-header; - } + margin-left: 0; - @media (max-width: $screen-xs-min) { - margin-left: 0; + .header-content { + padding-left: 30px; + transition-duration: .3s; } } .header-expanded { - margin-left: $sidebar_collapsed_width; + margin-left: 0; - @media (min-width: $screen-md-min) { - margin-left: $sidebar_width; - } - - @media (max-width: $screen-xs-min) { - margin-left: 0; + .header-content { + padding-left: $sidebar_width; + transition-duration: .3s; } } |