mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

made small changes to login screen 

added height back 70px back to footer and removed .htaccess file

Signed-off-by: Robert R Pirritano <rpirritano@gmail.com>
This commit is contained in:
Robert Pirritano 2017-12-29 14:54:46 -08:00 committed by Roeland Jago Douma
parent 2a24f45b5f
commit a82c8f58cc
No known key found for this signature in database
GPG Key ID: F941078878347C0C
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/css/guest.css
View File

@ -93,7 +93,7 @@ body {
form { form {
position: relative; position: relative;
width: 280px; width: 280px;
margin: 16px auto; margin: auto;
padding: 0; padding: 0;
} }
form fieldset { form fieldset {
@ -410,7 +410,6 @@ form .warning input[type='checkbox']+label {
padding: 12px; padding: 12px;
margin-top: -6px; margin-top: -6px;
color: #fff; color: #fff;
opacity: .7;
} }
#forgot-password { #forgot-password {
padding: 11px; padding: 11px;
@ -579,8 +578,7 @@ fieldset.update legend + p {
margin-bottom: 15px; margin-bottom: 15px;
} }
p.info { p.info {
margin: 0 auto; margin: 20px auto;
padding-top: 20px;
text-shadow: 0 0 2px rgba(0, 0, 0, .4); // better readability on bright background text-shadow: 0 0 2px rgba(0, 0, 0, .4); // better readability on bright background
-webkit-user-select: none; -webkit-user-select: none;
-moz-user-select: none; -moz-user-select: none;

1
core/js/lostpassword.js
View File

@ -50,6 +50,7 @@ OC.Lostpassword = {
event.preventDefault(); event.preventDefault();
$('#lost-password').hide(); $('#lost-password').hide();
$('.wrongPasswordMsg').hide();
$('#lost-password-back').slideDown().fadeIn(); $('#lost-password-back').slideDown().fadeIn();
$('.remember-login-container').slideUp().fadeOut(); $('.remember-login-container').slideUp().fadeOut();
$('#submit-wrapper').slideUp().fadeOut(); $('#submit-wrapper').slideUp().fadeOut();

12
core/templates/login.php
View File

@ -51,17 +51,17 @@ script('core', 'merged-login');
<label for="password" class="infield"><?php p($l->t('Password')); ?></label> <label for="password" class="infield"><?php p($l->t('Password')); ?></label>
</p> </p>
<?php if (!empty($_['invalidpassword'])) { ?>
<p class="warning">
<?php p($l->t('Wrong password.')); ?>
</p>
<?php } ?>
<div id="submit-wrapper"> <div id="submit-wrapper">
<input type="submit" id="submit" class="login primary" title="" value="<?php p($l->t('Log in')); ?>" disabled="disabled" /> <input type="submit" id="submit" class="login primary" title="" value="<?php p($l->t('Log in')); ?>" disabled="disabled" />
<div class="submit-icon icon-confirm-white"></div> <div class="submit-icon icon-confirm-white"></div>
</div> </div>
<?php if (!empty($_['invalidpassword'])) { ?>
<p class="warning wrongPasswordMsg">
<?php p($l->t('Wrong password.')); ?>
</p>
<?php } ?>
<?php if (!empty($_['canResetPassword'])) { ?> <?php if (!empty($_['canResetPassword'])) { ?>
<div id="reset-password-wrapper" style="display: none;"> <div id="reset-password-wrapper" style="display: none;">
<input type="submit" id="reset-password-submit" class="login primary" title="" value="<?php p($l->t('Reset password')); ?>" disabled="disabled" /> <input type="submit" id="reset-password-submit" class="login primary" title="" value="<?php p($l->t('Reset password')); ?>" disabled="disabled" />

2
tests/acceptance/features/bootstrap/LoginPageContext.php
View File

@ -66,7 +66,7 @@ class LoginPageContext implements Context, ActorAwareInterface {
* @return Locator * @return Locator
*/ */
public static function wrongPasswordMessage() { public static function wrongPasswordMessage() {
return Locator::forThe()->xpath("//*[@class = 'warning' and normalize-space() = 'Wrong password.']")-> return Locator::forThe()->xpath("//*[@class = 'warning wrongPasswordMsg' and normalize-space() = 'Wrong password.']")->
describedAs("Wrong password message in Login page"); describedAs("Wrong password message in Login page");
} }