From 9e01b0dfe20eeb78bfbb935ba0c4ad95e403b613 Mon Sep 17 00:00:00 2001
From: Kevin <kevinmamaqi@users.noreply.github.com>
Date: Wed, 26 Sep 2018 18:58:59 +0200
Subject: [PATCH 1/3] Update order of remember me and submit button

Have the same structure and logic as wp-login.php - Seems more logic to have the checkbox of Remember me before the Login button.
---
 templates/myaccount/form-login.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/myaccount/form-login.php b/templates/myaccount/form-login.php
index b4d4e589eba..c80463492ec 100644
--- a/templates/myaccount/form-login.php
+++ b/templates/myaccount/form-login.php
@@ -47,11 +47,11 @@ do_action( 'woocommerce_before_customer_login_form' ); ?>
 			<?php do_action( 'woocommerce_login_form' ); ?>
 
 			<p class="form-row">
-				<?php wp_nonce_field( 'woocommerce-login', 'woocommerce-login-nonce' ); ?>
-				<button type="submit" class="woocommerce-Button button" name="login" value="<?php esc_attr_e( 'Log in', 'woocommerce' ); ?>"><?php esc_html_e( 'Log in', 'woocommerce' ); ?></button>
 				<label class="woocommerce-form__label woocommerce-form__label-for-checkbox inline">
 					<input class="woocommerce-form__input woocommerce-form__input-checkbox" name="rememberme" type="checkbox" id="rememberme" value="forever" /> <span><?php esc_html_e( 'Remember me', 'woocommerce' ); ?></span>
 				</label>
+				<?php wp_nonce_field( 'woocommerce-login', 'woocommerce-login-nonce' ); ?>
+				<button type="submit" class="woocommerce-Button button" name="login" value="<?php esc_attr_e( 'Log in', 'woocommerce' ); ?>"><?php esc_html_e( 'Log in', 'woocommerce' ); ?></button>
 			</p>
 			<p class="woocommerce-LostPassword lost_password">
 				<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php esc_html_e( 'Lost your password?', 'woocommerce' ); ?></a>

From 4952fbc475f11b28ab70c087c865fab54841f3db Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Thu, 31 Jan 2019 16:28:32 +0000
Subject: [PATCH 2/3] Adjust both login templates

---
 templates/global/form-login.php    | 10 +++++-----
 templates/myaccount/form-login.php |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/global/form-login.php b/templates/global/form-login.php
index 3dc991879e8..846e8d84771 100644
--- a/templates/global/form-login.php
+++ b/templates/global/form-login.php
@@ -13,7 +13,7 @@
  * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     3.3.0
+ * @version     3.6.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -44,12 +44,12 @@ if ( is_user_logged_in() ) {
 	<?php do_action( 'woocommerce_login_form' ); ?>
 
 	<p class="form-row">
-		<?php wp_nonce_field( 'woocommerce-login', 'woocommerce-login-nonce' ); ?>
-		<button type="submit" class="button" name="login" value="<?php esc_attr_e( 'Login', 'woocommerce' ); ?>"><?php esc_html_e( 'Login', 'woocommerce' ); ?></button>
-		<input type="hidden" name="redirect" value="<?php echo esc_url( $redirect ) ?>" />
-		<label class="woocommerce-form__label woocommerce-form__label-for-checkbox inline">
+		<label class="woocommerce-form__label woocommerce-form__label-for-checkbox woocommerce-form-login__rememberme">
 			<input class="woocommerce-form__input woocommerce-form__input-checkbox" name="rememberme" type="checkbox" id="rememberme" value="forever" /> <span><?php esc_html_e( 'Remember me', 'woocommerce' ); ?></span>
 		</label>
+		<?php wp_nonce_field( 'woocommerce-login', 'woocommerce-login-nonce' ); ?>
+		<input type="hidden" name="redirect" value="<?php echo esc_url( $redirect ) ?>" />
+		<button type="submit" class="woocommerce-button button woocommerce-form-login__submit" name="login" value="<?php esc_attr_e( 'Login', 'woocommerce' ); ?>"><?php esc_html_e( 'Login', 'woocommerce' ); ?></button>
 	</p>
 	<p class="lost_password">
 		<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php esc_html_e( 'Lost your password?', 'woocommerce' ); ?></a>
diff --git a/templates/myaccount/form-login.php b/templates/myaccount/form-login.php
index c80463492ec..001f3423988 100644
--- a/templates/myaccount/form-login.php
+++ b/templates/myaccount/form-login.php
@@ -12,7 +12,7 @@
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce/Templates
- * @version 3.5.0
+ * @version 3.6.0
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -47,11 +47,11 @@ do_action( 'woocommerce_before_customer_login_form' ); ?>
 			<?php do_action( 'woocommerce_login_form' ); ?>
 
 			<p class="form-row">
-				<label class="woocommerce-form__label woocommerce-form__label-for-checkbox inline">
+				<label class="woocommerce-form__label woocommerce-form__label-for-checkbox woocommerce-form-login__rememberme">
 					<input class="woocommerce-form__input woocommerce-form__input-checkbox" name="rememberme" type="checkbox" id="rememberme" value="forever" /> <span><?php esc_html_e( 'Remember me', 'woocommerce' ); ?></span>
 				</label>
 				<?php wp_nonce_field( 'woocommerce-login', 'woocommerce-login-nonce' ); ?>
-				<button type="submit" class="woocommerce-Button button" name="login" value="<?php esc_attr_e( 'Log in', 'woocommerce' ); ?>"><?php esc_html_e( 'Log in', 'woocommerce' ); ?></button>
+				<button type="submit" class="woocommerce-button button woocommerce-form-login__submit" name="login" value="<?php esc_attr_e( 'Log in', 'woocommerce' ); ?>"><?php esc_html_e( 'Log in', 'woocommerce' ); ?></button>
 			</p>
 			<p class="woocommerce-LostPassword lost_password">
 				<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php esc_html_e( 'Lost your password?', 'woocommerce' ); ?></a>

From e299da75b0b6c1769978aec95facb9fd52bedaf9 Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Thu, 31 Jan 2019 16:28:54 +0000
Subject: [PATCH 3/3] Update styling for remember me

---
 assets/css/twenty-seventeen.scss | 11 +++++++++++
 assets/css/woocommerce.scss      | 10 ++++++++++
 2 files changed, 21 insertions(+)

diff --git a/assets/css/twenty-seventeen.scss b/assets/css/twenty-seventeen.scss
index 776db2d71cf..6181d04469d 100644
--- a/assets/css/twenty-seventeen.scss
+++ b/assets/css/twenty-seventeen.scss
@@ -80,6 +80,17 @@
 			visibility: visible;
 		 }
 	}
+
+	.woocommerce-form-login {
+		.woocommerce-form-login__submit {
+			float: left;
+			margin-right: 1em;
+		}
+		.woocommerce-form-login__rememberme {
+			display: inline-block;
+			line-height: 3em;
+		}
+	}
 }
 
 .woocommerce-breadcrumb {
diff --git a/assets/css/woocommerce.scss b/assets/css/woocommerce.scss
index 680ba0c1123..556920251db 100644
--- a/assets/css/woocommerce.scss
+++ b/assets/css/woocommerce.scss
@@ -1670,6 +1670,16 @@ p.demo_store,
 			color: $red;
 		}
 	}
+
+	.woocommerce-form-login {
+		.woocommerce-form-login__submit {
+			float: left;
+			margin-right: 1em;
+		}
+		.woocommerce-form-login__rememberme {
+			display: inline-block;
+		}
+	}
 }
 
 .woocommerce-no-js {