diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-06-27 09:30:19 -0500 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-06-28 13:41:46 +0100 |
| commit | 2e1a70fefca7c57c8ccc8f3dac615d42de0903c5 (patch) | |
| tree | e920fc275f59f1ddcf45d44f511e742db402537e | |
| parent | 365015e3c935afd8e4d3073078712cccd3077204 (diff) | |
| download | gitlab-ce-2e1a70fefca7c57c8ccc8f3dac615d42de0903c5.tar.gz | |
Decreased window min width for pinned sidebar
| -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 5c5a4ca7670..2c515dced08 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -261,7 +261,7 @@ $ -> new Aside() # Sidenav pinning - if $window.width() < 1440 and $.cookie('pin_nav') is 'true' + if $window.width() < 1280 and $.cookie('pin_nav') is 'true' $.cookie('pin_nav', 'false', { path: '/' }) $('.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 c37574ca7a1..87f8a17659f 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: 1440px; +$sidebar-breakpoint: 1280px; /* * UI elements |