From 53cabcfe66bd8e093d18273f1e01ade81186f3b1 Mon Sep 17 00:00:00 2001
From: Ed Sanders <esanders@wikimedia.org>
Date: Mon, 20 Feb 2017 14:42:10 +0000
Subject: [PATCH] Use new placeholder mixin

Also fix site search to use use the same shade of grey
as is used in OOUI and mw-ui.

Depends-On: I96686bb53cee1a833db8f4d0b691d5e4a1b82885
Change-Id: Ib6437b13760e8c13d06927cb45ef674a5f301e35
---
 components/search.less | 24 +++++++-----------------
 skin.json              |  2 +-
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/components/search.less b/components/search.less
index 81297d014..50bfe1388 100644
--- a/components/search.less
+++ b/components/search.less
@@ -1,4 +1,5 @@
 @import 'mediawiki.mixins';
+@import 'mediawiki.ui/variables';
 
 /* Search */
 #p-search {
@@ -56,23 +57,12 @@ div#simpleSearch {
 			outline: 0;
 		}
 
-		// These rules MAY NOT be merged because of how CSS requires browsers
-		// to parse unrecognized selectors!
-		// Note these rules ensure that placeholder text can be distinguished from
-		// standard text. In browsers which make this distinction clear these rules
-		// are not necessary.
-		// For inputs that use jquery.placeholder.js e.g. IE9-
-		&.placeholder {
-			color: #999;
-		}
-		// Distinguish placeholder text in IE10+
-		&:-ms-input-placeholder { // stylelint-disable-line selector-no-vendor-prefix
-			color: #999;
-		}
-		// Distinguish placeholder text in Firefox 18-
-		&:-moz-placeholder { // stylelint-disable-line selector-no-vendor-prefix
-			color: #999;
-		}
+		/* stylelint-disable indentation */
+		.mixin-placeholder( {
+			color: @colorGray7;
+			opacity: 1;
+		} );
+		/* stylelint-enable indentation */
 
 		// Undo the styles Webkit browsers apply to type=search fields,
 		// we provide our own
diff --git a/skin.json b/skin.json
index 9f09a939d..1802f0a0d 100644
--- a/skin.json
+++ b/skin.json
@@ -11,7 +11,7 @@
 	"license-name": "GPL-2.0+",
 	"type": "skin",
 	"requires": {
-		"MediaWiki": ">= 1.25.0"
+		"MediaWiki": ">= 1.29.0"
 	},
 	"ConfigRegistry": {
 		"vector": "GlobalVarConfig::newInstance"