summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-09-07 07:46:01 +0000
committerPhil Hughes <me@iamphill.com>2017-09-07 07:46:01 +0000
commit43f474901db9ca4192940af38519befb91c6f241 (patch)
tree9c0eacbeb80ef23951bbf2b4f51c738fd7009820
parent728a13a9c9757bc4908afc0915cca556cb7f99f5 (diff)
parent2103d693276b73a74b496fac028533ec852b88b1 (diff)
downloadgitlab-ce-43f474901db9ca4192940af38519befb91c6f241.tar.gz
Merge branch 'fix-mr-tabs-position' into 'master'
Fix mr tabs position Closes #37487 See merge request !14064
-rw-r--r--app/assets/stylesheets/pages/diff.scss12
-rw-r--r--app/assets/stylesheets/pages/issuable.scss8
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss4
3 files changed, 16 insertions, 8 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;
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 9f2cb979518..d8a15faf7e9 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -220,7 +220,7 @@
.right-sidebar {
position: absolute;
- top: $header-height;
+ top: $new-navbar-height;
bottom: 0;
right: 0;
transition: width .3s;
@@ -230,7 +230,7 @@
.issuable-sidebar {
width: calc(100% + 100px);
- height: calc(100% - #{$header-height});
+ height: calc(100% - #{$new-navbar-height});
overflow-y: scroll;
overflow-x: hidden;
-webkit-overflow-scrolling: touch;
@@ -479,10 +479,10 @@
}
.with-performance-bar .right-sidebar {
- top: $header-height + $performance-bar-height;
+ top: $new-navbar-height + $performance-bar-height;
.issuable-sidebar {
- height: calc(100% - #{$header-height} - #{$performance-bar-height});
+ height: calc(100% - #{$new-navbar-height} - #{$performance-bar-height});
}
}
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 8609f72bdab..439636fe026 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -645,7 +645,7 @@
}
.merge-request-tabs-holder {
- top: $header-height;
+ top: $new-navbar-height;
z-index: 200;
background-color: $white-light;
border-bottom: 1px solid $border-color;
@@ -675,7 +675,7 @@
}
.with-performance-bar .merge-request-tabs-holder {
- top: $header-height + $performance-bar-height;
+ top: $new-navbar-height + $performance-bar-height;
}
.merge-request-tabs {