wikimedia/mediawiki-skins-Vector
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/Vector.git synced 2024-11-24 23:55:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Refactor: Revert to previous ordering"

Browse source
This commit is contained in:
jenkins-bot 2020-04-28 16:51:58 +00:00 committed by Gerrit Code Review
parent 0f25ad1aa7 95c80c4efe
commit 5a525489a1
3 changed files with 61 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/skins.vector.styles/index.less
View file

@ -3,6 +3,7 @@
/* Vector screen styles */ /* Vector screen styles */
@media screen { @media screen {
@import 'common.less'; @import 'common.less';
@import 'legacy/layout.less';
@import 'PersonalMenu.less'; @import 'PersonalMenu.less';
@import 'SearchBox.less'; @import 'SearchBox.less';
@import 'VectorTabs.less'; @import 'VectorTabs.less';
@ -16,6 +17,5 @@
@import 'externalLinks.less'; @import 'externalLinks.less';
} }
@import 'legacy/layout.less';
@import 'watchstar-ie8.less'; @import 'watchstar-ie8.less';
@import 'print.less'; @import 'print.less';

2
resources/skins.vector.styles/legacy.less
View file

@ -3,6 +3,7 @@
/* Vector screen styles */ /* Vector screen styles */
@media screen { @media screen {
@import 'common.less'; @import 'common.less';
@import 'legacy/layout.less';
@import 'PersonalMenu.less'; @import 'PersonalMenu.less';
@import 'SearchBox.less'; @import 'SearchBox.less';
@import 'VectorTabs.less'; @import 'VectorTabs.less';
@ -15,6 +16,5 @@
@import 'externalLinks.less'; @import 'externalLinks.less';
} }
@import 'legacy/layout.less';
@import 'watchstar-ie8.less'; @import 'watchstar-ie8.less';
@import 'print.less'; @import 'print.less';

120
resources/skins.vector.styles/legacy/layout.less
View file

@ -3,81 +3,79 @@
@import 'mediawiki.mixins.less'; @import 'mediawiki.mixins.less';
@media screen { .mw-body,
.mw-body, #mw-data-after-content {
#mw-data-after-content { margin-left: 10em;
margin-left: 10em; }
}
.mw-indicators { .mw-indicators {
float: right; float: right;
z-index: @z-index-indicators; z-index: @z-index-indicators;
} }
.mw-body-content { .mw-body-content {
position: relative; position: relative;
z-index: @z-index-base; z-index: @z-index-base;
} }
/* Head */ /* Head */
#mw-page-base { #mw-page-base {
height: 5em; height: 5em;
} }
#mw-head-base { #mw-head-base {
margin-top: -5em; margin-top: -5em;
margin-left: 10em; margin-left: 10em;
height: 5em; height: 5em;
} }
/* Hide, but keep accessible for screen-readers */ /* Hide, but keep accessible for screen-readers */
#mw-navigation h2 { #mw-navigation h2 {
position: absolute; position: absolute;
top: -9999px; top: -9999px;
} }
#mw-head { #mw-head {
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
width: 100%; width: 100%;
} }
/* Navigation Containers */ /* Navigation Containers */
#left-navigation { #left-navigation {
float: left; float: left;
margin-left: 10em; margin-left: 10em;
margin-top: 2.5em; margin-top: 2.5em;
/* When right nav would overlap left nav, it's placed below it /* When right nav would overlap left nav, it's placed below it
(normal CSS floats behavior). This rule ensures that no empty space (normal CSS floats behavior). This rule ensures that no empty space
is shown between them due to right nav's margin-top. Page layout is shown between them due to right nav's margin-top. Page layout
is still broken, but at least the nav overlaps only the page title is still broken, but at least the nav overlaps only the page title
instead of half the content. */ instead of half the content. */
margin-bottom: -2.5em; margin-bottom: -2.5em;
} }
#right-navigation { #right-navigation {
float: right; float: right;
margin-top: 2.5em; margin-top: 2.5em;
} }
#mw-panel { #mw-panel {
position: absolute; position: absolute;
top: 0; top: 0;
width: 10em; width: 10em;
left: 0; left: 0;
} }
#footer, /* FIXME: Remove 2 weeks after deployment. */ #footer, /* FIXME: Remove 2 weeks after deployment. */
.mw-footer { .mw-footer {
margin-left: 10em; margin-left: 10em;
margin-top: 0; margin-top: 0;
}
} }
/* Vector screen styles for high definition displays. These rules cross the above components and are /* Vector screen styles for high definition displays. These rules cross the above components and are
grouped together here only for the sake of the media query common to each. */ grouped together here only for the sake of the media query common to each. */
@media screen and ( min-width: 982px ) { @media ( min-width: 982px ) {
.mw-body, .mw-body,
#mw-head-base, #mw-head-base,
#left-navigation, #left-navigation,