diff options
| author | Phil Hughes <me@iamphill.com> | 2019-01-09 08:35:15 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-01-09 08:35:15 +0000 |
| commit | 802de6dcba7917b7285ebfce002080900c195464 (patch) | |
| tree | 464d491c112615394994873bbc11a0a03225b475 | |
| parent | f7efb2e090e4fd07608a742722b4bd17c9bb7121 (diff) | |
| parent | c5c7bfc41c8834e57d048a27890e485afe586c88 (diff) | |
| download | gitlab-ce-802de6dcba7917b7285ebfce002080900c195464.tar.gz | |
Merge branch 'remove-gap-between-mr-tabs-and-file-header' into 'master'
Remove extra space between MR tab bar and sticky file headers
See merge request gitlab-org/gitlab-ce!24238
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/remove-gap-between-mr-tabs-and-file-header.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 18c62cb4f1e..b78f11aadf1 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -9,7 +9,7 @@ @media (min-width: map-get($grid-breakpoints, md)) { position: -webkit-sticky; position: sticky; - top: 92px; + top: $header-height + 51px; margin-left: -1px; border-left: 1px solid $border-color; z-index: 102; diff --git a/changelogs/unreleased/remove-gap-between-mr-tabs-and-file-header.yml b/changelogs/unreleased/remove-gap-between-mr-tabs-and-file-header.yml new file mode 100644 index 00000000000..ce8e1829b48 --- /dev/null +++ b/changelogs/unreleased/remove-gap-between-mr-tabs-and-file-header.yml @@ -0,0 +1,5 @@ +--- +title: Remove extra space between MR tab bar and sticky file headers +merge_request: +author: +type: fixed |