Merge branch '28610-white-square-nav' into 'master'
Fix white square and sidebar animation Closes #28610 See merge request !9472
This commit is contained in:
commit
d2aeffce5d
|
@ -29,16 +29,14 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-width: $screen-sm-min) {
|
|
||||||
.content-wrapper {
|
|
||||||
padding-right: $gutter_collapsed_width;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.right-sidebar-collapsed {
|
.right-sidebar-collapsed {
|
||||||
padding-right: 0;
|
padding-right: 0;
|
||||||
|
|
||||||
@media (min-width: $screen-sm-min) {
|
@media (min-width: $screen-sm-min) {
|
||||||
|
.content-wrapper {
|
||||||
|
padding-right: $gutter_collapsed_width;
|
||||||
|
}
|
||||||
|
|
||||||
.merge-request-tabs-holder.affix {
|
.merge-request-tabs-holder.affix {
|
||||||
right: $gutter_collapsed_width;
|
right: $gutter_collapsed_width;
|
||||||
}
|
}
|
||||||
|
@ -56,6 +54,12 @@
|
||||||
.right-sidebar-expanded {
|
.right-sidebar-expanded {
|
||||||
padding-right: 0;
|
padding-right: 0;
|
||||||
|
|
||||||
|
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
|
||||||
|
.content-wrapper {
|
||||||
|
padding-right: $gutter_collapsed_width;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@media (min-width: $screen-md-min) {
|
@media (min-width: $screen-md-min) {
|
||||||
.content-wrapper {
|
.content-wrapper {
|
||||||
padding-right: $gutter_width;
|
padding-right: $gutter_width;
|
||||||
|
|
Loading…
Reference in New Issue