Merge branch 'sidebar-breakpoint' into 'master'

Updated breakpoint for sidebar pinning ## What does this MR do? 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

Merge branch 'sidebar-breakpoint' into 'master'
c5d164d1 · Jacob Schatz · d9885160 · 805b9a83 · c5d164d1 · c5d164d1
Commit c5d164d1 authored Jun 30, 2016 by Jacob Schatz
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

application.js.coffee app/assets/javascripts/application.js.coffee +1 -1

variables.scss app/assets/stylesheets/framework/variables.scss +1 -1

No files found.
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -269,7 +269,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')

--- 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