diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-05-24 16:39:51 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-05-24 16:39:51 +0000 |
| commit | 8552e8e3cd584d04161a7b4373827195fa7da7f0 (patch) | |
| tree | d754ead84f228d0755a42687a9370f4bc7bbe0e5 /app/assets/stylesheets/pages/merge_requests.scss | |
| parent | 80c19bba8c0d602eb4141d5fc740e8a9e1ef84ee (diff) | |
| parent | 271769a9524dff93a7ba8d2d5e429d60ceeb160a (diff) | |
| download | gitlab-ce-8552e8e3cd584d04161a7b4373827195fa7da7f0.tar.gz | |
Merge branch '58632-fix-mr-widget-padding' into 'master'
Fix MR widget padding
Closes #58632
See merge request gitlab-org/gitlab-ce!28472
Diffstat (limited to 'app/assets/stylesheets/pages/merge_requests.scss')
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 44b558dd5ff..ab5a9e170f0 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -87,6 +87,11 @@ padding: $gl-padding; } +.mr-widget-info { + padding-left: $gl-padding-50 - $gl-padding-32; + padding-right: $gl-padding; +} + .mr-state-widget { color: $gl-text-color; @@ -560,6 +565,10 @@ .mr-links { padding-left: $status-icon-size + $gl-btn-padding; + + &:last-child { + padding-bottom: $gl-padding; + } } .mr-info-list { @@ -1030,11 +1039,6 @@ background: $black-transparent; } -.source-branch-removal-status { - padding-left: 50px; - padding-bottom: $gl-padding; -} - .mr-compare { .diff-file .file-title-flex-parent { top: $header-height + 51px; |