Download as
Browse Code »

Commit 43b17d589c2e9d1f363eb114909f26396ae29a4c

Authored by Renan Costa
Committed by Rafael Manzo
1 parent fdfe1635
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Changing classes created "inline" to the corresponding classes of Bootstrap

Showing 3 changed files with 30 additions and 21 deletions   Show diff stats
app/assets/stylesheets/boilerplate/main.css
  Diff comments   View file @43b17d5
@@ -94,16 +94,6 @@ textarea { @@ -94,16 +94,6 @@ textarea {
94 ========================================================================== */ 94 ========================================================================== */
95 95
96 96
97 -.inline_div label{  
98 - display: inline-block;  
99 - margin-bottom: 0 20px;  
100 -}  
101 -  
102 -.inline_div input[type='checkbox']{  
103 - margin:0;  
104 -}  
105 -  
106 -  
107 97
108 98
109 99
app/views/devise/sessions/new.html.erb
  Diff comments   View file @43b17d5
@@ -2,18 +2,37 @@ @@ -2,18 +2,37 @@
2 <h1>Log in to Mezuro</h1> 2 <h1>Log in to Mezuro</h1>
3 </div> 3 </div>
4 4
5 -<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>  
6 - <div class="inline_div"><%= f.label :email %><br />  
7 - <%= f.email_field :email, :autofocus => true %><p></div>  
8 5
9 - <div class="inline_div"><%= f.label :password %> <a href="/users/password/new">(forgot password)</a> <br />  
10 - <%= f.password_field :password %></div> 6 +<%= form_for(resource, :as => resource_name, :url => session_path(resource_name),:html => { :class => "form-inline" }) do |f| %>
  7 + <div class="control-group">
  8 + <%= f.label :email, :class => "control-label" %>
  9 + <div class="controls">
  10 + <%= f.email_field :email, :autofocus => true%>
  11 + </div>
  12 + </div>
  13 +
  14 + <div class="control-group">
  15 + <%= f.label :password, :class => "control-label" %> <a href="/users/password/new">(forgot password)</a>
  16 + <div class="controls">
  17 + <%= f.password_field :password %>
  18 + </div>
  19 + </div>
11 20
12 <% if devise_mapping.rememberable? -%> 21 <% if devise_mapping.rememberable? -%>
13 - <div class="inline_div"><%= f.check_box :remember_me %>&nbsp<%= f.label :remember_me %></div> 22 + <div class="control-group">
  23 + <div class="controls">
  24 + <label class="checkbox">
  25 + <%= f.check_box :remember_me %><%= f.label :remember_me %>
  26 + </label>
  27 + </div>
  28 + </div>
14 <% end -%> 29 <% end -%>
15 -  
16 - <div><%= f.submit "Sign In", class: 'btn btn-primary' %>  
17 - <%= render "devise/shared/links" %> </div>  
18 30
19 -<% end %>  
20 \ No newline at end of file 31 \ No newline at end of file
  32 + <div class="control-group">
  33 + <div class="controls controls-row span3">
  34 + <%= f.submit "Sign In", class: 'btn btn-primary span6' %>
  35 + <%= render "devise/shared/links" %>
  36 + </div>
  37 + </div>
  38 +
  39 +<% end %>
app/views/devise/shared/_links.erb
  Diff comments   View file @43b17d5
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <% end -%> 3 <% end -%>
4 4
5 <%- if devise_mapping.registerable? && controller_name != 'registrations' %> 5 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
6 - <%= link_to "Sign Up", new_registration_path(resource_name), class: 'btn btn-info' %> 6 + <%= link_to "Sign Up", new_registration_path(resource_name), class: 'btn btn-info span6' %>
7 <% end -%> 7 <% end -%>
8 8
9 <!-- <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> 9 <!-- <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>