git://git.onelab.eu
/
unfold.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b3ede7e
)
styles for inputs and buttons
author
Ciro Scognamiglio
<ciro.scognamiglio@cslash.net>
Fri, 4 Jul 2014 12:11:46 +0000
(14:11 +0200)
committer
Ciro Scognamiglio
<ciro.scognamiglio@cslash.net>
Fri, 4 Jul 2014 12:11:46 +0000
(14:11 +0200)
portal/static/css/onelab.css
patch
|
blob
|
history
portal/templates/onelab/onelab_widget-login-user.html
patch
|
blob
|
history
portal/templates/password_reset_confirm.html
patch
|
blob
|
history
portal/templates/password_reset_form.html
patch
|
blob
|
history
diff --git
a/portal/static/css/onelab.css
b/portal/static/css/onelab.css
index
6e272d9
..
17b8c1a
100644
(file)
--- a/
portal/static/css/onelab.css
+++ b/
portal/static/css/onelab.css
@@
-32,6
+32,17
@@
h3 {
font-size:13pt;
color:#201E62;
}
font-size:13pt;
color:#201E62;
}
+input[type=text], input[type=password], input[type=email], select, option {
+ min-width:260px;
+ padding:6px;
+ border:1pt solid #22606D;
+ vertical-align:bottom;
+ border-radius:0;
+}
+input {
+
+}
+
span.label {
font-size:11pt;
color:gray;
span.label {
font-size:11pt;
color:gray;
@@
-42,7
+53,7
@@
div.el {
padding-bottom:15px;
}
/* buttons */
padding-bottom:15px;
}
/* buttons */
-button.btn {
+button.btn
, input.btn
{
padding:6px 10px;
border-radius:5px;
font-size:10pt;
padding:6px 10px;
border-radius:5px;
font-size:10pt;
@@
-70,38
+81,45
@@
button.btn-primary {
border-bottom:3px solid #3071A9;
}
button.btn-primary:hover {
border-bottom:3px solid #3071A9;
}
button.btn-primary:hover {
+ box-shadow:none;
+ background-color:#428bca;
+ border:1px solid #357ebd;
border-bottom:3px solid #3071A9;
}
button.btn-primary:active {
box-shadow:none;
border-bottom:3px solid #3071A9;
}
button.btn-primary:active {
box-shadow:none;
+ border-bottom:1px solid #3071A9;
margin-top:2px;
}
button.btn-danger {
margin-top:2px;
}
button.btn-danger {
- border-bottom:
2px solid #FF7394
;
+ border-bottom:
3px solid #EEA236
;
}
button.btn-danger:hover {
}
button.btn-danger:hover {
- border-bottom:2px solid #D2322D;
+ box-shadow:none;
+ background-color:#d9534f;
+ border:1px solid #d43f3a;
+ border-bottom:3px solid #EEA236;
}
button.btn-danger:active {
}
button.btn-danger:active {
- border:1px solid #
D2322D
;
+ border:1px solid #
d43f3a
;
box-shadow:none;
margin-top:2px;
}
box-shadow:none;
margin-top:2px;
}
-button.btn-onelab {
+button.btn-onelab
, input.btn-onelab
{
border:0;
border:0;
- border-bottom:3px solid #
540086
;
+ border-bottom:3px solid #
760073
;
background-color:#302562;
color:white;
}
background-color:#302562;
color:white;
}
-button.btn-onelab:hover {
+button.btn-onelab:hover
, input.btn-onelab:hover
{
border:0;
border:0;
- border-bottom:3px solid #
540086
;
+ border-bottom:3px solid #
760073
;
background-color:#302562;
color:white;
}
background-color:#302562;
color:white;
}
-button.btn-onelab:active {
+button.btn-onelab:active
, input.btn-onelab:active
{
box-shadow:none;
box-shadow:none;
- border-bottom:1px solid #
540086
;
+ border-bottom:1px solid #
760073
;
margin-top:2px;
}
/***** Notifications *****/
margin-top:2px;
}
/***** Notifications *****/
@@
-580,25
+598,12
@@
div.registration-form {
padding-top:150px;
text-align:center;
}
padding-top:150px;
text-align:center;
}
-div.login-form input[type=text] {
-
-
-}
.login-form input {
.login-form input {
- font-size:12pt;
width:320px;
width:320px;
- padding:8px;
- border:1pt solid #22606D;
}
.login-form input[type=submit] {
}
.login-form input[type=submit] {
- border:0;
- border-bottom:2px solid #540086;
- background-color:#302562;
- color:white;
- width:100px;
- border-radius:5px;
- font-size:12pt;
+ width:108px;
}
.login-submit {
}
.login-submit {
diff --git
a/portal/templates/onelab/onelab_widget-login-user.html
b/portal/templates/onelab/onelab_widget-login-user.html
index
fad0c26
..
d7342f8
100644
(file)
--- a/
portal/templates/onelab/onelab_widget-login-user.html
+++ b/
portal/templates/onelab/onelab_widget-login-user.html
@@
-14,7
+14,7
@@
<input type="password" name="password" placeholder="Password">
</div>
<div class="login-submit">
<input type="password" name="password" placeholder="Password">
</div>
<div class="login-submit">
- <input type="submit" value="Sign In" />
+ <input type="submit"
class="btn btn-onelab"
value="Sign In" />
<span class="lost-password"> | <a href="/portal/pass_reset/">Can't access your account?</a></span>
</div>
<div class="login-signup">
<span class="lost-password"> | <a href="/portal/pass_reset/">Can't access your account?</a></span>
</div>
<div class="login-signup">
diff --git
a/portal/templates/password_reset_confirm.html
b/portal/templates/password_reset_confirm.html
index
955193b
..
dde2181
100644
(file)
--- a/
portal/templates/password_reset_confirm.html
+++ b/
portal/templates/password_reset_confirm.html
@@
-19,7
+19,7
@@
<p class="aligned wide"><label for="id_new_password1">{% trans 'New password:' %}</label>{{ form.new_password1 }}</p>
{{ form.new_password2.errors }}
<p class="aligned wide"><label for="id_new_password2">{% trans 'Confirm password:' %}</label>{{ form.new_password2 }}</p>
<p class="aligned wide"><label for="id_new_password1">{% trans 'New password:' %}</label>{{ form.new_password1 }}</p>
{{ form.new_password2.errors }}
<p class="aligned wide"><label for="id_new_password2">{% trans 'Confirm password:' %}</label>{{ form.new_password2 }}</p>
- <p><input type="submit" value="{% trans 'Change my password' %}" /></p>
+ <p><input type="submit"
class="btn btn-onelab"
value="{% trans 'Change my password' %}" /></p>
</form>
{% else %}
</form>
{% else %}
diff --git
a/portal/templates/password_reset_form.html
b/portal/templates/password_reset_form.html
index
6198523
..
0e0de7e
100644
(file)
--- a/
portal/templates/password_reset_form.html
+++ b/
portal/templates/password_reset_form.html
@@
-13,7
+13,7
@@
<form action="/portal/pass_reset/" method="post">{% csrf_token %}
{{ form.email.errors }}
<form action="/portal/pass_reset/" method="post">{% csrf_token %}
{{ form.email.errors }}
- <p><label for="id_email">Email address:</label> {{ form.email }} <input type="submit" value="Reset my password" /></p>
+ <p><label for="id_email">Email address:</label> {{ form.email }} <input type="submit"
class="btn btn-onelab"
value="Reset my password" /></p>
</form>
</div>
</div>
</form>
</div>
</div>