<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[46256] trunk/src: Login and Registration: Add a "Show password" button on the login page.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/46256">46256</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/46256","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>afercia</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-09-23 18:05:16 +0000 (Mon, 23 Sep 2019)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Login and Registration: Add a "Show password" button on the login page.

The ability for users to see the password they're typing improves usability and accessibility of the login users flow.

- brings the login screen in line with the same feature already used in the New User, Edit User, and Reset Password pages
- improves association of labels and input fields by using explicit association with `for` / `id` attributes
- slightly increases the "Remember me" label font size

Props johnbillion, Iceable, audrasjb, joyously, adamsilverstein, boemedia, DrewAPicture, shadyvb, birgire, peterwilsoncc, pento, anevins, davidbaumwald, whyisjake, afercia.
Fixes <a href="https://core.trac.wordpress.org/ticket/42888">#42888</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesadminuserprofilejs">trunk/src/js/_enqueues/admin/user-profile.js</a></li>
<li><a href="#trunksrcwpadmincssformscss">trunk/src/wp-admin/css/forms.css</a></li>
<li><a href="#trunksrcwpadmincssinstallcss">trunk/src/wp-admin/css/install.css</a></li>
<li><a href="#trunksrcwpadmincsslogincss">trunk/src/wp-admin/css/login.css</a></li>
<li><a href="#trunksrcwploginphp">trunk/src/wp-login.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueuesadminuserprofilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/user-profile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/user-profile.js      2019-09-23 17:59:10 UTC (rev 46255)
+++ trunk/src/js/_enqueues/admin/user-profile.js        2019-09-23 18:05:16 UTC (rev 46256)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,10 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        var updateLock = false,
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $pass1Row,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $pass1Wrap,
</del><span class="cx" style="display: block; padding: 0 10px">                 $pass1,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $pass1Text,
-               $pass1Label,
</del><span class="cx" style="display: block; padding: 0 10px">                 $pass2,
</span><span class="cx" style="display: block; padding: 0 10px">                $weakRow,
</span><span class="cx" style="display: block; padding: 0 10px">                $weakCheckbox,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( 1 !== parseInt( $toggleButton.data( 'start-masked' ), 10 ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $pass1Wrap.addClass( 'show-password' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $pass1.attr( 'type', 'text' );
</ins><span class="cx" style="display: block; padding: 0 10px">                 } else {
</span><span class="cx" style="display: block; padding: 0 10px">                        $toggleButton.trigger( 'click' );
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,28 +45,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">        function bindPass1() {
</span><span class="cx" style="display: block; padding: 0 10px">                currentPass = $pass1.val();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $pass1Wrap = $pass1.parent();
-
-               $pass1Text = $( '<input type="text"/>' )
-                       .attr( {
-                               'id':           'pass1-text',
-                               'name':         'pass1-text',
-                               'autocomplete': 'off'
-                       } )
-                       .addClass( $pass1[0].className )
-                       .data( 'pw', $pass1.data( 'pw' ) )
-                       .val( $pass1.val() )
-                       .on( 'input', function () {
-                               if ( $pass1Text.val() === currentPass ) {
-                                       return;
-                               }
-                               $pass2.val( $pass1Text.val() );
-                               $pass1.val( $pass1Text.val() ).trigger( 'pwupdate' );
-                               currentPass = $pass1Text.val();
-                       } );
-
-               $pass1.after( $pass1Text );
-
</del><span class="cx" style="display: block; padding: 0 10px">                 if ( 1 === parseInt( $pass1.data( 'reveal' ), 10 ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        generatePassword();
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,64 +55,40 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        currentPass = $pass1.val();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( $pass1Text.val() !== currentPass ) {
-                               $pass1Text.val( currentPass );
-                       }
-                       $pass1.add( $pass1Text ).removeClass( 'short bad good strong' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+                       $pass1.removeClass( 'short bad good strong' );
</ins><span class="cx" style="display: block; padding: 0 10px">                         showOrHideWeakPasswordCheckbox();
</span><span class="cx" style="display: block; padding: 0 10px">                } );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        function resetToggle() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function resetToggle( show ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 $toggleButton
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        .data( 'toggle', 0 )
</del><span class="cx" style="display: block; padding: 0 10px">                         .attr({
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'aria-label': userProfileL10n.ariaHide
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'aria-label': show ? userProfileL10n.ariaShow : userProfileL10n.ariaHide
</ins><span class="cx" style="display: block; padding: 0 10px">                         })
</span><span class="cx" style="display: block; padding: 0 10px">                        .find( '.text' )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                .text( userProfileL10n.hide )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         .text( show ? userProfileL10n.show : userProfileL10n.hide )
</ins><span class="cx" style="display: block; padding: 0 10px">                         .end()
</span><span class="cx" style="display: block; padding: 0 10px">                        .find( '.dashicons' )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                .removeClass( 'dashicons-visibility' )
-                               .addClass( 'dashicons-hidden' );
-
-               $pass1Text.focus();
-
-               $pass1Label.attr( 'for', 'pass1-text' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         .removeClass( show ? 'dashicons-hidden' : 'dashicons-visibility' )
+                               .addClass( show ? 'dashicons-visibility' : 'dashicons-hidden' );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        function bindToggleButton() {
</span><span class="cx" style="display: block; padding: 0 10px">                $toggleButton = $pass1Row.find('.wp-hide-pw');
</span><span class="cx" style="display: block; padding: 0 10px">                $toggleButton.show().on( 'click', function () {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( 1 === parseInt( $toggleButton.data( 'toggle' ), 10 ) ) {
-                               $pass1Wrap.addClass( 'show-password' );
-
-                               resetToggle();
-
-                               if ( ! _.isUndefined( $pass1Text[0].setSelectionRange ) ) {
-                                       $pass1Text[0].setSelectionRange( 0, 100 );
-                               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( 'password' === $pass1.attr( 'type' ) ) {
+                               $pass1.attr( 'type', 'text' );
+                               resetToggle( false );
</ins><span class="cx" style="display: block; padding: 0 10px">                         } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $pass1Wrap.removeClass( 'show-password' );
-                               $toggleButton
-                                       .data( 'toggle', 1 )
-                                       .attr({
-                                               'aria-label': userProfileL10n.ariaShow
-                                       })
-                                       .find( '.text' )
-                                               .text( userProfileL10n.show )
-                                       .end()
-                                       .find( '.dashicons' )
-                                               .removeClass('dashicons-hidden')
-                                               .addClass('dashicons-visibility');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $pass1.attr( 'type', 'password' );
+                               resetToggle( true );
+                       }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $pass1.focus();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $pass1.focus();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $pass1Label.attr( 'for', 'pass1' );
-
-                               if ( ! _.isUndefined( $pass1[0].setSelectionRange ) ) {
-                                       $pass1[0].setSelectionRange( 0, 100 );
-                               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( ! _.isUndefined( $pass1[0].setSelectionRange ) ) {
+                               $pass1[0].setSelectionRange( 0, 100 );
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,10 +98,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $generateButton,
</span><span class="cx" style="display: block; padding: 0 10px">                        $cancelButton;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $pass1Row = $('.user-pass1-wrap');
-               $pass1Label = $pass1Row.find('th label').attr( 'for', 'pass1-text' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $pass1Row = $( '.user-pass1-wrap, .user-pass-wrap' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // hide this
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Hide the confirm password field when JavaScript support is enabled.
</ins><span class="cx" style="display: block; padding: 0 10px">                 $('.user-pass2-wrap').hide();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $submitButton = $( '#submit, #wp-submit' ).on( 'click', function () {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,6 +118,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $pass1 = $('#pass1');
</span><span class="cx" style="display: block; padding: 0 10px">                if ( $pass1.length ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        bindPass1();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                } else {
+                       // Password field for the login form.
+                       $pass1 = $( '#user_pass' );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +142,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                if ( $pass1.is( ':hidden' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $pass1.prop( 'disabled', true );
</span><span class="cx" style="display: block; padding: 0 10px">                        $pass2.prop( 'disabled', true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $pass1Text.prop( 'disabled', true );
</del><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $passwordWrapper = $pass1Row.find( '.wp-pwd' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,18 +163,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        // Enable the inputs when showing.
</span><span class="cx" style="display: block; padding: 0 10px">                        $pass1.attr( 'disabled', false );
</span><span class="cx" style="display: block; padding: 0 10px">                        $pass2.attr( 'disabled', false );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $pass1Text.attr( 'disabled', false );
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( $pass1Text.val().length === 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( $pass1.val().length === 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 generatePassword();
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-                       _.defer( function() {
-                               $pass1Text.focus();
-                               if ( ! _.isUndefined( $pass1Text[0].setSelectionRange ) ) {
-                                       $pass1Text[0].setSelectionRange( 0, 100 );
-                               }
-                       }, 0 );
</del><span class="cx" style="display: block; padding: 0 10px">                 } );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $cancelButton = $pass1Row.find( 'button.wp-cancel-pw' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,7 +174,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        updateLock = false;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // Clear any entered password.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $pass1Text.val( '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $pass1.val( '' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // Generate a new password.
</span><span class="cx" style="display: block; padding: 0 10px">                        wp.ajax.post( 'generate-password' )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,9 +192,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        // Disable the inputs when hiding to prevent autofill and submission.
</span><span class="cx" style="display: block; padding: 0 10px">                        $pass1.prop( 'disabled', true );
</span><span class="cx" style="display: block; padding: 0 10px">                        $pass2.prop( 'disabled', true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $pass1Text.prop( 'disabled', true );
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        resetToggle();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 resetToggle( false );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( $pass1Row.closest( 'form' ).is( '#your-profile' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                // Clear password field to prevent update
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,7 +208,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $pass1.prop( 'disabled', false );
</span><span class="cx" style="display: block; padding: 0 10px">                        $pass2.prop( 'disabled', false );
</span><span class="cx" style="display: block; padding: 0 10px">                        $pass2.val( $pass1.val() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $pass1Wrap.removeClass( 'show-password' );
</del><span class="cx" style="display: block; padding: 0 10px">                 });
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,7 +247,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                var passStrength = $('#pass-strength-result')[0];
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( passStrength.className ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $pass1.add( $pass1Text ).addClass( passStrength.className );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $pass1.addClass( passStrength.className );
</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( $( passStrength ).is( '.short, .bad' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! $weakCheckbox.prop( 'checked' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                        $submitButtons.prop( 'disabled', true );
</span></span></pre></div>
<a id="trunksrcwpadmincssformscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/forms.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/forms.css  2019-09-23 17:59:10 UTC (rev 46255)
+++ trunk/src/wp-admin/css/forms.css    2019-09-23 18:05:16 UTC (rev 46256)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1500,9 +1500,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                position: relative;
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        .wp-pwd [type="text"],
-       .wp-pwd [type="password"] {
-               padding-right: 88px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* Needs higher specificity than normal input type text and password. */
+       #profile-page .form-table #pass1 {
+               padding-right: 90px;
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        .wp-pwd button.button {
</span></span></pre></div>
<a id="trunksrcwpadmincssinstallcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/install.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/install.css        2019-09-23 17:59:10 UTC (rev 46255)
+++ trunk/src/wp-admin/css/install.css  2019-09-23 18:05:16 UTC (rev 46256)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,6 +301,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">                box-sizing: border-box;
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        .wp-pwd #pass1 {
+               padding-right: 50px;
+       }
+
+       .wp-pwd .button.wp-hide-pw {
+               right: 0;
+       }
+
+       #pass-strength-result {
+               width: 100%;
+       }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> body.language-chooser {
</span></span></pre></div>
<a id="trunksrcwpadmincsslogincss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/login.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/login.css  2019-09-23 17:59:10 UTC (rev 46255)
+++ trunk/src/wp-admin/css/login.css    2019-09-23 18:05:16 UTC (rev 46256)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,10 +37,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                0 0 2px 1px rgba(30, 140, 190, 0.8);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.ie8 a:focus {
-       outline: #5b9dd9 solid 1px;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> p {
</span><span class="cx" style="display: block; padding: 0 10px">        line-height: 1.5;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,14 +71,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">        padding: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.login .password-input-wrapper {
-       position: relative;
-}
-
-.login .input.password-input {
-       margin: 0;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .login .input::-ms-clear {
</span><span class="cx" style="display: block; padding: 0 10px">        display: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +79,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        margin-bottom: 15px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.login .button.button-secondary {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.login .button.wp-hide-pw {
</ins><span class="cx" style="display: block; padding: 0 10px">         background: transparent;
</span><span class="cx" style="display: block; padding: 0 10px">        border: 1px solid transparent;
</span><span class="cx" style="display: block; padding: 0 10px">        box-shadow: none;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,25 +90,37 @@
</span><span class="cx" style="display: block; padding: 0 10px">        padding: 5px 9px;
</span><span class="cx" style="display: block; padding: 0 10px">        position: absolute;
</span><span class="cx" style="display: block; padding: 0 10px">        right: 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        top: 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ top: 3px;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.login .button.button-secondary:hover {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.login .button.wp-hide-pw:hover {
</ins><span class="cx" style="display: block; padding: 0 10px">         background: transparent;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.login .button.button-secondary:focus {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.login .button.wp-hide-pw:focus {
</ins><span class="cx" style="display: block; padding: 0 10px">         background: transparent;
</span><span class="cx" style="display: block; padding: 0 10px">        border-color: #5b9dd9;
</span><span class="cx" style="display: block; padding: 0 10px">        box-shadow: 0 0 3px rgba(0, 115, 170, 0.8);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.login .button.button-secondary:active {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.login .button.wp-hide-pw:active {
</ins><span class="cx" style="display: block; padding: 0 10px">         background: transparent;
</span><span class="cx" style="display: block; padding: 0 10px">        box-shadow: none;
</span><span class="cx" style="display: block; padding: 0 10px">        transform: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.login .button.wp-hide-pw .dashicons {
+       top: 4px;
+}
+
+.login .wp-pwd {
+       position: relative;
+}
+
+.no-js .hide-if-no-js {
+       display: none;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .login form {
</span><span class="cx" style="display: block; padding: 0 10px">        margin-top: 20px;
</span><span class="cx" style="display: block; padding: 0 10px">        margin-left: 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,9 +195,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">        font-size: 14px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.login form .forgetmenot label {
-       font-size: 12px;
-       line-height: 1.58333333;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.login .forgetmenot label,
+.login .pw-weak label {
+       line-height: 1.5;
+       vertical-align: baseline;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> .login h1 {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,16 +271,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> .login form .input,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.login input[type="text"] {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.login input[type="text"],
+.login input[type="password"] {
</ins><span class="cx" style="display: block; padding: 0 10px">         font-size: 24px;
</span><span class="cx" style="display: block; padding: 0 10px">        width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px">        padding: 5px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        margin: 2px 6px 16px 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin: 3px 6px 16px 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.login-action-rp form .input,
-.login-action-rp input[type="text"] {
-       padding: 5px 45px 5px 5px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.js.login input.password-input,
+.js.login-action-rp form .input,
+.js.login-action-rp input[type="text"] {
+       padding-right: 45px;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> .login form .input,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,16 +291,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">        background: #fbfbfb;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.ie7 .login form .input,
-.ie8 .login form .input {
-       font-family: sans-serif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.js.login-action-rp input[type="text"],
+.js.login-action-rp input[type="password"] {
+       margin-bottom: 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.login-action-rp input[type="text"] {
-       box-shadow: none;
-       margin: 0;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .login #pass-strength-result {
</span><span class="cx" style="display: block; padding: 0 10px">        font-weight: 600;
</span><span class="cx" style="display: block; padding: 0 10px">        margin: -1px 5px 16px 0;
</span></span></pre></div>
<a id="trunksrcwploginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-login.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-login.php    2019-09-23 17:59:10 UTC (rev 46255)
+++ trunk/src/wp-login.php      2019-09-23 18:05:16 UTC (rev 46256)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -825,10 +825,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                ?>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                <form name="lostpasswordform" id="lostpasswordform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=lostpassword', 'login_post' ) ); ?>" method="post">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <p>
-                               <label for="user_login" ><?php _e( 'Username or Email Address' ); ?><br />
-                               <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" autocapitalize="off" /></label>
-                       </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+                       <label for="user_login"><?php _e( 'Username or Email Address' ); ?></label>
+                       <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" autocapitalize="off" />
</ins><span class="cx" style="display: block; padding: 0 10px">                         <?php
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -840,12 +839,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        ?>
</span><span class="cx" style="display: block; padding: 0 10px">                        <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <p class="submit">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <div class="submit">
</ins><span class="cx" style="display: block; padding: 0 10px">                                 <input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Get New Password' ); ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 </div>
</ins><span class="cx" style="display: block; padding: 0 10px">                 </form>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <p id="nav">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <div id="nav">
</ins><span class="cx" style="display: block; padding: 0 10px">                         <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px">                        <?php
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -859,7 +858,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         </div>
</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                login_footer( 'user_login' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -936,31 +935,27 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        <input type="hidden" id="user_login" value="<?php echo esc_attr( $rp_login ); ?>" autocomplete="off" />
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="user-pass1-wrap">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <p>
-                                       <label for="pass1"><?php _e( 'New password' ); ?></label>
-                               </p>
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                <label for="pass1"><?php _e( 'New password' ); ?></label>
+
</ins><span class="cx" style="display: block; padding: 0 10px">                                 <div class="wp-pwd">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <div class="password-input-wrapper">
-                                               <input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 16 ) ); ?>" name="pass1" id="pass1" class="input password-input" size="24" value="" autocomplete="off" aria-describedby="pass-strength-result" />
-                                               <button type="button" class="button button-secondary wp-hide-pw hide-if-no-js">
-                                                       <span class="dashicons dashicons-hidden" aria-hidden="true"></span>
-                                               </button>
-                                       </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 16 ) ); ?>" name="pass1" id="pass1" class="input password-input" size="24" value="" autocomplete="off" aria-describedby="pass-strength-result" />
+
+                                       <button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
+                                               <span class="dashicons dashicons-hidden" aria-hidden="true"></span>
+                                       </button>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <div id="pass-strength-result" class="hide-if-no-js" aria-live="polite"><?php _e( 'Strength indicator' ); ?></div>
</span><span class="cx" style="display: block; padding: 0 10px">                                </div>
</span><span class="cx" style="display: block; padding: 0 10px">                                <div class="pw-weak">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <label>
-                                               <input type="checkbox" name="pw_weak" class="pw-checkbox" />
-                                               <?php _e( 'Confirm use of weak password' ); ?>
-                                       </label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <input type="checkbox" name="pw_weak" id="pw-weak" class="pw-checkbox" />
+                                       <label for="pw-weak"><?php _e( 'Confirm use of weak password' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px">                                 </div>
</span><span class="cx" style="display: block; padding: 0 10px">                        </div>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <p class="user-pass2-wrap">
-                               <label for="pass2"><?php _e( 'Confirm new password' ); ?></label><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <div class="user-pass2-wrap">
+                               <label for="pass2"><?php _e( 'Confirm new password' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px">                                 <input type="password" name="pass2" id="pass2" class="input" size="20" value="" autocomplete="off" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">                        <br class="clear" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -978,12 +973,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        ?>
</span><span class="cx" style="display: block; padding: 0 10px">                        <input type="hidden" name="rp_key" value="<?php echo esc_attr( $rp_key ); ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <p class="submit">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <div class="submit">
</ins><span class="cx" style="display: block; padding: 0 10px">                                 <input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Reset Password' ); ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 </div>
</ins><span class="cx" style="display: block; padding: 0 10px">                 </form>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <p id="nav">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <div id="nav">
</ins><span class="cx" style="display: block; padding: 0 10px">                         <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px">                        <?php
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -997,7 +992,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         </div>
</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                login_footer( 'user_pass' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1057,14 +1052,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                ?>
</span><span class="cx" style="display: block; padding: 0 10px">                <form name="registerform" id="registerform" action="<?php echo esc_url( site_url( 'wp-login.php?action=register', 'login_post' ) ); ?>" method="post" novalidate="novalidate">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <p>
-                               <label for="user_login"><?php _e( 'Username' ); ?><br />
-                               <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr( wp_unslash( $user_login ) ); ?>" size="20" autocapitalize="off" /></label>
-                       </p>
-                       <p>
-                               <label for="user_email"><?php _e( 'Email' ); ?><br />
-                               <input type="email" name="user_email" id="user_email" class="input" value="<?php echo esc_attr( wp_unslash( $user_email ) ); ?>" size="25" /></label>
-                       </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <div>
+                               <label for="user_login"><?php _e( 'Username' ); ?></label>
+                               <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr( wp_unslash( $user_login ) ); ?>" size="20" autocapitalize="off" />
+                       </div>
+                       <div>
+                               <label for="user_email"><?php _e( 'Email' ); ?></label>
+                               <input type="email" name="user_email" id="user_email" class="input" value="<?php echo esc_attr( wp_unslash( $user_email ) ); ?>" size="25" />
+                       </div>
</ins><span class="cx" style="display: block; padding: 0 10px">                         <?php
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1080,16 +1075,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        </p>
</span><span class="cx" style="display: block; padding: 0 10px">                        <br class="clear" />
</span><span class="cx" style="display: block; padding: 0 10px">                        <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <p class="submit">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <div class="submit">
</ins><span class="cx" style="display: block; padding: 0 10px">                                 <input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Register' ); ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 </div>
</ins><span class="cx" style="display: block; padding: 0 10px">                 </form>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <p id="nav">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <div id="nav">
</ins><span class="cx" style="display: block; padding: 0 10px">                         <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php echo esc_html( $login_link_separator ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                        <a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         </div>
</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                login_footer( 'user_login' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1329,17 +1324,22 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $aria_describedby_error = '';
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                wp_enqueue_script( 'user-profile' );
</ins><span class="cx" style="display: block; padding: 0 10px">                 ?>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                <form name="loginform" id="loginform" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <p>
-                               <label for="user_login"><?php _e( 'Username or Email Address' ); ?><br />
-                               <input type="text" name="log" id="user_login"<?php echo $aria_describedby_error; ?> class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" autocapitalize="off" /></label>
-                       </p>
-                       <p>
-                               <label for="user_pass"><?php _e( 'Password' ); ?><br />
-                               <input type="password" name="pwd" id="user_pass"<?php echo $aria_describedby_error; ?> class="input" value="" size="20" /></label>
-                       </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <label for="user_login"><?php _e( 'Username or Email Address' ); ?></label>
+                       <input type="text" name="log" id="user_login"<?php echo $aria_describedby_error; ?> class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" autocapitalize="off" />
+
+                       <div class="user-pass-wrap">
+                               <label for="user_pass"><?php _e( 'Password' ); ?></label>
+                               <div class="wp-pwd">
+                                       <input type="password" name="pwd" id="user_pass"<?php echo $aria_describedby_error; ?> class="input password-input" value="" size="20" />
+                                       <button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Show password' ); ?>">
+                                               <span class="dashicons dashicons-visibility" aria-hidden="true"></span>
+                                       </button>
+                               </div>
+                       </div>
</ins><span class="cx" style="display: block; padding: 0 10px">                         <?php
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1350,8 +1350,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        do_action( 'login_form' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <p class="forgetmenot"><label for="rememberme"><input name="rememberme" type="checkbox" id="rememberme" value="forever" <?php checked( $rememberme ); ?> /> <?php esc_html_e( 'Remember Me' ); ?></label></p>
-                       <p class="submit">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <div class="forgetmenot"><input name="rememberme" type="checkbox" id="rememberme" value="forever" <?php checked( $rememberme ); ?> /> <label for="rememberme"><?php esc_html_e( 'Remember Me' ); ?></label></div>
+                       <div class="submit">
</ins><span class="cx" style="display: block; padding: 0 10px">                                 <input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Log In' ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1373,7 +1373,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                <input type="hidden" name="testcookie" value="1" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 </div>
</ins><span class="cx" style="display: block; padding: 0 10px">                 </form>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1380,7 +1380,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! $interim_login ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <p id="nav">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <div id="nav">
</ins><span class="cx" style="display: block; padding: 0 10px">                                 <?php
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! isset( $_GET['checkemail'] ) || ! in_array( $_GET['checkemail'], array( 'confirm', 'newpass' ), true ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1399,7 +1399,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 </div>
</ins><span class="cx" style="display: block; padding: 0 10px">                         <?php
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre>
</div>
</div>

</body>
</html>