Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-09-07 10:46:01 +0300
committerPhil Hughes <me@iamphill.com>2017-09-07 10:46:01 +0300
commit2103d693276b73a74b496fac028533ec852b88b1 (patch)
tree9c0eacbeb80ef23951bbf2b4f51c738fd7009820 /app/assets/stylesheets/pages/diff.scss
parent728a13a9c9757bc4908afc0915cca556cb7f99f5 (diff)
Fix mr tabs position
Diffstat (limited to 'app/assets/stylesheets/pages/diff.scss')
-rw-r--r--app/assets/stylesheets/pages/diff.scss12
1 files changed, 10 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 8cbf0ec6180..a7acaf6c728 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -578,12 +578,12 @@
@media (min-width: $screen-sm-min) {
position: -webkit-sticky;
position: sticky;
- top: 34px;
+ top: 24px;
background-color: $white-light;
z-index: 190;
&.diff-files-changed-merge-request {
- top: 84px;
+ top: 76px;
}
+ .files,
@@ -614,6 +614,14 @@
}
}
+@media (min-width: $screen-sm-min) {
+ .with-performance-bar {
+ .diff-files-changed.diff-files-changed-merge-request {
+ top: 76px + $performance-bar-height;
+ }
+ }
+}
+
.diff-file-changes {
width: 450px;
z-index: 150;