diff options
author | Phil Hughes <me@iamphill.com> | 2017-12-13 09:48:34 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-12-13 09:48:34 +0000 |
commit | eb499b60ba82e5a1897d4c57611abac07a87536d (patch) | |
tree | f771b7a48ac74a3a2e296d0ded49a986d0b8aa76 /app/assets/javascripts/main.js | |
parent | eacf99aff7a71d11b42f22c2e9399d1550052853 (diff) | |
parent | 77c254f225c180e2ce56044acda45399cd357d2d (diff) | |
download | gitlab-ce-eb499b60ba82e5a1897d4c57611abac07a87536d.tar.gz |
Merge branch 'new-nav-tech-debt' into 'master'
Remove page-with-new-nav class
See merge request gitlab-org/gitlab-ce!15819
Diffstat (limited to 'app/assets/javascripts/main.js')
-rw-r--r-- | app/assets/javascripts/main.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 30cdb523bef..2db865f8abf 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -120,7 +120,7 @@ $(function () { }); if (bootstrapBreakpoint === 'xs') { - const $rightSidebar = $('aside.right-sidebar, .page-with-sidebar'); + const $rightSidebar = $('aside.right-sidebar, .layout-page'); $rightSidebar .removeClass('right-sidebar-expanded') @@ -180,7 +180,7 @@ $(function () { trigger: 'focus', // set the viewport to the main content, excluding the navigation bar, so // the navigation can't overlap the popover - viewport: '.page-with-sidebar' + viewport: '.layout-page' }); $('.trigger-submit').on('change', function () { return $(this).parents('form').submit(); |