wikimedia/mediawiki-skins-Vector
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/Vector.git synced 2024-11-28 09:30:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Print styles in Vector are no longer feature flagged""

Browse source 
The revert looks like it has been performed incorrectly,
and I found a much better solution to the task anyway.

This reverts commit 7d2fc6df27.

Bug: T178028
Bug: T183640
Change-Id: Ib46c69b061b522fc6365459297ad3f3d4f4d0d0d
This commit is contained in:
Bartosz Dziewoński 2017-12-27 11:26:29 +00:00
parent 7d2fc6df27
commit 7abf395766
2 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
SkinVector.php
View file

@ -44,10 +44,6 @@ class SkinVector extends SkinTemplate {
/** @inheritDoc */ /** @inheritDoc */
public function getPageClasses( $title ) { public function getPageClasses( $title ) {
$className = parent::getPageClasses( $title ); $className = parent::getPageClasses( $title );
if ( $this->vectorConfig->get( 'VectorExperimentalPrintStyles' ) ) {
$className .= ' vector-experimental-print-styles';
}
$className .= ' vector-nav-directionality';
return $className; return $className;
} }
@ -74,14 +70,6 @@ class SkinVector extends SkinTemplate {
$this->enableResponsiveMode(); $this->enableResponsiveMode();
} }
// Print styles are feature flagged.
// This flag can be removed when T169732 is resolved.
if ( $this->vectorConfig->get( 'VectorExperimentalPrintStyles' ) ) {
// Note, when deploying (T169732) we'll want to fold the stylesheet into
// skins.vector.styles and remove this module altogether.
$out->addModuleStyles( 'skins.vector.styles.experimental.print' );
}
$out->addModules( 'skins.vector.js' ); $out->addModules( 'skins.vector.js' );
} }

15
skin.json
View file

@ -38,6 +38,7 @@
"@note": "When modifying skins.vector.styles definition, make sure the installer still works", "@note": "When modifying skins.vector.styles definition, make sure the installer still works",
"ResourceModules": { "ResourceModules": {
"skins.vector.styles": { "skins.vector.styles": {
"class": "Vector\\ResourceLoaderLessModule",
"targets": [ "desktop", "mobile" ], "targets": [ "desktop", "mobile" ],
"position": "top", "position": "top",
"styles": { "styles": {
@ -46,17 +47,11 @@
}, },
"screen-hd.less": { "screen-hd.less": {
"media": "screen and (min-width: 982px)" "media": "screen and (min-width: 982px)"
} },
"print.less": {}
} }
}, },
"skins.vector.styles.experimental.print": {
"class": "Vector\\ResourceLoaderLessModule",
"targets": [ "desktop", "mobile" ],
"position": "top",
"styles": [
"print.less"
]
},
"skins.vector.styles.responsive": { "skins.vector.styles.responsive": {
"targets": [ "desktop", "mobile" ], "targets": [ "desktop", "mobile" ],
"position": "top", "position": "top",
@ -110,8 +105,6 @@
"config": { "config": {
"VectorUseSimpleSearch": true, "VectorUseSimpleSearch": true,
"VectorUseIconWatch": true, "VectorUseIconWatch": true,
"@VectorExperimentalPrintStyles": "Temporary config variable to feature flag new print styles (T154965)",
"VectorExperimentalPrintStyles": false,
"VectorResponsive": false, "VectorResponsive": false,
"VectorPrintLogo": false "VectorPrintLogo": false
}, },