Merge branch 'sitcky-prefix-fix' into 'master'

Fixed sticky bar styling in Safari

Closes #58625

See merge request gitlab-org/gitlab-ce!25913
This commit is contained in:
Filipa Lacerda 2019-03-08 11:18:06 +00:00
commit c8116ebda8
4 changed files with 7 additions and 1 deletions

View File

@ -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"] }]
}
}

View File

@ -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;

View File

@ -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;
@ -725,6 +726,7 @@
}
@include media-breakpoint-up(sm) {
position: -webkit-sticky;
position: sticky;
top: $header-height;
background-color: $white-light;
@ -1015,6 +1017,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;

View File

@ -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;
}