From 7abf395766488c1adc7637a8fac00307127163d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartosz=20Dziewo=C5=84ski?= <matma.rex@gmail.com>
Date: Wed, 27 Dec 2017 11:26:29 +0000
Subject: [PATCH] Revert "Revert "Print styles in Vector are no longer feature
 flagged""

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

This reverts commit 7d2fc6df27d46b28081e1834c80b913eee48ed69.

Bug: T178028
Bug: T183640
Change-Id: Ib46c69b061b522fc6365459297ad3f3d4f4d0d0d
---
 SkinVector.php | 12 ------------
 skin.json      | 15 ++++-----------
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/SkinVector.php b/SkinVector.php
index 23dd9449e..5dd6ef20c 100644
--- a/SkinVector.php
+++ b/SkinVector.php
@@ -44,10 +44,6 @@ class SkinVector extends SkinTemplate {
 	/** @inheritDoc */
 	public function getPageClasses( $title ) {
 		$className = parent::getPageClasses( $title );
-		if ( $this->vectorConfig->get( 'VectorExperimentalPrintStyles' ) ) {
-			$className .= ' vector-experimental-print-styles';
-		}
-		$className .= ' vector-nav-directionality';
 		return $className;
 	}
 
@@ -74,14 +70,6 @@ class SkinVector extends SkinTemplate {
 			$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' );
 	}
 
diff --git a/skin.json b/skin.json
index 47bdb50a2..b2b079f8b 100644
--- a/skin.json
+++ b/skin.json
@@ -38,6 +38,7 @@
 	"@note": "When modifying skins.vector.styles definition, make sure the installer still works",
 	"ResourceModules": {
 		"skins.vector.styles": {
+			"class": "Vector\\ResourceLoaderLessModule",
 			"targets": [ "desktop", "mobile" ],
 			"position": "top",
 			"styles": {
@@ -46,17 +47,11 @@
 				},
 				"screen-hd.less": {
 					"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": {
 			"targets": [ "desktop", "mobile" ],
 			"position": "top",
@@ -110,8 +105,6 @@
 	"config": {
 		"VectorUseSimpleSearch": true,
 		"VectorUseIconWatch": true,
-		"@VectorExperimentalPrintStyles": "Temporary config variable to feature flag new print styles (T154965)",
-		"VectorExperimentalPrintStyles": false,
 		"VectorResponsive": false,
 		"VectorPrintLogo": false
 	},