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
91bf078d
Commit
91bf078d
authored
Apr 03, 2019
by
Kushal Pandya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Re-use MR tabs styles to Epic tabs
parent
a6e9175f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
16 deletions
+22
-16
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+22
-16
No files found.
app/assets/stylesheets/pages/merge_requests.scss
View file @
91bf078d
...
@@ -595,7 +595,6 @@
...
@@ -595,7 +595,6 @@
color
:
$gl-text-color
;
color
:
$gl-text-color
;
}
}
.git-merge-container
{
.git-merge-container
{
justify-content
:
space-between
;
justify-content
:
space-between
;
flex
:
1
;
flex
:
1
;
...
@@ -805,7 +804,8 @@
...
@@ -805,7 +804,8 @@
}
}
}
}
.merge-request-tabs-holder
{
.merge-request-tabs-holder
,
.epic-tabs-holder
{
top
:
$header-height
;
top
:
$header-height
;
z-index
:
250
;
z-index
:
250
;
background-color
:
$white-light
;
background-color
:
$white-light
;
...
@@ -823,11 +823,6 @@
...
@@ -823,11 +823,6 @@
@include
media-breakpoint-down
(
xs
)
{
@include
media-breakpoint-down
(
xs
)
{
right
:
0
;
right
:
0
;
}
}
.merge-request-tabs-container
{
padding-left
:
$gl-padding
;
padding-right
:
$gl-padding
;
}
}
}
.nav-links
{
.nav-links
{
...
@@ -835,11 +830,21 @@
...
@@ -835,11 +830,21 @@
}
}
}
}
.with-performance-bar
.merge-request-tabs-holder
{
.merge-request-tabs-holder.affix
.merge-request-tabs-container
,
top
:
$header-height
+
$performance-bar-height
;
.epic-tabs-holder.affix
.epic-tabs-container
{
padding-left
:
$gl-padding
;
padding-right
:
$gl-padding
;
}
}
.merge-request-tabs
{
.with-performance-bar
{
.merge-request-tabs-holder
,
.epic-tabs-holder
{
top
:
$header-height
+
$performance-bar-height
;
}
}
.merge-request-tabs
,
.epic-tabs
{
display
:
flex
;
display
:
flex
;
flex-wrap
:
nowrap
;
flex-wrap
:
nowrap
;
margin-bottom
:
0
;
margin-bottom
:
0
;
...
@@ -847,7 +852,8 @@
...
@@ -847,7 +852,8 @@
}
}
.limit-container-width
{
.limit-container-width
{
.merge-request-tabs-container
{
.merge-request-tabs-container
,
.epic-tabs-container
{
max-width
:
$limited-layout-width
;
max-width
:
$limited-layout-width
;
margin-left
:
auto
;
margin-left
:
auto
;
margin-right
:
auto
;
margin-right
:
auto
;
...
@@ -860,7 +866,8 @@
...
@@ -860,7 +866,8 @@
}
}
}
}
.merge-request-tabs-container
{
.merge-request-tabs-container
,
.epic-tabs-container
{
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
...
@@ -878,10 +885,9 @@
...
@@ -878,10 +885,9 @@
}
}
.limit-container-width
:not
(
.container-limited
)
{
.limit-container-width
:not
(
.container-limited
)
{
.merge-request-tabs-holder
:not
(
.affix
)
{
.merge-request-tabs-holder
:not
(
.affix
)
.merge-request-tabs-container
,
.merge-request-tabs-container
{
.epic-tabs-holder
:not
(
.affix
)
.epic-tabs-container
{
max-width
:
$limited-layout-width
-
(
$gl-padding
*
2
);
max-width
:
$limited-layout-width
-
(
$gl-padding
*
2
);
}
}
}
}
}
...
...
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