summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-06-03 07:26:21 +0000
committerPhil Hughes <me@iamphill.com>2019-06-03 07:26:21 +0000
commit60a18fb289afeb4b8f72f5fc9b53b4ac6cbd31b0 (patch)
treee53caf7bb2fbc53e89991eb04636f4da3e7fce1b /app/assets/stylesheets/framework
parent985388b37efef52da64f635df15b5ad71845db6b (diff)
parent50eaea5a7ff70c07bf86369ef1bc18b30c6276bb (diff)
downloadgitlab-ce-60a18fb289afeb4b8f72f5fc9b53b4ac6cbd31b0.tar.gz
Merge branch 'remove-mr-diff-header-height' into 'master'
Remove fixed height from MR diff headers Closes #62596 See merge request gitlab-org/gitlab-ce!28946
Diffstat (limited to 'app/assets/stylesheets/framework')
-rw-r--r--app/assets/stylesheets/framework/files.scss2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss
index 8493dfff1c5..ef6f0633150 100644
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -329,7 +329,7 @@ span.idiff {
background-color: $gray-light;
border-bottom: 1px solid $border-color;
border-top: 1px solid $border-color;
- padding: 5px $gl-padding;
+ padding: $gl-padding-8 $gl-padding;
margin: 0;
border-radius: $border-radius-default $border-radius-default 0 0;