summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-03-08 10:30:42 +0000
committerPhil Hughes <me@iamphill.com>2019-03-08 10:30:42 +0000
commitcf05e49f19a782f3384aba32718d3333e57ad03c (patch)
tree49452987dbc2404b186f8bb474de0359ec406138
parent45b3c5420c1a45595211f941bac23ad9f2188af7 (diff)
downloadgitlab-ce-cf05e49f19a782f3384aba32718d3333e57ad03c.tar.gz
Fixed sticky bar styling in Safari
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58625
-rw-r--r--.stylelintrc2
-rw-r--r--app/assets/stylesheets/framework/mixins.scss1
-rw-r--r--app/assets/stylesheets/pages/diff.scss3
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss2
4 files changed, 7 insertions, 1 deletions
diff --git a/.stylelintrc b/.stylelintrc
index 04784a0a11a..c0f21aed292 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -102,6 +102,6 @@
"selector-pseudo-element-no-unknown":true,
"shorthand-property-no-redundant-values":true,
"string-quotes":"single",
- "value-no-vendor-prefix":true
+ "value-no-vendor-prefix":[true, { ignoreValues: ["sticky"] }]
}
}
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index ba3b0906e28..955ae80cd58 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -259,6 +259,7 @@
background: $gray-light;
border: 1px solid $border-color;
color: $gl-text-color;
+ position: -webkit-sticky;
position: sticky;
top: $header-height;
padding: $grid-size;
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 0dbbe9e4c25..84be53787b5 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -9,6 +9,7 @@
@media (min-width: map-get($grid-breakpoints, md)) {
$mr-file-header-top: $mr-version-controls-height + $header-height + $mr-tabs-height;
+ position: -webkit-sticky;
position: sticky;
top: $mr-file-header-top;
z-index: 102;
@@ -721,6 +722,7 @@
}
@include media-breakpoint-up(sm) {
+ position: -webkit-sticky;
position: sticky;
top: $header-height;
background-color: $white-light;
@@ -1011,6 +1013,7 @@
}
.diff-tree-list {
+ position: -webkit-sticky;
position: sticky;
$top-pos: $header-height + $mr-tabs-height + $mr-version-controls-height + 10px;
top: $header-height + $mr-tabs-height + $mr-version-controls-height + 10px;
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index e73d1a1289d..126b00af552 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -784,6 +784,7 @@
}
@include media-breakpoint-up(md) {
+ position: -webkit-sticky;
position: sticky;
top: $header-height + $mr-tabs-height;
width: 100%;
@@ -810,6 +811,7 @@
border-bottom: 1px solid $border-color;
@include media-breakpoint-up(sm) {
+ position: -webkit-sticky;
position: sticky;
}