Skip to content
Snippets Groups Projects
Commit c7a17efc authored by Jan-Christoph Borchardt's avatar Jan-Christoph Borchardt
Browse files

Merge pull request #2983 from owncloud/style-details 

Style details
parents f6808617 d83adb8b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
core/css/styles.css
+ 28
− 20
View file @ c7a17efc
......@@ -23,13 +23,13 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari
#body-login #header { margin: -2em auto 0; text-align:center; height:10em; padding:1em 0 .5em;
-moz-box-shadow:0 0 1em rgba(0, 0, 0, .5); -webkit-box-shadow:0 0 1em rgba(0, 0, 0, .5); box-shadow:0 0 1em rgba(0, 0, 0, .5);
background:#1d2d44; /* Old browsers */
background:-moz-linear-gradient(top, #35537a 0%, #1d2d42 100%); /* FF3.6+ */
background:-webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d42)); /* Chrome,Safari4+ */
background:-webkit-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* Chrome10+,Safari5.1+ */
background:-o-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* Opera11.10+ */
background:-ms-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* IE10+ */
background:linear-gradient(top, #35537a 0%,#1d2d42 100%); /* W3C */
filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d42',GradientType=0 ); /* IE6-9 */ }
background:-moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */
background:-webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */
background:-webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */
background:-o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */
background:-ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */
background:linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */
filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */ }
#owncloud { position:absolute; top:0; left:0; padding:6px; padding-bottom:0; }
.header-right { float:right; vertical-align:middle; padding:0.5em; }
......@@ -50,6 +50,7 @@ button, .button,
input[type="hidden"] { height:0; width:0; }
input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], textarea {
background:#f8f8f8; color:#555; cursor:text;
font-family: inherit; /* use default ownCloud font instead of default textarea monospace */
}
input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"] {
-webkit-appearance:textfield; -moz-appearance:textfield;
......@@ -119,7 +120,7 @@ a.disabled, a.disabled:hover, a.disabled:focus {
}
.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active {
border:1px solid #1d2d44;
background:#1d2d42; color:#bbb; text-shadow:#000 0 -1px 0;
background:#1d2d44; color:#bbb; text-shadow:#000 0 -1px 0;
-moz-box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; -webkit-box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset;
}
......@@ -219,7 +220,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
}
#login #databaseField .infield { padding-left:0; }
#login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; }
#login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
/* Show password toggle */
#show, #dbpassword { position:absolute; right:1em; top:.8em; float:right; }
......@@ -245,14 +245,24 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
}
#login form #selectDbType label.ui-state-hover, #login form #selectDbType label.ui-state-active { color:#000; background-color:#e8e8e8; }
/* Warnings */
fieldset.warning {
padding:8px;
color:#b94a48; background-color:#f2dede; border:1px solid #eed3d7;
border-radius:5px;
}
fieldset.warning legend { color:#b94a48 !important; }
fieldset.warning a { color:#b94a48 !important; font-weight:bold; }
/* Warnings, for information */
.warning {
display: block;
background-color: #f2dede;
color: #b94a48;
padding: 8px;
margin: 0 7px 5px;
border: 1px solid #eed3d7;
border-radius: 5px;
}
.warning legend,
.warning a {
color: #b94a48 !important;
font-weight: bold;
}
/* Errors, for grave states */
li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; cursor:default; }
.error { color:#FF3B3B; }
/* Alternative Logins */
#alternative-logins legend { margin-bottom:10px; }
......@@ -262,7 +272,7 @@ fieldset.warning a { color:#b94a48 !important; font-weight:bold; }
/* NAVIGATION ------------------------------------------------------------- */
#navigation {
position:fixed; float:left; width:64px; padding-top:3.5em; z-index:75; height:100%;
background:#383c43 url('../img/noise.png') repeat; border-right:1px #333 solid;
background:#383c43 url('../img/noise.png') repeat;
-moz-box-shadow:0 0 7px #000; -webkit-box-shadow:0 0 7px #000; box-shadow:0 0 7px #000;
overflow:hidden; box-sizing:border-box; -moz-box-sizing:border-box;
}
......@@ -356,8 +366,6 @@ div.jp-play-bar, div.jp-seek-bar { padding:0; }
.pager { list-style:none; float:right; display:inline; margin:.7em 13em 0 0; }
.pager li { display:inline-block; }
li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; cursor:default; }
.error { color:#FF3B3B; }
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { overflow:hidden; text-overflow:ellipsis; }
.hint { background-image:url('../img/actions/info.png'); background-repeat:no-repeat; color:#777; padding-left:25px; background-position:0 0.3em;}
.separator { display:inline; border-left:1px solid #d3d3d3; border-right:1px solid #fff; height:10px; width:0px; margin:4px; }
......
core/templates/login.php
+ 15
− 17
View file @ c7a17efc
......@@ -4,23 +4,14 @@
<?php if (!empty($_['redirect_url'])) {
print_unescaped('<input type="hidden" name="redirect_url" value="' . OC_Util::sanitizeHTML($_['redirect_url']) . '" />');
} ?>
<ul>
<?php if (isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
<li class="errors">
<?php p($l->t('Automatic logon rejected!')); ?><br>
<small><?php p($l->t('If you did not change your password recently, your account may be compromised!')); ?></small>
<br>
<small><?php p($l->t('Please change your password to secure your account again.')); ?></small>
</li>
<?php endif; ?>
<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
<a href="<?php print_unescaped(OC_Helper::linkToRoute('core_lostpassword_index')) ?>">
<li class="errors">
<?php p($l->t('Lost your password?')); ?>
</li>
</a>
<?php endif; ?>
</ul>
<?php if (isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
<div class="warning">
<?php p($l->t('Automatic logon rejected!')); ?><br>
<small><?php p($l->t('If you did not change your password recently, your account may be compromised!')); ?></small>
<br>
<small><?php p($l->t('Please change your password to secure your account again.')); ?></small>
</div>
<?php endif; ?>
<p class="infield grouptop">
<input type="text" name="user" id="user" placeholder=""
value="<?php p($_['username']); ?>"<?php p($_['user_autofocus'] ? ' autofocus' : ''); ?>
......@@ -37,6 +28,13 @@
<input type="checkbox" id="show" name="show" />
<label for="show"></label>
</p>
<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
<a class="warning" href="<?php print_unescaped(OC_Helper::linkToRoute('core_lostpassword_index')) ?>">
<?php p($l->t('Lost your password?')); ?>
</a>
<?php endif; ?>
<input type="checkbox" name="remember_login" value="1" id="remember_login"/><label
for="remember_login"><?php p($l->t('remember')); ?></label>
<input type="hidden" name="timezone-offset" id="timezone-offset"/>
......
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