diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-06-28 13:57:14 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-06-28 13:57:14 +0000 |
| commit | bbbd0e6c81831e81082820b365c60727988d1c14 (patch) | |
| tree | 8822872b3a001ffa992daa012922664c8fc35ce5 | |
| parent | ec1029922e31dd1f54fc49719f978a76b7b9fc94 (diff) | |
| parent | b262e240aaa8ed0170db5257a4fbc3726c2fe952 (diff) | |
| download | gitlab-ce-bbbd0e6c81831e81082820b365c60727988d1c14.tar.gz | |
Merge branch '19171-pinned-width' into 'master'
Resolve "Pin should show up at 1280px min"
## What does this MR do?
Decreased window min width for pinned sidebar
## What are the relevant issue numbers?
Closes #19171
Part of #19200
## Screenshots (if relevant)
See merge request !4947
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 1484edaceab..02364aaed0f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,7 @@ v 8.10.0 (unreleased) - Allow [ci skip] to be in any case and allow [skip ci]. !4785 (simon_w) v 8.9.3 (unreleased) + - Decreased min width of screen to 1280px for pinned sidebar - Fix encrypted data backwards compatibility after upgrading attr_encrypted gem v 8.9.2 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 |