diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-03-08 11:18:06 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-03-08 11:18:06 +0000 |
| commit | c8116ebda8cfb1176d56ff371062e7564e969022 (patch) | |
| tree | af306720c371807c9fc1ce5e4f0b6067920435ed | |
| parent | b4852ab49a385f3cc900cf0f2584097b8a154ac0 (diff) | |
| parent | cf05e49f19a782f3384aba32718d3333e57ad03c (diff) | |
| download | gitlab-ce-c8116ebda8cfb1176d56ff371062e7564e969022.tar.gz | |
Merge branch 'sitcky-prefix-fix' into 'master'
Fixed sticky bar styling in Safari
Closes #58625
See merge request gitlab-org/gitlab-ce!25913
| -rw-r--r-- | .stylelintrc | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/mixins.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 2 |
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 e50db5310a6..c88922ae5ea 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; @@ -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; 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; } |