diff options
| author | Phil Hughes <me@iamphill.com> | 2017-12-18 08:43:47 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-12-18 08:43:47 +0000 |
| commit | 307ac3a98f033e9b1dd8804d7794aaa42955e2e6 (patch) | |
| tree | 4d36d2bba793eb52fea2b0e8237dd1cee12e3585 | |
| parent | 169a8c35847a925597ed1abb9225c722fc9ed8ee (diff) | |
| parent | ad8aff0a95723e18b63b61d4f0f0bca249820ca4 (diff) | |
| download | gitlab-ce-307ac3a98f033e9b1dd8804d7794aaa42955e2e6.tar.gz | |
Merge branch '39974-toggle-sidebar-btn' into 'master'
Stop toggle sidebar button from changing height on collapse
Closes #39974
See merge request gitlab-org/gitlab-ce!15944
| -rw-r--r-- | app/assets/stylesheets/framework/contextual-sidebar.scss | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/contextual-sidebar.scss b/app/assets/stylesheets/framework/contextual-sidebar.scss index 26a2db99e0a..8baf7ca23a4 100644 --- a/app/assets/stylesheets/framework/contextual-sidebar.scss +++ b/app/assets/stylesheets/framework/contextual-sidebar.scss @@ -320,13 +320,14 @@ transition: width $sidebar-transition-duration; position: fixed; bottom: 0; - padding: 16px; + padding: $gl-padding; background-color: $gray-light; border: 0; border-top: 2px solid $border-color; color: $gl-text-color-secondary; display: flex; align-items: center; + line-height: 1; svg { margin-right: 8px; |