Commit 8cbbcee3 authored by Jacob Schatz's avatar Jacob Schatz Committed by Robert Speicher

Merge branch 'sidebar-breakpoint' into 'master'

Updated breakpoint for sidebar pinning

Updates the breakpoint for sidebar pinning to 1024px.

Think we will have the same issue as before when picking into stable with `$window` not being defined.

See merge request !5019
(cherry picked from commit c5d164d1)
parent 10a17ade
......@@ -12,6 +12,7 @@ v 8.9.4
- Fix restore Rake task warning message output. !4980
- Handle external issues in IssueReferenceFilter. !4988
- Expiry date on pinned nav cookie. !5009
- Updated breakpoint for sidebar pinning. !5019
v 8.9.3
- Fix encrypted data backwards compatibility after upgrading attr_encrypted gem. !4963
......
......@@ -255,7 +255,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: '/', expires: 365 * 10 })
$('.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: 1280px;
$sidebar-breakpoint: 1024px;
/*
* UI elements
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment