diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-30 18:53:45 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-30 22:31:20 +0300 |
| commit | 8cbbcee33cd6a8d3e03cfa6630300315ea297973 (patch) | |
| tree | 166fa5e498f23326a8a61747ddf050b4e35bbd8f | |
| parent | 10a17adea7e35d725f27bc79d14d6a76392a6dd3 (diff) | |
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 c5d164d1df46eb34668a032b234484f142e1a881)
| -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 8bf84aa095b..51f39d7954c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index e86c66cfe5a..e13a010992b 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() < 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') diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 87f8a17659f..211a9af2348 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: 1280px; +$sidebar-breakpoint: 1024px; /* * UI elements |