golem
/
VectorGOLEM
9
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Refactor: Revert to previous ordering 

In I23f18fc5f078da3331cad540bbaf533d348f2108 layout was pulled out
into a separate file and we changed the ordering of our CSS.

This was done with the thinking that media print queries would be
mixed with media screen.

After discussions with Volker, I have been convinced this was a
mistake.

media queries of the same type can be nested so the @media screen
is removed from layout.less and the media query in index.less will
be used instead.

Change-Id: I3aab00c9bcc734ea1ba5a9cf242c6e36ac1cc076
This commit is contained in:
jdlrobson 2020-04-27 11:38:14 -07:00 committed by Jdlrobson
parent 7ccb3a0fe1
commit 95c80c4efe
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 */
@media screen {
@import 'common.less';
@import 'legacy/layout.less';
@import 'PersonalMenu.less';
@import 'SearchBox.less';
@import 'VectorTabs.less';
@ -16,6 +17,5 @@
@import 'externalLinks.less';
}
@import 'legacy/layout.less';
@import 'watchstar-ie8.less';
@import 'print.less';

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

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

4
resources/skins.vector.styles/legacy/layout.less
View File

@ -3,7 +3,6 @@
@import 'mediawiki.mixins.less';
@media screen {
.mw-body,
#mw-data-after-content {
margin-left: 10em;
@ -73,11 +72,10 @@
margin-left: 10em;
margin-top: 0;
}
}
/* 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. */
@media screen and ( min-width: 982px ) {
@media ( min-width: 982px ) {
.mw-body,
#mw-head-base,
#left-navigation,