From 7e81cfa6637ab92be7192797f0f96858f36c2410 Mon Sep 17 00:00:00 2001
From: jdlrobson <jdlrobson@gmail.com>
Date: Wed, 16 Jan 2019 11:18:52 -0800
Subject: [PATCH] Separate ConfirmEdit styles from Login styles

ConfirmEdit styles are migrated from mediawiki.special.userlogin.common.styles
to ext.confirmEdit.fancyCaptcha.styles

The text of the reload itself mirrors the progressive blue icon by being
progressive itself

A couple of tweaks to the form (padding) are made to preserve the form to
its previous glorious status, other than that the file remains the same.

Bug: T213775
Change-Id: I2322194481e4d6b7662c0f075768d5941afa98b8
---
 skin.json                                     |  3 +
 .../minerva.less                              | 73 +++++++++++++++++++
 .../minerva.less                              | 65 -----------------
 3 files changed, 76 insertions(+), 65 deletions(-)
 create mode 100644 skinStyles/ext.confirmEdit.fancyCaptcha.styles/minerva.less

diff --git a/skin.json b/skin.json
index 65032e8..1165ea9 100644
--- a/skin.json
+++ b/skin.json
@@ -100,6 +100,9 @@
 	},
 	"ResourceModuleSkinStyles": {
 		"minerva": {
+			"ext.confirmEdit.fancyCaptcha.styles": [
+				"skinStyles/ext.confirmEdit.fancyCaptcha.styles/minerva.less"
+			],
 			"mobile.special.mobileoptions.styles": [
 				"skinStyles/mobile.special.mobileoptions.styles/minerva.less"
 			],
diff --git a/skinStyles/ext.confirmEdit.fancyCaptcha.styles/minerva.less b/skinStyles/ext.confirmEdit.fancyCaptcha.styles/minerva.less
new file mode 100644
index 0000000..9e20446
--- /dev/null
+++ b/skinStyles/ext.confirmEdit.fancyCaptcha.styles/minerva.less
@@ -0,0 +1,73 @@
+@import '../../minerva.less/minerva.variables';
+@import '../../minerva.less/minerva.mixins';
+
+/* fancycaptcha reload button */
+.confirmedit-captcha-reload,
+#mf-captcha-reload-container {
+	border-top: 1px dashed @colorGray12;
+	display: inline-block;
+	padding: 8px 20px;
+
+	.fancycaptcha-reload,
+	&.fancycaptcha-reload {
+		color: @colorProgressive;
+	}
+}
+
+.mw-createacct-captcha-assisted {
+	display: block;
+	border-top: solid 1px @colorGray12;
+	padding: 0.8em 0.5em;
+	color: @colorGray7;
+}
+
+.mw-ui-container {
+	// CAPTCHA style improvements
+	.captcha {
+		margin: 0.8em 0 0;
+		border: solid 1px @colorGray12;
+		border-radius: @borderRadius;
+		overflow: hidden;
+		background: #fff;
+		text-align: center;
+
+		input:not( [ type='submit' ] ) {
+			-webkit-appearance: none;
+			border-radius: 0;
+			padding: 0.8em 0.5em;
+			margin: 0;
+		}
+
+		input:not( [ type='submit' ] ),
+		img,
+		#wpCaptchaWord {
+			border: 0;
+			border-top: solid 1px @colorGray12;
+
+			&:first-child {
+				border-top: 0;
+			}
+		}
+
+		// CAPTCHA's are well known by internet users, save the space of the explanation
+		> p,
+		label {
+			display: none;
+		}
+
+		// FancyCaptcha things
+		.fancycaptcha-image-container img {
+			display: block;
+			margin-left: auto;
+			margin-right: auto;
+		}
+
+		.mw-createacct-captcha-assisted {
+			font-size: 0.8em;
+		}
+
+		.confirmedit-captcha-reload {
+			position: relative;
+		}
+	}
+}
diff --git a/skinStyles/mediawiki.special.userlogin.common.styles/minerva.less b/skinStyles/mediawiki.special.userlogin.common.styles/minerva.less
index e98b70a..904b836 100644
--- a/skinStyles/mediawiki.special.userlogin.common.styles/minerva.less
+++ b/skinStyles/mediawiki.special.userlogin.common.styles/minerva.less
@@ -16,22 +16,6 @@
 	margin: 1em 0;
 }
 
-// FIXME: Move to ConfirmEdit extension
-/* fancycaptcha reload button */
-.confirmedit-captcha-reload,
-#mf-captcha-reload-container {
-	border-top: 1px dashed #e1e1e1;
-	display: inline-block;
-	padding: 14px 25%;
-
-	// FIXME: Make use of icon classes
-	.fancycaptcha-reload,
-	&.fancycaptcha-reload {
-		color: @colorGray7;
-		font-weight: bold;
-	}
-}
-
 .mw-ui-container {
 	.mw-ui-vform {
 		margin: auto;
@@ -54,55 +38,6 @@
 	.mw-createacct-benefits-container {
 		display: none;
 	}
-
-	// CAPTCHA style improvements
-	.captcha {
-		margin: 0.8em 0 0;
-		border: solid 1px @colorGray12;
-		border-radius: @borderRadius;
-		overflow: hidden;
-		background: #fff;
-		text-align: center;
-
-		input:not( [ type='submit' ] ) {
-			-webkit-appearance: none;
-			border-radius: 0;
-			padding: 0.8em 0.5em;
-			margin: 0;
-		}
-
-		input:not( [ type='submit' ] ),
-		img,
-		#wpCaptchaWord {
-			border: 0;
-			border-top: solid 1px @colorGray12;
-
-			&:first-child {
-				border-top: 0;
-			}
-		}
-
-		// CAPTCHA's are well known by internet users, save the space of the explanation
-		> p,
-		label {
-			display: none;
-		}
-
-		// FancyCaptcha things
-		.fancycaptcha-image-container img {
-			display: block;
-			margin-left: auto;
-			margin-right: auto;
-		}
-
-		.mw-createacct-captcha-assisted {
-			font-size: 0.8em;
-		}
-
-		.confirmedit-captcha-reload {
-			position: relative;
-		}
-	}
 }
 
 #mw-mf-login,