From 3387e84c765b0d52ef8f9a324161ec40c496df55 Mon Sep 17 00:00:00 2001
From: Volker E <volker.e@wikimedia.org>
Date: Mon, 7 Mar 2016 18:18:23 -0800
Subject: [PATCH] Minor update on login form on layout and buttons

Changing current `constructive` button to `progressive` as part of the
consolidation task T110555. Also bringing some minor layout improvements,
aligning values to CSS coding guidelines and cleaning up typos and
superflous (initial) style values.

Bug: T89860
Bug: T126307
Change-Id: I2cc642ddc78f1b436e47261568601be592fe1fa4
Depends-on: I095eddfe5ec2f1fbc81939b67ed467484e15092b
---
 includes/templates/Userlogin.php                 | 16 ++++++++--------
 .../mediawiki.special.userlogin.common.css       |  5 +++--
 .../mediawiki.special.userlogin.login.css        |  5 ++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 4a0b413f43..f19c0f2b75 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -1,7 +1,7 @@
 <?php
 // @codingStandardsIgnoreFile
 /**
- * Html form for user login (since 1.22 with VForm appearance).
+ * HTML form for user login (since 1.22 with VForm appearance).
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -58,11 +58,11 @@ class UserloginTemplate extends BaseTemplate {
 
 			<?php if ( $this->data['formheader'] ) { ?>
 				<div class="mw-form-formheader">
-					<?php $this->html( 'formheader' ); /* extensions such as MobileFrontend add html here */ ?>
+					<?php $this->html( 'formheader' ); /* extensions such as MobileFrontend add HTML here */ ?>
 				</div>
 			<?php } ?>
 			<div class="mw-ui-vform-field">
-				<label for='wpName1'>
+				<label for="wpName1">
 					<?php
 					$this->msg( 'userlogin-yourname' );
 
@@ -90,7 +90,7 @@ class UserloginTemplate extends BaseTemplate {
 			</div>
 
 			<div class="mw-ui-vform-field">
-				<label for='wpPassword1'>
+				<label for="wpPassword1">
 					<?php
 					$this->msg( 'userlogin-yourpassword' );
 					?>
@@ -116,7 +116,7 @@ class UserloginTemplate extends BaseTemplate {
 				}
 			?>
 				<div class="mw-ui-vform-field" id="mw-user-domain-section">
-					<label for='wpDomain'><?php $this->msg( 'yourdomainname' ); ?></label>
+					<label for="wpDomain"><?php $this->msg( 'yourdomainname' ); ?></label>
 					<?php echo $select->getHTML(); ?>
 				</div>
 			<?php } ?>
@@ -148,7 +148,7 @@ class UserloginTemplate extends BaseTemplate {
 					'tabindex' => '6',
 				);
 				$modifiers = array(
-					'mw-ui-constructive',
+					'mw-ui-progressive',
 				);
 				echo Html::submitButton( $this->getMsg( 'pt-login-button' )->text(), $attrs, $modifiers );
 				?>
@@ -188,8 +188,8 @@ class UserloginTemplate extends BaseTemplate {
 						<a href="<?php $this->text( 'createOrLoginHref' ); ?>" id="mw-createaccount-join" tabindex="7"><?php $this->msg( 'userlogin-createanother' ); ?></a>
 					</div>
 				<?php } else { ?>
-					<div id="mw-createaccount-cta" class="mw-form-related-link-container mw-ui-vform-field">
-						<?php $this->msg( 'userlogin-noaccount' ); ?><a href="<?php $this->text( 'createOrLoginHref' ); ?>" id="mw-createaccount-join" tabindex="7" class="mw-ui-button mw-ui-progressive"><?php $this->msg( 'userlogin-joinproject' ); ?></a>
+					<div id="mw-createaccount-cta" class="mw-ui-vform-field">
+						<?php $this->msg( 'userlogin-noaccount' ); ?><a href="<?php $this->text( 'createOrLoginHref' ); ?>" id="mw-createaccount-join" tabindex="7" class="mw-ui-button"><?php $this->msg( 'userlogin-joinproject' ); ?></a>
 					</div>
 				<?php
 				}
diff --git a/resources/src/mediawiki.special/mediawiki.special.userlogin.common.css b/resources/src/mediawiki.special/mediawiki.special.userlogin.common.css
index 831ba8c1fd..fd907ac252 100644
--- a/resources/src/mediawiki.special/mediawiki.special.userlogin.common.css
+++ b/resources/src/mediawiki.special/mediawiki.special.userlogin.common.css
@@ -1,11 +1,12 @@
 /* Styles for user login and signup forms */
 .mw-form-related-link-container {
+	margin-bottom: 0.5em;
 	text-align: center;
 }
 
 .mw-ui-vform .mw-secure {
 	/* @embed */
-	background: url(images/icon-lock.png) no-repeat scroll left center transparent;
+	background: url( images/icon-lock.png ) no-repeat left center;
 	margin: 0 0 0 1px;
 	padding: 0 0 0 11px;
 }
@@ -57,7 +58,7 @@ section.mw-form-header {
 	/* Other display formats end up too wide */
 	display: table-cell;
 	width: 270px;
-	background-color: #FFF;
+	background-color: #fff;
 }
 
 /* Make the fancycaptcha-image-container full-width within its parent. */
diff --git a/resources/src/mediawiki.special/mediawiki.special.userlogin.login.css b/resources/src/mediawiki.special/mediawiki.special.userlogin.login.css
index df3db574fd..42d56936d2 100644
--- a/resources/src/mediawiki.special/mediawiki.special.userlogin.login.css
+++ b/resources/src/mediawiki.special/mediawiki.special.userlogin.login.css
@@ -1,9 +1,8 @@
 /* The login form invites users to create an account */
 #mw-createaccount-cta {
 	width: 20em;
-	height: 10em;
 	/* @embed */
-	background: url(images/glyph-people-large.png) no-repeat 50%;
+	background: url( images/glyph-people-large.png ) no-repeat 50%;
 	margin: 0 auto;
-	padding-top: 4em;
+	padding-top: 7.8em;
 }
-- 
2.20.1