diff options
author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-02-15 22:15:38 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-15 22:15:38 +0300 |
commit | 17d57f336d96e8aaf64e8829d27f30385d223c60 (patch) | |
tree | 6b1293c2b39011eeb2bbd5de4cbf8861e88506f7 | |
parent | aeefcfe8a231bdb30b8c8ac3a107403af070db33 (diff) | |
parent | f59e0ed4ca4d93796c588e7633b058283d886c7b (diff) |
Merge pull request #3500 from nextcloud/stable11-3403
[stable11] Rename database password toggle
-rw-r--r-- | core/css/styles.css | 12 | ||||
-rw-r--r-- | core/templates/installation.php | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 5ea4ca53707..0c9af523291 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -426,26 +426,26 @@ label.infield { } /* Show password toggle */ -#show, #dbpassword { +#show, #dbpassword-toggle { position: absolute; right: 1em; top: .8em; float: right; } -#show, #dbpassword, #personal-show { +#show, #dbpassword-toggle, #personal-show { display: none; } -#show + label, #dbpassword + label { +#show + label, #dbpassword-toggle + label { right: 21px; top: 15px !important; margin: -14px !important; padding: 14px !important; } -#show:checked + label, #dbpassword:checked + label, #personal-show:checked + label { +#show:checked + label, #dbpassword-toggle:checked + label, #personal-show:checked + label { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; opacity: .8; } -#show + label, #dbpassword + label, #personal-show + label { +#show + label, #dbpassword-toggle + label, #personal-show + label { position: absolute !important; height: 20px; width: 24px; @@ -455,7 +455,7 @@ label.infield { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; opacity: .3; } -#show + label:before, #dbpassword + label:before, #personal-show + label:before { +#show + label:before, #dbpassword-toggle + label:before, #personal-show + label:before { display: none; } #pass2, input[name="personal-password-clone"] { diff --git a/core/templates/installation.php b/core/templates/installation.php index d3f5021821d..fb27e57b0cc 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -108,13 +108,13 @@ script('core', [ autocomplete="off" autocapitalize="off" autocorrect="off"> </p> <p class="groupmiddle"> - <input type="password" name="dbpass" id="dbpass" data-typetoggle="#dbpassword" + <input type="password" name="dbpass" id="dbpass" data-typetoggle="#dbpassword-toggle" placeholder="<?php p($l->t( 'Database password' )); ?>" value="<?php p($_['dbpass']); ?>" autocomplete="off" autocapitalize="off" autocorrect="off"> <label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label> - <input type="checkbox" id="dbpassword" name="dbpassword"> - <label for="dbpassword"></label> + <input type="checkbox" id="dbpassword-toggle" name="dbpassword-toggle"> + <label for="dbpassword-toggle"></label> </p> <p class="groupmiddle"> <label for="dbname" class="infield"><?php p($l->t( 'Database name' )); ?></label> |