diff options
| author | Marcel van Remmerden <mvanremmerden@gitlab.com> | 2019-08-05 21:59:20 +0000 |
|---|---|---|
| committer | Clement Ho <408677-ClemMakesApps@users.noreply.gitlab.com> | 2019-08-05 21:59:20 +0000 |
| commit | 96d10213714c6d463b02b768525d7411ae6bd3d0 (patch) | |
| tree | 8be4ab85b9100708888bee16fbbe96ce1e0a5e8a /app/assets/stylesheets | |
| parent | d2aeae589dee0a65181a79feaa69713750ee6013 (diff) | |
| download | gitlab-ce-96d10213714c6d463b02b768525d7411ae6bd3d0.tar.gz | |
Revert "Make status icon in merge widget borderless"
This reverts commit c3751046d217008404a0bd371e59d6ffd6734923.
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 2780afa11fa..cb7913ee54e 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -88,7 +88,7 @@ } .mr-widget-info { - padding-left: $gl-padding-50 - $gl-padding-32; + padding-left: $gl-padding; padding-right: $gl-padding; } @@ -262,23 +262,11 @@ } } - .widget-status-icon { - align-self: flex-start; - - button { - margin-left: $gl-padding; - } - } - .mr-widget-body { line-height: 28px; @include clearfix; - button { - margin-left: $gl-padding; - } - .approve-btn { margin-right: 5px; } @@ -527,7 +515,7 @@ } .mr-links { - padding-left: $status-icon-size + $gl-btn-padding; + padding-left: $gl-padding-8 + $status-icon-size + $gl-btn-padding; &:last-child { padding-bottom: $gl-padding; |