summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-08-01 18:04:03 +0100
committerPhil Hughes <me@iamphill.com>2017-08-03 17:03:49 +0100
commit370839cf10828e791893adaf81ab2e39c2b419cb (patch)
tree703722a369ea7545ff97e8cddaf8889bf0f05b3f
parent86d34921fee9ec324fdce3d36a8557604851a619 (diff)
downloadgitlab-ce-370839cf10828e791893adaf81ab2e39c2b419cb.tar.gz
fixed alert box moving when is-stuck gets added
-rw-r--r--app/assets/stylesheets/pages/diff.scss6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index f98129bc09d..cfc801859a7 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -577,7 +577,8 @@
background-color: $white-light;
z-index: 190;
- + .files {
+ + .files,
+ + .alert {
margin-top: 1px;
}
@@ -596,7 +597,8 @@
display: none;
}
- + .files {
+ + .files,
+ + .alert {
margin-top: 30px;
}
}