diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-30 15:53:45 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-30 15:53:45 +0000 |
| commit | c5d164d1df46eb34668a032b234484f142e1a881 (patch) | |
| tree | 9f4e2881262b053484e7d30c9ba10bd5fc4b68cf | |
| parent | d9885160ba3be1f62ac61d2f65a4d9e7ab474668 (diff) | |
| parent | 805b9a834708a46d52a6dbad48b881a21a3cad1e (diff) | |
| download | gitlab-ce-c5d164d1df46eb34668a032b234484f142e1a881.tar.gz | |
Merge branch 'sidebar-breakpoint' into 'master'
Updated breakpoint for sidebar pinning
## What does this MR do?
Updates the breakpoint for sidebar pinning to 1024px.
Think we will have the same issue as before when picking into stable with `$window` not being defined.
See merge request !5019
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 05080d50ce7..20fe5a5cc27 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -269,7 +269,7 @@ $ -> new Aside() # Sidenav pinning - if $window.width() < 1280 and $.cookie('pin_nav') is 'true' + if $window.width() < 1024 and $.cookie('pin_nav') is 'true' $.cookie('pin_nav', 'false', { path: '/', expires: 365 * 10 }) $('.page-with-sidebar') .toggleClass('page-sidebar-collapsed page-sidebar-expanded') diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 87f8a17659f..211a9af2348 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -7,7 +7,7 @@ $gutter_collapsed_width: 62px; $gutter_width: 290px; $gutter_inner_width: 258px; $sidebar-transition-duration: .15s; -$sidebar-breakpoint: 1280px; +$sidebar-breakpoint: 1024px; /* * UI elements |