wikimedia/mediawiki-skins-Vector
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/Vector.git synced 2024-12-01 02:37:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Apply margin-top to indicators"

Browse source
This commit is contained in:
jenkins-bot 2023-05-02 15:37:37 +00:00 committed by Gerrit Code Review
parent 90fcfc1624 3433525941
commit e8b047d63e
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
resources/common/variables.less
View file

@ -136,6 +136,9 @@
// Language button // Language button
@height-button-lang: unit( 32 / @font-size-browser, em ); @height-button-lang: unit( 32 / @font-size-browser, em );
// Pre-content
@margin-top-pre-content: 8px;
// Header // Header
// T245190 T296321 For sticky header, set an explicit height. This is needed for scroll padding // T245190 T296321 For sticky header, set an explicit height. This is needed for scroll padding
// and for other sticky elements on the page. Setting the height in relative units enables // and for other sticky elements on the page. Setting the height in relative units enables

10
resources/skins.vector.styles/layouts/screen.less
View file

@ -70,6 +70,12 @@ body {
// Contain the floating .mw-indicators, but don't use clearfix because of browser inconsistencies // Contain the floating .mw-indicators, but don't use clearfix because of browser inconsistencies
// when combining 'clear' and 'margin-top' (T325391) // when combining 'clear' and 'margin-top' (T325391)
overflow: hidden; overflow: hidden;
// Margin is only applied to indicators inside `.vector-body-before-content` since they can
// also appear next to the page title, where margin is not needed.
.mw-indicators {
margin-top: @margin-top-pre-content;
}
} }
.mw-body .mw-portlet-lang { .mw-body .mw-portlet-lang {
@ -82,7 +88,7 @@ body {
} }
#siteSub { #siteSub {
margin-top: 8px; // T311564 margin-top: @margin-top-pre-content; // T311564
} }
// Styles only applied to non-empty #contentSub to avoid extra margins when both #contentSub and #contentSub2 // Styles only applied to non-empty #contentSub to avoid extra margins when both #contentSub and #contentSub2
@ -94,7 +100,7 @@ body {
color: @color-subtle; color: @color-subtle;
width: auto; width: auto;
// Visually separate #contentSub and #contentSub2 (T315639) // Visually separate #contentSub and #contentSub2 (T315639)
margin: 8px 0 0; margin: @margin-top-pre-content 0 0;
} }
.parsoid-body { .parsoid-body {