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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
37b0dc4f
Commit
37b0dc4f
authored
Jan 19, 2021
by
Mark Florian
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 'master'
Changed the values of z-index See merge request gitlab-org/gitlab!51135
parents
cc6daea3
ec9429c6
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
8 additions
and
7 deletions
+8
-7
app/assets/stylesheets/components/batch_comments/review_bar.scss
...ets/stylesheets/components/batch_comments/review_bar.scss
+1
-1
app/assets/stylesheets/framework/awards.scss
app/assets/stylesheets/framework/awards.scss
+1
-1
app/assets/stylesheets/framework/contextual_sidebar.scss
app/assets/stylesheets/framework/contextual_sidebar.scss
+1
-1
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+1
-1
app/assets/stylesheets/framework/sidebar.scss
app/assets/stylesheets/framework/sidebar.scss
+1
-1
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-0
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+1
-1
app/assets/stylesheets/utilities.scss
app/assets/stylesheets/utilities.scss
+1
-1
No files found.
app/assets/stylesheets/components/batch_comments/review_bar.scss
View file @
37b0dc4f
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
left
:
0
;
left
:
0
;
width
:
100%
;
width
:
100%
;
background
:
$white
;
background
:
$white
;
z-index
:
300
;
z-index
:
$zindex-dropdown-menu
;
padding
:
7px
0
6px
;
// to keep aligned with "collapse sidebar" button on the left sidebar
padding
:
7px
0
6px
;
// to keep aligned with "collapse sidebar" button on the left sidebar
border-top
:
1px
solid
$border-color
;
border-top
:
1px
solid
$border-color
;
padding-left
:
$contextual-sidebar-width
;
padding-left
:
$contextual-sidebar-width
;
...
...
app/assets/stylesheets/framework/awards.scss
View file @
37b0dc4f
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
top
:
0
;
top
:
0
;
margin-top
:
3px
;
margin-top
:
3px
;
padding
:
$gl-padding
;
padding
:
$gl-padding
;
z-index
:
300
;
z-index
:
$zindex-dropdown-menu
;
width
:
$award-emoji-width
;
width
:
$award-emoji-width
;
font-size
:
14px
;
font-size
:
14px
;
background-color
:
$white
;
background-color
:
$white
;
...
...
app/assets/stylesheets/framework/contextual_sidebar.scss
View file @
37b0dc4f
...
@@ -471,7 +471,7 @@
...
@@ -471,7 +471,7 @@
background-color
:
$black-transparent
;
background-color
:
$black-transparent
;
height
:
100%
;
height
:
100%
;
width
:
100%
;
width
:
100%
;
z-index
:
300
;
z-index
:
$zindex-dropdown-menu
;
}
}
}
}
}
}
app/assets/stylesheets/framework/dropdowns.scss
View file @
37b0dc4f
...
@@ -216,7 +216,7 @@
...
@@ -216,7 +216,7 @@
position
:
absolute
;
position
:
absolute
;
width
:
auto
;
width
:
auto
;
top
:
100%
;
top
:
100%
;
z-index
:
300
;
z-index
:
$zindex-dropdown-menu
;
min-width
:
240px
;
min-width
:
240px
;
max-width
:
500px
;
max-width
:
500px
;
margin-top
:
$dropdown-vertical-offset
;
margin-top
:
$dropdown-vertical-offset
;
...
...
app/assets/stylesheets/framework/sidebar.scss
View file @
37b0dc4f
...
@@ -75,7 +75,7 @@
...
@@ -75,7 +75,7 @@
.right-sidebar-expanded
{
.right-sidebar-expanded
{
padding-right
:
0
;
padding-right
:
0
;
z-index
:
300
;
z-index
:
$zindex-dropdown-menu
;
@include
media-breakpoint-only
(
sm
)
{
@include
media-breakpoint-only
(
sm
)
{
&
:not
(
.wiki-sidebar
)
:not
(
.build-sidebar
)
:not
(
.issuable-bulk-update-sidebar
)
.content-wrapper
{
&
:not
(
.wiki-sidebar
)
:not
(
.build-sidebar
)
:not
(
.issuable-bulk-update-sidebar
)
.content-wrapper
{
...
...
app/assets/stylesheets/framework/variables.scss
View file @
37b0dc4f
...
@@ -433,6 +433,7 @@ $browser-scrollbar-size: 10px;
...
@@ -433,6 +433,7 @@ $browser-scrollbar-size: 10px;
*/
*/
$header-height
:
40px
;
$header-height
:
40px
;
$header-zindex
:
1000
;
$header-zindex
:
1000
;
$zindex-dropdown-menu
:
300
;
$suggestion-header-height
:
46px
;
$suggestion-header-height
:
46px
;
$ide-statusbar-height
:
25px
;
$ide-statusbar-height
:
25px
;
$fixed-layout-width
:
1280px
;
$fixed-layout-width
:
1280px
;
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
37b0dc4f
...
@@ -221,7 +221,7 @@ $mr-widget-min-height: 69px;
...
@@ -221,7 +221,7 @@ $mr-widget-min-height: 69px;
.mr-widget-pipeline-graph
{
.mr-widget-pipeline-graph
{
.dropdown-menu
{
.dropdown-menu
{
z-index
:
300
;
z-index
:
$zindex-dropdown-menu
;
}
}
}
}
...
...
app/assets/stylesheets/utilities.scss
View file @
37b0dc4f
...
@@ -110,7 +110,7 @@
...
@@ -110,7 +110,7 @@
// This utility is used to force the z-index to match that of dropdown menu's
// This utility is used to force the z-index to match that of dropdown menu's
.gl-z-dropdown-menu
\
!
{
.gl-z-dropdown-menu
\
!
{
z-index
:
300
!
important
;
z-index
:
$zindex-dropdown-menu
!
important
;
}
}
.gl-flex-basis-quarter
{
.gl-flex-basis-quarter
{
...
...
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