diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-06-28 13:57:14 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-28 16:50:42 -0400 |
| commit | b88112819a80b66311c099dddc7cf0b0a6cd235c (patch) | |
| tree | 2c70df61fef0a6b654e27e81a0ec2a66b844ab76 | |
| parent | 0aa7472bf4aaf87fb66695501cca58289dcd5729 (diff) | |
| download | gitlab-ce-b88112819a80b66311c099dddc7cf0b0a6cd235c.tar.gz | |
Merge branch '19171-pinned-width' into 'master'
Resolve "Pin should show up at 1280px min"
Decreased window min width for pinned sidebar
Closes #19171
Part of #19200
See merge request !4947
(cherry picked from commit bbbd0e6c81831e81082820b365c60727988d1c14)
| -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 db021121f9c..20dc4425b47 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -255,7 +255,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 |