diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-11-02 08:07:17 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-11-02 10:05:34 -0500 |
| commit | 0904d5721cfe9dd135444c82706f37e3c167df73 (patch) | |
| tree | c7dd7f9b8349896a112c66b9cb28c83c6111bade | |
| parent | 74c79123248f35db64db2a6612a2794810f555db (diff) | |
| download | gitlab-ce-toggle-sidebar-alignment.tar.gz | |
Align toggle sidebar button across all browsers and OSstoggle-sidebar-alignment
| -rw-r--r-- | app/assets/stylesheets/framework/contextual_sidebar.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/toggle-sidebar-alignment.yml | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/contextual_sidebar.scss b/app/assets/stylesheets/framework/contextual_sidebar.scss index 2e7f25d975e..6f103e4e89a 100644 --- a/app/assets/stylesheets/framework/contextual_sidebar.scss +++ b/app/assets/stylesheets/framework/contextual_sidebar.scss @@ -322,15 +322,15 @@ width: $contextual-sidebar-width - 1px; transition: width $sidebar-transition-duration; position: fixed; + height: $toggle-sidebar-height; bottom: 0; - padding: $gl-padding; + padding: 0 $gl-padding; background-color: $gray-light; border: 0; border-top: 1px solid $border-color; color: $gl-text-color-secondary; display: flex; align-items: center; - line-height: 1; svg { margin-right: 8px; diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index ad66a0365ed..19eee4e4aba 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -10,6 +10,7 @@ $sidebar-breakpoint: 1024px; $default-transition-duration: 0.15s; $contextual-sidebar-width: 220px; $contextual-sidebar-collapsed-width: 50px; +$toggle-sidebar-height: 48px; /* * Color schema diff --git a/changelogs/unreleased/toggle-sidebar-alignment.yml b/changelogs/unreleased/toggle-sidebar-alignment.yml new file mode 100644 index 00000000000..428fe61da9b --- /dev/null +++ b/changelogs/unreleased/toggle-sidebar-alignment.yml @@ -0,0 +1,5 @@ +--- +title: Align toggle sidebar button across all browsers and OSs +merge_request: 22771 +author: +type: fixed |