Commit 3c6ce8d5 authored by Vincent Petry's avatar Vincent Petry Committed by GitHub
Browse files

Merge pull request #26360 from Maddoc42/fix-password-strength-tooltip

Fix password strength meter tooltip message
parents 6b8e8edc 3fc5472d
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
"select2": "3.4.8", "select2": "3.4.8",
"zxcvbn": "*", "zxcvbn": "*",
"snapjs": "2.0.0-rc1", "snapjs": "2.0.0-rc1",
"strengthify": "0.4.2", "strengthify": "0.5.0",
"underscore": "1.8.3", "underscore": "1.8.3",
"bootstrap": "3.3.6", "bootstrap": "3.3.6",
"backbone": "1.2.3", "backbone": "1.2.3",
......
/*! /*!
* Bootstrap v3.3.5 (http://getbootstrap.com) * Bootstrap v3.3.6 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc. * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
.tooltip { .tooltip {
position: fixed; position: absolute;
z-index: 1070; z-index: 1070;
display: block; display: block;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 12px;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
letter-spacing: normal;
line-break: auto;
line-height: 1.42857143; line-height: 1.42857143;
text-align: left; text-align: left;
text-align: start; text-align: start;
text-decoration: none; text-decoration: none;
text-shadow: none; text-shadow: none;
text-transform: none; text-transform: none;
white-space: normal; letter-spacing: normal;
word-break: normal; word-break: normal;
word-spacing: normal; word-spacing: normal;
word-wrap: normal; word-wrap: normal;
font-size: 12px; white-space: normal;
opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
opacity: 0;
line-break: auto;
} }
.tooltip.in { .tooltip.in {
opacity: 0.9;
filter: alpha(opacity=90); filter: alpha(opacity=90);
opacity: .9;
} }
.tooltip.top { .tooltip.top {
margin-top: -3px;
padding: 5px 0; padding: 5px 0;
margin-top: -3px;
} }
.tooltip.right { .tooltip.right {
margin-left: 3px;
padding: 0 5px; padding: 0 5px;
margin-left: 3px;
} }
.tooltip.bottom { .tooltip.bottom {
margin-top: 3px;
padding: 5px 0; padding: 5px 0;
margin-top: 3px;
} }
.tooltip.left { .tooltip.left {
margin-left: -3px;
padding: 0 5px; padding: 0 5px;
margin-left: -3px;
} }
.tooltip-inner { .tooltip-inner {
max-width: 350px; max-width: 200px;
padding: 3px 8px; padding: 3px 8px;
color: #ffffff; color: #fff;
text-align: center; text-align: center;
background-color: #000000; background-color: #000;
border-radius: 4px; border-radius: 4px;
} }
.tooltip-arrow { .tooltip-arrow {
...@@ -66,54 +67,54 @@ ...@@ -66,54 +67,54 @@
left: 50%; left: 50%;
margin-left: -5px; margin-left: -5px;
border-width: 5px 5px 0; border-width: 5px 5px 0;
border-top-color: #000000; border-top-color: #000;
} }
.tooltip.top-left .tooltip-arrow { .tooltip.top-left .tooltip-arrow {
bottom: 0;
right: 5px; right: 5px;
bottom: 0;
margin-bottom: -5px; margin-bottom: -5px;
border-width: 5px 5px 0; border-width: 5px 5px 0;
border-top-color: #000000; border-top-color: #000;
} }
.tooltip.top-right .tooltip-arrow { .tooltip.top-right .tooltip-arrow {
bottom: 0; bottom: 0;
left: 5px; left: 5px;
margin-bottom: -5px; margin-bottom: -5px;
border-width: 5px 5px 0; border-width: 5px 5px 0;
border-top-color: #000000; border-top-color: #000;
} }
.tooltip.right .tooltip-arrow { .tooltip.right .tooltip-arrow {
top: 50%; top: 50%;
left: 0; left: 0;
margin-top: -5px; margin-top: -5px;
border-width: 5px 5px 5px 0; border-width: 5px 5px 5px 0;
border-right-color: #000000; border-right-color: #000;
} }
.tooltip.left .tooltip-arrow { .tooltip.left .tooltip-arrow {
top: 50%; top: 50%;
right: 0; right: 0;
margin-top: -5px; margin-top: -5px;
border-width: 5px 0 5px 5px; border-width: 5px 0 5px 5px;
border-left-color: #000000; border-left-color: #000;
} }
.tooltip.bottom .tooltip-arrow { .tooltip.bottom .tooltip-arrow {
top: 0; top: 0;
left: 50%; left: 50%;
margin-left: -5px; margin-left: -5px;
border-width: 0 5px 5px; border-width: 0 5px 5px;
border-bottom-color: #000000; border-bottom-color: #000;
} }
.tooltip.bottom-left .tooltip-arrow { .tooltip.bottom-left .tooltip-arrow {
top: 0; top: 0;
right: 5px; right: 5px;
margin-top: -5px; margin-top: -5px;
border-width: 0 5px 5px; border-width: 0 5px 5px;
border-bottom-color: #000000; border-bottom-color: #000;
} }
.tooltip.bottom-right .tooltip-arrow { .tooltip.bottom-right .tooltip-arrow {
top: 0; top: 0;
left: 5px; left: 5px;
margin-top: -5px; margin-top: -5px;
border-width: 0 5px 5px; border-width: 0 5px 5px;
border-bottom-color: #000000; border-bottom-color: #000;
} }
...@@ -110,7 +110,8 @@ $(document).ready(function() { ...@@ -110,7 +110,8 @@ $(document).ready(function() {
t('core', 'So-so password'), t('core', 'So-so password'),
t('core', 'Good password'), t('core', 'Good password'),
t('core', 'Strong password') t('core', 'Strong password')
] ],
drawTitles: true
}); });
// centers the database chooser if it is too wide // centers the database chooser if it is too wide
......
...@@ -52,7 +52,6 @@ script('core', [ ...@@ -52,7 +52,6 @@ script('core', [
<label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label> <label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label>
<input type="checkbox" id="show" name="show"> <input type="checkbox" id="show" name="show">
<label for="show"></label> <label for="show"></label>
<div class="strengthify-wrapper"></div>
</p> </p>
</fieldset> </fieldset>
......
...@@ -343,7 +343,8 @@ $(document).ready(function () { ...@@ -343,7 +343,8 @@ $(document).ready(function () {
t('core', 'So-so password'), t('core', 'So-so password'),
t('core', 'Good password'), t('core', 'Good password'),
t('core', 'Strong password') t('core', 'Strong password')
] ],
drawTitles: true
}); });
// does the user have a custom avatar? if he does show #removeavatar // does the user have a custom avatar? if he does show #removeavatar
......
...@@ -48,9 +48,9 @@ OC_Util::addScript('settings', 'authtoken_collection'); ...@@ -48,9 +48,9 @@ OC_Util::addScript('settings', 'authtoken_collection');
OC_Util::addScript('settings', 'authtoken_view'); OC_Util::addScript('settings', 'authtoken_view');
OC_Util::addScript( 'settings', 'personal' ); OC_Util::addScript( 'settings', 'personal' );
OC_Util::addScript('settings', 'certificates'); OC_Util::addScript('settings', 'certificates');
OC_Util::addStyle( 'settings', 'settings' );
\OC_Util::addVendorScript('strengthify/jquery.strengthify'); \OC_Util::addVendorScript('strengthify/jquery.strengthify');
\OC_Util::addVendorStyle('strengthify/strengthify'); \OC_Util::addVendorStyle('strengthify/strengthify');
OC_Util::addStyle( 'settings', 'settings' );
\OC_Util::addScript('files', 'jquery.fileupload'); \OC_Util::addScript('files', 'jquery.fileupload');
if ($config->getSystemValue('enable_avatars', true) === true) { if ($config->getSystemValue('enable_avatars', true) === true) {
\OC_Util::addVendorScript('jcrop/js/jquery.Jcrop'); \OC_Util::addVendorScript('jcrop/js/jquery.Jcrop');
......
...@@ -132,8 +132,6 @@ if($_['passwordChangeSupported']) { ...@@ -132,8 +132,6 @@ if($_['passwordChangeSupported']) {
autocomplete="off" autocapitalize="off" autocorrect="off" /> autocomplete="off" autocapitalize="off" autocorrect="off" />
<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label> <input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" /> <input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
<br/>
<div class="strengthify-wrapper"></div>
</form> </form>
<?php <?php
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment