kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Re-use MR tabs styles to Epic tabs

Browse source
This commit is contained in:
Kushal Pandya 2019-04-03 17:12:34 +05:30
parent a6e9175fdd
commit 91bf078dd6
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
app/assets/stylesheets/pages/merge_requests.scss
View file

@ -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 @@
} }
} }
.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 @@
@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 @@
} }
} }
.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 @@
} }
.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 @@
} }
} }
.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 @@
} }
.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);
}
} }
} }