summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/diff.scss
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-09-14 20:25:48 +0100
committerPhil Hughes <me@iamphill.com>2017-09-22 11:13:19 +0100
commit7ce70dd5a046048ef13eb5f93ece8f149bfbaea3 (patch)
tree5ddd05ba2b378bd0ee63f8b9d9b723bd699dd3f1 /app/assets/stylesheets/pages/diff.scss
parent41068df71d8c198bced9cc16eeb4ed1f70961e86 (diff)
downloadgitlab-ce-7ce70dd5a046048ef13eb5f93ece8f149bfbaea3.tar.gz
Dynamically create offset for sticky bar
Diffstat (limited to 'app/assets/stylesheets/pages/diff.scss')
-rw-r--r--app/assets/stylesheets/pages/diff.scss9
1 files changed, 2 insertions, 7 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 951580ea1fe..5dbf44073b5 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -451,7 +451,7 @@
}
.files {
- margin-top: -1px;
+ margin-top: 1px;
.diff-file:last-child {
margin-bottom: 0;
@@ -586,11 +586,6 @@
top: 76px;
}
- + .files,
- + .alert {
- margin-top: 1px;
- }
-
&:not(.is-stuck) .diff-stats-additions-deletions-collapsed {
display: none;
}
@@ -608,7 +603,7 @@
+ .files,
+ .alert {
- margin-top: 32px;
+ // margin-top: 32px;
}
}
}