diff options
| author | Phil Hughes <me@iamphill.com> | 2016-06-30 16:06:31 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-06-30 16:15:32 +0100 |
| commit | 805b9a834708a46d52a6dbad48b881a21a3cad1e (patch) | |
| tree | 38b9dfcc974c53d90882e45e40da2066e41f360c | |
| parent | 73196fbd65f414c051ece96bad7fb7042d3cf5b1 (diff) | |
| download | gitlab-ce-805b9a834708a46d52a6dbad48b881a21a3cad1e.tar.gz | |
Updated breakpoint for sidebar pinning
| -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 |