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

Moved to BS3.

Browse source
This commit is contained in:
Martin Edenhofer 2013-09-18 15:06:57 +02:00
parent 4b6cdfa727
commit cb6943fd4a
2 changed files with 44 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,57 +3,47 @@
<div class="hero-unit"> <div class="hero-unit">
<h1><%- @T( 'Welcome stranger!' ) %></h1> <h1><%- @T( 'Welcome stranger!' ) %></h1>
<div class="row"> <div class="col-12">
<div class="col-12"> <p><%- @T( 'Sign in with' ) %></p>
<p><%- @T( 'Sign in with' ) %></p> <form id="login" class="form-inline">
<form id="login" class="form-inline"> <input name="username" type="text" class="form-control col-3" placeholder="<%- @Ti( 'Username or email' ) %>" value="<%= @item.username %>" autocapitalize="off"/>
<input name="username" type="text" class="form-control col-3" placeholder="<%- @Ti( 'Username or email' ) %>" value="<%= @item.username %>" autocapitalize="off"/> <input name="password" type="password" class="form-control col-3" placeholder="<%- @Ti( 'Password' ) %>"/>
<input name="password" type="password" class="form-control col-3" placeholder="<%- @Ti( 'Password' ) %>"/> <button class="btn btn-primary" type="submit"><%- @T( 'Sign in' ) %></button>
<button class="btn btn-primary" type="submit"><%- @T( 'Sign in' ) %></button> <div>
<div> <span class="small"><input name="remember_me" value="1" type="checkbox"/> <%- @T( 'Remember me' ) %></span>
<span class="small"><input name="remember_me" value="1" type="checkbox"/> <%- @T( 'Remember me' ) %></span> <% if @C('user_lost_password'): %>
<% if @C('user_lost_password'): %> <span class="small">&middot;</span>
<span class="small">&middot;</span> <a href="#reset_password" class="small"><%- @T( 'Forgot password?' ) %></a>
<a href="#reset_password" class="small"><%- @T( 'Forgot password?' ) %></a>
<% end %>
</div>
</form>
</div>
</div>
<% if !_.isEmpty( @auth_providers ): %>
<div class="row">
<div class="col-12">
<p>--- <%- @T( 'or' ) %> ---</p>
</div>
</div>
<div class="row">
<div class="col-12">
<p><%- @T( 'Sign in using' ) %></p>
<ul>
<% for auth_provider in @auth_providers: %>
<li><a href="<%= auth_provider.url %>"><%- @T( auth_provider.name ) %></a></li>
<% end %> <% end %>
</ul>
</div> </div>
</div> </form>
<% end %> </div>
<% if @C('user_create_account'): %> <% if !_.isEmpty( @auth_providers ): %>
<div class="row"> <div class="col-12">
<div class="col-12"> <p>--- <%- @T( 'or' ) %> ---</p>
<p>--- <%- @T( 'or' ) %> ---</p> </div>
</div>
</div>
<div class="row"> <div class="col-12">
<div class="col-12"> <p><%- @T( 'Sign in using' ) %></p>
<p><%- @T( 'New to %s join today!', @C( 'product_name' ) ) %></p> <ul>
<p><a href="#signup" class="btn btn-default"><%- @T( 'Sign up' ) %></a> <% for auth_provider in @auth_providers: %>
</div> <li><a href="<%= auth_provider.url %>"><%- @T( auth_provider.name ) %></a></li>
</div>
<% end %> <% end %>
</ul>
</div>
<% end %>
<% if @C('user_create_account'): %>
<div class="col-12">
<p>--- <%- @T( 'or' ) %> ---</p>
</div>
<div class="col-12">
<p><%- @T( 'New to %s join today!', @C( 'product_name' ) ) %></p>
<p><a href="#signup" class="btn btn-default"><%- @T( 'Sign up' ) %></a>
</div>
<% end %>
</div> </div>

8
app/assets/stylesheets/zzz.css
View file

@ -454,6 +454,10 @@ h5 {
*/ */
} }
.dropdown-menu > li > a {
font-weight: 200;
}
.dropdown-menu .count { .dropdown-menu .count {
padding-top: 1px; padding-top: 1px;
margin-left: 10px; margin-left: 10px;
@ -497,6 +501,10 @@ h5 {
border-radius: 6px; border-radius: 6px;
} }
.hero-unit h1 {
font-size: 52px;
}
.hero-unit p { .hero-unit p {
font-size: 16px; font-size: 16px;
font-weight: 200; font-weight: 200;