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:06:31 +0100 |
| commit | daf9c66210c0203da26d29118e44ca303404d70f (patch) | |
| tree | 6f883bcf7db312897429f976a459322b116312da | |
| parent | 2efee5f6410f4e8e40e9b0339393de80f4affdde (diff) | |
| download | gitlab-ce-sidebar-breakpoint.tar.gz | |
Updated breakpoint for sidebar pinningsidebar-breakpoint
| -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 b6dbf2d0cc1..c4c09137c31 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -260,7 +260,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: '/' }) $('.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 |