diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-22 20:31:15 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-22 20:31:15 +0000 |
| commit | 16f05230a6daa569ff33c36b9e0850ad7a17e4d2 (patch) | |
| tree | 5ebcd2c464f37b40beb501222b2eae80805ffadd /app | |
| parent | fb1a7553c7b22c8541caa0a6a3f0b49cd20dcf4a (diff) | |
| parent | 21f5524926c3d3ac750ab1bb3781d320cd3e6cca (diff) | |
| download | gitlab-ce-16f05230a6daa569ff33c36b9e0850ad7a17e4d2.tar.gz | |
Merge branch 'auto-collapse-nav' into 'master'
Auto collapses the navigation when resizing
Closes #14475
See merge request !3343
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 01451830653..3c83450ce18 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -218,13 +218,20 @@ $ -> $this = $(this) $this.attr 'value', $this.val() + $sidebarGutterToggle = $('.js-sidebar-toggle') + $navIconToggle = $('.toggle-nav-collapse') + $(document) .off 'breakpoint:change' .on 'breakpoint:change', (e, breakpoint) -> if breakpoint is 'sm' or breakpoint is 'xs' - $gutterIcon = $('.js-sidebar-toggle').find('i') + $gutterIcon = $sidebarGutterToggle.find('i') if $gutterIcon.hasClass('fa-angle-double-right') - $gutterIcon.closest('a').trigger('click') + $sidebarGutterToggle.trigger('click') + + $navIcon = $navIconToggle.find('.fa') + if $navIcon.hasClass('fa-angle-left') + $navIconToggle.trigger('click') $(document) .off 'click', '.js-sidebar-toggle' |