diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-09-11 12:52:10 +0000 |
---|---|---|
committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-12 12:56:17 +0200 |
commit | 068414754dd1f45a8c4139f1d4b9148c852ccae6 (patch) | |
tree | fbc2f09aef5600f348f61c1783b1e8f934f3cee9 | |
parent | 113514b88fdc02e687c8622db76a56bc75e1b31c (diff) | |
download | gitlab-ce-068414754dd1f45a8c4139f1d4b9148c852ccae6.tar.gz |
Merge branch 'changes-tab-jumping' into 'master'
Fixed changes bar jumping on merge requests
Closes #37589
See merge request !14157
-rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 2 | ||||
-rw-r--r-- | changelogs/unreleased/changes-tab-jumping.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 a7acaf6c728..54c3c0173ae 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -608,7 +608,7 @@ + .files, + .alert { - margin-top: 30px; + margin-top: 32px; } } } diff --git a/changelogs/unreleased/changes-tab-jumping.yml b/changelogs/unreleased/changes-tab-jumping.yml new file mode 100644 index 00000000000..5740dfade9f --- /dev/null +++ b/changelogs/unreleased/changes-tab-jumping.yml @@ -0,0 +1,5 @@ +--- +title: Fixed merge request changes bar jumping +merge_request: +author: +type: fixed |