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) ![Screen_Shot_2016-06-27_at_9.36.13_AM](/uploads/d0a87bca5af1bee808c5b1046c0ecf72/Screen_Shot_2016-06-27_at_9.36.13_AM.png) See merge request !4947
This commit is contained in:
commit
bbbd0e6c81
|
@ -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
|
||||
|
|
|
@ -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')
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue