Commit 690298ab authored by Phil Hughes's avatar Phil Hughes

Merge branch 'toggle-sidebar-alignment' into 'master'

Align toggle sidebar button across all browsers and OSs

See merge request gitlab-org/gitlab-ce!22771
parents 93846eb1 0904d572
...@@ -322,15 +322,15 @@ ...@@ -322,15 +322,15 @@
width: $contextual-sidebar-width - 1px; width: $contextual-sidebar-width - 1px;
transition: width $sidebar-transition-duration; transition: width $sidebar-transition-duration;
position: fixed; position: fixed;
height: $toggle-sidebar-height;
bottom: 0; bottom: 0;
padding: $gl-padding; padding: 0 $gl-padding;
background-color: $gray-light; background-color: $gray-light;
border: 0; border: 0;
border-top: 1px solid $border-color; border-top: 1px solid $border-color;
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
display: flex; display: flex;
align-items: center; align-items: center;
line-height: 1;
svg { svg {
margin-right: 8px; margin-right: 8px;
......
...@@ -10,6 +10,7 @@ $sidebar-breakpoint: 1024px; ...@@ -10,6 +10,7 @@ $sidebar-breakpoint: 1024px;
$default-transition-duration: 0.15s; $default-transition-duration: 0.15s;
$contextual-sidebar-width: 220px; $contextual-sidebar-width: 220px;
$contextual-sidebar-collapsed-width: 50px; $contextual-sidebar-collapsed-width: 50px;
$toggle-sidebar-height: 48px;
/* /*
* Color schema * Color schema
......
---
title: Align toggle sidebar button across all browsers and OSs
merge_request: 22771
author:
type: fixed
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