diff options
| author | Phil Hughes <me@iamphill.com> | 2019-06-03 07:26:21 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-06-03 07:26:21 +0000 |
| commit | 60a18fb289afeb4b8f72f5fc9b53b4ac6cbd31b0 (patch) | |
| tree | e53caf7bb2fbc53e89991eb04636f4da3e7fce1b | |
| parent | 985388b37efef52da64f635df15b5ad71845db6b (diff) | |
| parent | 50eaea5a7ff70c07bf86369ef1bc18b30c6276bb (diff) | |
| download | gitlab-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
| -rw-r--r-- | app/assets/stylesheets/framework/files.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/remove-mr-diff-header-height.yml | 5 |
3 files changed, 6 insertions, 2 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; diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 4a648a5d3b6..5e5d298f8f2 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -15,7 +15,6 @@ position: sticky; top: $mr-file-header-top; z-index: 102; - height: $mr-version-controls-height; &::before { content: ''; diff --git a/changelogs/unreleased/remove-mr-diff-header-height.yml b/changelogs/unreleased/remove-mr-diff-header-height.yml new file mode 100644 index 00000000000..c06c7281c58 --- /dev/null +++ b/changelogs/unreleased/remove-mr-diff-header-height.yml @@ -0,0 +1,5 @@ +--- +title: Remove fixed height from MR diff headers +merge_request: +author: +type: other |