diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-02-04 00:04:48 +0300 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-02-04 00:04:48 +0300 |
| commit | f660d8d0444fc3c953df93f66c42f9895bfe9ade (patch) | |
| tree | 593a1621c2e44c0beb0ed126755640c02f23e016 | |
| parent | bb81eff4bfcdee87095b03df04fd1086924984c0 (diff) | |
Fixes sidebar width.
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 12 |
2 files changed, 11 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 5e249059c29..44d3d7715d2 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -13,7 +13,8 @@ $list-font-size: 15px; $sidebar_collapsed_width: 62px; $sidebar_width: 230px; $gutter_collapsed_width: 62px; -$gutter_width: 250px; +$gutter_width: 312px; +$gutter_inner_width: 280px; $avatar_radius: 50%; $code_font_size: 13px; $code_line_height: 1.5; diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index b10670afd40..6f71ad1f50b 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -74,7 +74,7 @@ border-bottom: 1px solid $border-gray-light; // This prevents the mess when resizing the sidebar // of elements repositioning themselves.. - width: 210px; + width: $gutter_inner_width; overflow-x: hidden; // -- @@ -96,7 +96,7 @@ } .gutter-toggle { - margin-left: 10px; + margin-left: 20px; border-left: 1px solid $border-gray-light; padding-left: 10px; } @@ -175,6 +175,12 @@ } } + .subscribe-button { + span { + margin-top: 0; + } + } + &.right-sidebar-collapsed { width: $sidebar_collapsed_width; padding-top: 0; @@ -211,7 +217,7 @@ } .gutter-toggle { - margin-left: -207px; + margin-left: -$gutter_inner_width + 4; } .sidebar-collapsed-icon { |