diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-07 10:24:05 -0700 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-07 10:24:05 -0700 |
| commit | ee85ca735a3ceb94d53e1a4ced38a46621194639 (patch) | |
| tree | c5c1e0e6f015fc518586b442df360ab35a6a4641 | |
| parent | a1d5d49a01520dc1d05c9d6ba65ed515adc7b8af (diff) | |
| download | gitlab-ce-ee85ca735a3ceb94d53e1a4ced38a46621194639.tar.gz | |
Fix mobile styles
| -rw-r--r-- | app/assets/stylesheets/framework/contextual-sidebar.scss | 13 | ||||
| -rw-r--r-- | app/views/shared/_sidebar_toggle_button.html.haml | 15 |
2 files changed, 10 insertions, 18 deletions
diff --git a/app/assets/stylesheets/framework/contextual-sidebar.scss b/app/assets/stylesheets/framework/contextual-sidebar.scss index 6b02b83c85e..3c60b4c8b2e 100644 --- a/app/assets/stylesheets/framework/contextual-sidebar.scss +++ b/app/assets/stylesheets/framework/contextual-sidebar.scss @@ -313,16 +313,12 @@ // Collapsed nav -.toggle-button-container { +.toggle-sidebar-button, +.close-nav-button { width: $contextual-sidebar-width - 2px; transition: width, $sidebar-transition-duration; position: fixed; bottom: 0; - left: 0; -} - -.toggle-sidebar-button, -.close-nav-button { padding: 16px; background-color: $gray-light; border: 0; @@ -386,12 +382,9 @@ margin-right: 0; } - .toggle-button-container { - width: $contextual-sidebar-collapsed-width - 2px; - } - .toggle-sidebar-button { padding: 16px; + width: $contextual-sidebar-collapsed-width - 2px; .collapse-text, .icon-angle-double-left { diff --git a/app/views/shared/_sidebar_toggle_button.html.haml b/app/views/shared/_sidebar_toggle_button.html.haml index 81b2209111f..2530db986e0 100644 --- a/app/views/shared/_sidebar_toggle_button.html.haml +++ b/app/views/shared/_sidebar_toggle_button.html.haml @@ -1,9 +1,8 @@ -.toggle-button-container - %a.toggle-sidebar-button.js-toggle-sidebar{ role: "button", type: "button", title: "Toggle sidebar" } - = sprite_icon('angle-double-left', css_class: 'icon-angle-double-left') - = sprite_icon('angle-double-right', css_class: 'icon-angle-double-right') - .collapse-text Collapse sidebar +%a.toggle-sidebar-button.js-toggle-sidebar{ role: "button", type: "button", title: "Toggle sidebar" } + = sprite_icon('angle-double-left', css_class: 'icon-angle-double-left') + = sprite_icon('angle-double-right', css_class: 'icon-angle-double-right') + %span.collapse-text Collapse sidebar - = button_tag class: 'close-nav-button', type: 'button' do - = sprite_icon('close', size: 16) - .collapse-text Close sidebar += button_tag class: 'close-nav-button', type: 'button' do + = sprite_icon('close', size: 16) + %span.collapse-text Close sidebar |