diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-22 20:31:15 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-23 12:28:12 +0100 |
| commit | 0223a2de921401fbbf51e28139fe3bf0e593050d (patch) | |
| tree | 2c1dec30245f172c49d28149871b00b55af1b00b | |
| parent | 5a20d3ab51ebe6b64adfa1fcfab03a26734ba0bb (diff) | |
| download | gitlab-ce-0223a2de921401fbbf51e28139fe3bf0e593050d.tar.gz | |
Merge branch 'auto-collapse-nav' into 'master'
Auto collapses the navigation when resizing
Closes #14475
See merge request !3343
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 11 |
2 files changed, 10 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 502cc687b28..7e269eefcd5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ v 8.6.1 (unreleased) - Add option to reload the schema before restoring a database backup. !2807 - Restrict notifications for confidential issues. !3334 - Fixes issue with signin button overflowing on mobile. !3342 + - Auto collapses the navigation sidebar when resizing. !3343 v 8.6.0 - Add ability to move issue to another project diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 7f983325049..c114f6d7898 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' |