Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix login labels

Browse source
This commit is contained in:
Felix Niklas 2015-09-25 14:02:27 +02:00
parent 3f9f3c0035
commit 49b1a000e5
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/assets/javascripts/app/views/login.jst.eco
View file

@ -7,12 +7,16 @@
<img class="company-logo" src="<%= @logoUrl %>" alt="<%= @C( 'product_name' ) %>"> <img class="company-logo" src="<%= @logoUrl %>" alt="<%= @C( 'product_name' ) %>">
<form id="login"> <form id="login">
<div class="form-group"> <div class="form-group">
<label for="username"><%- @Ti( 'Username / email' ) %></label> <div class="formGroup-label">
<label for="username"><%- @Ti( 'Username / email' ) %></label>
</div>
<input id="username" name="username" type="text" class="form-control" value="<%= @item.username %>" autocapitalize="off" /> <input id="username" name="username" type="text" class="form-control" value="<%= @item.username %>" autocapitalize="off" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="password"><%- @Ti( 'Password' ) %></label> <div class="formGroup-label">
<label for="password"><%- @Ti( 'Password' ) %></label>
</div>
<input id="password" name="password" type="password" class="form-control"/> <input id="password" name="password" type="password" class="form-control"/>
</div> </div>
@ -21,7 +25,12 @@
<label for="remember_me"><%- @Ti( 'Remember me' ) %></label> <label for="remember_me"><%- @Ti( 'Remember me' ) %></label>
<input id="remember_me" name="remember_me" value="1" type="checkbox"/> <input id="remember_me" name="remember_me" value="1" type="checkbox"/>
--> -->
<label><input name="remember_me" value="1" type="checkbox"/> <%- @T( 'Remember me' ) %></label> <label class="inline-label checkbox-replacement">
<input name="remember_me" value="1" type="checkbox">
<%- @Icon('checkbox', 'icon-unchecked') %>
<%- @Icon('checkbox-checked', 'icon-checked') %>
<span class="label-text"><%- @T( 'Remember me' ) %></span>
</label>
</div> </div>
<div class="form-controls"> <div class="form-controls">

12
app/assets/stylesheets/zammad.css.scss
View file

@ -818,7 +818,7 @@ label,
text-transform: uppercase; text-transform: uppercase;
color: hsl(198,19%,72%); color: hsl(198,19%,72%);
display: block; display: block;
font-size: 12px; font-size: 13px;
font-weight: normal; font-weight: normal;
letter-spacing: 0.05em; letter-spacing: 0.05em;
margin-bottom: 4px; margin-bottom: 4px;
@ -989,7 +989,7 @@ fieldset > *:not(.form-group) .form-control {
.formGroup-label { .formGroup-label {
padding: 0 2px; padding: 0 2px;
margin-bottom: 6px; margin-bottom: 5px;
position: relative; position: relative;
display: flex; display: flex;
align-items: center; align-items: center;
@ -1567,6 +1567,14 @@ kbd {
box-shadow: box-shadow:
0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 8px 17px 0 rgba(0, 0, 0, 0.2),
0 6px 20px 0 rgba(0, 0, 0, 0.19); 0 6px 20px 0 rgba(0, 0, 0, 0.19);
label {
color: hsl(0,0%,60%);
}
.inline-label {
font-size: inherit;
}
} }
.hero-unit h1, .hero-unit h1,