Merge remote-tracking branch 'upstream/pull/2667'

[rails.git] / app / views / users / login.html.erb

diff --git a/app/views/users/login.html.erb b/app/views/users/login.html.erb
index b10a2b291f251fbd3d88e270e6be69e019e3628f..365245bf04a929b34bac7dcdd431d5dbdb406c39 100644 (file)
--- a/app/views/users/login.html.erb
+++ b/app/views/users/login.html.erb
@@ -10,18 +10,18 @@
   <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>
     <%= hidden_field_tag("referer", h(params[:referer])) %>
 
   <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>
     <%= hidden_field_tag("referer", h(params[:referer])) %>
 

-    <p class='deemphasize'><%= t ".no account" %> <%= link_to t(".register now"), :action => :new, :referer => params[:referer] %></p>
+    <p class='text-muted'><%= t ".no account" %> <%= link_to t(".register now"), :action => :new, :referer => params[:referer] %></p>

 
     <div id="loginForm" class="standard-form">
 
       <fieldset>
 
     <div id="loginForm" class="standard-form">
 
       <fieldset>

-        <div class="form-row">
+        <div class="standard-form-row">

           <label for="username" class="standard-label">
             <%= t ".email or username" %>
           </label>
           <%= text_field_tag "username", params[:username], :tabindex => 1 %>
         </div>
           <label for="username" class="standard-label">
             <%= t ".email or username" %>
           </label>
           <%= text_field_tag "username", params[:username], :tabindex => 1 %>
         </div>

-        <div class="form-row">
+        <div class="standard-form-row">

           <label for="password" class="standard-label">
             <%= t ".password" %>
           </label>
           <label for="password" class="standard-label">
             <%= t ".password" %>
           </label>


@@ -51,7 +51,7 @@
 
         <p class='standard-label'><%= t ".with external" %></p>
 
 
         <p class='standard-label'><%= t ".with external" %></p>
 

-        <ul class='clearfix' id="login_auth_buttons">
+        <ul class='list-unstyled' id="login_auth_buttons">

           <li><%= link_to image_tag("openid.png", :alt => t(".auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t(".auth_providers.openid.title") %></li>
           <% if Settings.key?(:google_auth_id) -%>
           <li><%= auth_button "google", "google" %></li>
           <li><%= link_to image_tag("openid.png", :alt => t(".auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t(".auth_providers.openid.title") %></li>
           <% if Settings.key?(:google_auth_id) -%>
           <li><%= auth_button "google", "google" %></li>


@@ -73,7 +73,7 @@
           <li><%= auth_button "aol", "openid", :openid_url => "aol.com" %></li>
         </ul>
 
           <li><%= auth_button "aol", "openid", :openid_url => "aol.com" %></li>
         </ul>
 

-        <div id='login_openid_url' class='form-row'>
+        <div id='login_openid_url' class='standard-form-row'>

           <label for='openid_url' class="standard-label"><%= t ".openid_html", :logo => openid_logo %></label>
           <%= hidden_field_tag("openid_referer", params[:referer]) if params[:referer] %>
           <%= text_field_tag("openid_url", "", :tabindex => 3, :class => "openid_url") %>
           <label for='openid_url' class="standard-label"><%= t ".openid_html", :logo => openid_logo %></label>
           <%= hidden_field_tag("openid_referer", params[:referer]) if params[:referer] %>
           <%= text_field_tag("openid_url", "", :tabindex => 3, :class => "openid_url") %>