diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-05 16:03:10 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-05 16:03:10 +0000 |
| commit | 960d9e3c0326587975efceacba3c37aa0388aebf (patch) | |
| tree | 27f10b8eb017a6a8ab646957dc67388266187f2b | |
| parent | d9a5d9214002a2895aaf0c598bef985b2b4ddc57 (diff) | |
| parent | 1f1fba553a54fe69b3b9308a187433fc5a51ee20 (diff) | |
| download | gitlab-ce-960d9e3c0326587975efceacba3c37aa0388aebf.tar.gz | |
Merge branch '34578-sidebar-padding' into 'master'
fix sidebar padding for full-width items (Time Tracking help)
Closes #34578
See merge request !12650
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/34578-sidebar-padding.yml | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 5cf9330b8f8..542b641e3dd 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -92,7 +92,7 @@ @mixin maintain-sidebar-dimensions { display: block; width: $gutter-width; - padding: 10px 20px; + padding: 10px 0; } .issues-bulk-update.right-sidebar { diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 057d457b3a2..47f50083726 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -200,7 +200,6 @@ right: 0; transition: width .3s; background: $gray-light; - padding: 0 20px; z-index: 200; overflow: hidden; @@ -224,6 +223,10 @@ } } + .issuable-sidebar { + padding: 0 20px; + } + .issuable-sidebar-header { padding-top: 10px; } diff --git a/changelogs/unreleased/34578-sidebar-padding.yml b/changelogs/unreleased/34578-sidebar-padding.yml new file mode 100644 index 00000000000..dc4647298e6 --- /dev/null +++ b/changelogs/unreleased/34578-sidebar-padding.yml @@ -0,0 +1,4 @@ +--- +title: fix left & right padding on sidebar +merge_request: +author: |