Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
cf05e49f
Commit
cf05e49f
authored
Mar 08, 2019
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed sticky bar styling in Safari
Closes
https://gitlab.com/gitlab-org/gitlab-ce/issues/58625
parent
45b3c542
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
1 deletion
+7
-1
.stylelintrc
.stylelintrc
+1
-1
app/assets/stylesheets/framework/mixins.scss
app/assets/stylesheets/framework/mixins.scss
+1
-0
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+3
-0
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+2
-0
No files found.
.stylelintrc
View file @
cf05e49f
...
@@ -102,6 +102,6 @@
...
@@ -102,6 +102,6 @@
"selector-pseudo-element-no-unknown":true,
"selector-pseudo-element-no-unknown":true,
"shorthand-property-no-redundant-values":true,
"shorthand-property-no-redundant-values":true,
"string-quotes":"single",
"string-quotes":"single",
"value-no-vendor-prefix":
true
"value-no-vendor-prefix":
[true, { ignoreValues: ["sticky"] }]
}
}
}
}
app/assets/stylesheets/framework/mixins.scss
View file @
cf05e49f
...
@@ -259,6 +259,7 @@
...
@@ -259,6 +259,7 @@
background
:
$gray-light
;
background
:
$gray-light
;
border
:
1px
solid
$border-color
;
border
:
1px
solid
$border-color
;
color
:
$gl-text-color
;
color
:
$gl-text-color
;
position
:
-
webkit-sticky
;
position
:
sticky
;
position
:
sticky
;
top
:
$header-height
;
top
:
$header-height
;
padding
:
$grid-size
;
padding
:
$grid-size
;
...
...
app/assets/stylesheets/pages/diff.scss
View file @
cf05e49f
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
@media
(
min-width
:
map-get
(
$grid-breakpoints
,
md
))
{
@media
(
min-width
:
map-get
(
$grid-breakpoints
,
md
))
{
$mr-file-header-top
:
$mr-version-controls-height
+
$header-height
+
$mr-tabs-height
;
$mr-file-header-top
:
$mr-version-controls-height
+
$header-height
+
$mr-tabs-height
;
position
:
-
webkit-sticky
;
position
:
sticky
;
position
:
sticky
;
top
:
$mr-file-header-top
;
top
:
$mr-file-header-top
;
z-index
:
102
;
z-index
:
102
;
...
@@ -721,6 +722,7 @@
...
@@ -721,6 +722,7 @@
}
}
@include
media-breakpoint-up
(
sm
)
{
@include
media-breakpoint-up
(
sm
)
{
position
:
-
webkit-sticky
;
position
:
sticky
;
position
:
sticky
;
top
:
$header-height
;
top
:
$header-height
;
background-color
:
$white-light
;
background-color
:
$white-light
;
...
@@ -1011,6 +1013,7 @@
...
@@ -1011,6 +1013,7 @@
}
}
.diff-tree-list
{
.diff-tree-list
{
position
:
-
webkit-sticky
;
position
:
sticky
;
position
:
sticky
;
$top-pos
:
$header-height
+
$mr-tabs-height
+
$mr-version-controls-height
+
10px
;
$top-pos
:
$header-height
+
$mr-tabs-height
+
$mr-version-controls-height
+
10px
;
top
:
$header-height
+
$mr-tabs-height
+
$mr-version-controls-height
+
10px
;
top
:
$header-height
+
$mr-tabs-height
+
$mr-version-controls-height
+
10px
;
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
cf05e49f
...
@@ -784,6 +784,7 @@
...
@@ -784,6 +784,7 @@
}
}
@include
media-breakpoint-up
(
md
)
{
@include
media-breakpoint-up
(
md
)
{
position
:
-
webkit-sticky
;
position
:
sticky
;
position
:
sticky
;
top
:
$header-height
+
$mr-tabs-height
;
top
:
$header-height
+
$mr-tabs-height
;
width
:
100%
;
width
:
100%
;
...
@@ -810,6 +811,7 @@
...
@@ -810,6 +811,7 @@
border-bottom
:
1px
solid
$border-color
;
border-bottom
:
1px
solid
$border-color
;
@include
media-breakpoint-up
(
sm
)
{
@include
media-breakpoint-up
(
sm
)
{
position
:
-
webkit-sticky
;
position
:
sticky
;
position
:
sticky
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment