diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-03-29 08:28:04 -0400 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-03-30 07:26:34 -0400 |
| commit | e7650492f2b76453df59abbd762d0223cca817f1 (patch) | |
| tree | a8bb00d87abe1c4146e1eff9446a3bbb1b642007 | |
| parent | 509bc3fbe41f2df11189d7e2e9eba1309866d86d (diff) | |
| download | gitlab-ce-e7650492f2b76453df59abbd762d0223cca817f1.tar.gz | |
Collapsed sidebar opens over instead of pushing content.
| -rw-r--r-- | app/assets/javascripts/right_sidebar.js.coffee | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/right_sidebar.js.coffee b/app/assets/javascripts/right_sidebar.js.coffee index 4b08c5caf26..67403554340 100644 --- a/app/assets/javascripts/right_sidebar.js.coffee +++ b/app/assets/javascripts/right_sidebar.js.coffee @@ -21,7 +21,6 @@ class @Sidebar i.hide() sidebarDropdownLoaded: (e) -> - console.log 'loaded' $sidebarCollapsedIcon = $(@).closest('.block').find('.sidebar-collapsed-icon') img = $sidebarCollapsedIcon.find('img') $sidebarCollapsedIcon.find('i.fa-spin').remove() @@ -35,6 +34,7 @@ class @Sidebar sidebarCollapseClicked: (e) -> e.preventDefault() $block = $(@).closest('.block') + $('aside') .find('.gutter-toggle') .trigger('click') @@ -43,11 +43,13 @@ class @Sidebar if $editLink.length $editLink.trigger('click') $block.addClass('collapse-after-update') + $('.page-with-sidebar').addClass('with-overlay') sidebarDropdownHidden: (e) -> $block = $(@).closest('.block') if $block.hasClass('collapse-after-update') $block.removeClass('collapse-after-update') + $('.page-with-sidebar').removeClass('with-overlay') $('aside') .find('.gutter-toggle') .trigger('click')
\ No newline at end of file diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index da844dc11e1..18189e985c4 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -304,4 +304,8 @@ @media (min-width: $screen-md-min) { padding-right: $gutter_width; } + + &.with-overlay { + padding-right: $sidebar_collapsed_width; + } } |