summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-09-11 12:52:10 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-09-11 12:52:10 +0000
commitcd3985df97213655be652118184571daf3098456 (patch)
tree8f993299636e58b41eca39dcf5221abfaebd2a99
parent5cc140b202a0fc9bf2056b481c977bbcf9255919 (diff)
parent8f224abeae89980dd8e790c2b4323ee02285ddbd (diff)
downloadgitlab-ce-cd3985df97213655be652118184571daf3098456.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.scss2
-rw-r--r--changelogs/unreleased/changes-tab-jumping.yml5
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