diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-12 08:46:45 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-12 08:46:45 +0000 |
| commit | 6d2db33de43f20c314bee558919c1859e6f54d4a (patch) | |
| tree | 5ec10887f80085e8cd00217d33e18d48caee25e9 /app/assets/stylesheets | |
| parent | ccba2f445dc0efd670a492cef954169a117eb166 (diff) | |
| parent | d59f48987baceb25aa87dc6d87551f68af4bb1ed (diff) | |
| download | gitlab-ce-6d2db33de43f20c314bee558919c1859e6f54d4a.tar.gz | |
Merge branch 'master' into 'balsalmiq-support'
# Conflicts:
# app/models/blob.rb
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 2f946ab2f59..6a419384a34 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -523,11 +523,12 @@ } .content-block { - border-top: 1px solid $border-color; padding: $gl-padding-top $gl-padding; } .comments-disabled-notif { + line-height: 28px; + .btn { margin-left: 5px; } |