diff options
author | Stan Hu <stanhu@gmail.com> | 2019-08-07 10:28:24 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-08-07 10:28:24 +0300 |
commit | b1f4c3fae73d5837c4c12eb64bfcc88a4dec23db (patch) | |
tree | 2ddd9b0d3494f69b5353aa94d0865b9c42ee528d /app/assets/stylesheets/pages | |
parent | 46382a432d34aa23442d323fe1ae2355111e3741 (diff) | |
parent | 3c29ea01d16b384c7138a49edee245a4c0307cdd (diff) |
Merge branch 'master' into sh-break-out-invited-group-members
Diffstat (limited to 'app/assets/stylesheets/pages')
-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; |