Commit 9ee30346 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'ce-7327-add-roadmap-within-epic' into 'master'

CE Backport: Re-use MR tabs styles to Epic tabs

See merge request gitlab-org/gitlab-ce!26935
parents ecda9240 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);
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment