polishes forms styles on devise views

This commit is contained in:
Alberto Garcia Cabeza
2017-01-09 19:10:15 +01:00
parent ea70e0a5db
commit 508de35320
7 changed files with 31 additions and 21 deletions

View File

@@ -3,13 +3,13 @@
<% if current_page?(new_user_session_path) %> <% if current_page?(new_user_session_path) %>
<div class="row"> <div class="row">
<div class="small-12 column"> <div class="small-12 column">
<div class="margin"> <div class="margin-bottom text-center">
<strong><%= t("omniauth.info_sign_in") %></strong> <strong><%= t("omniauth.info_sign_in") %></strong>
</div> </div>
</div> </div>
<% if feature? :twitter_login %> <% if feature? :twitter_login %>
<div class="small-12 medium-4 column end"> <div class="small-12 medium-6 large-4 column end">
<%= link_to t("omniauth.twitter.name"), user_omniauth_authorize_path(:twitter), <%= link_to t("omniauth.twitter.name"), user_omniauth_authorize_path(:twitter),
title: t("omniauth.twitter.sign_in"), title: t("omniauth.twitter.sign_in"),
class: "button-twitter button expanded" %> class: "button-twitter button expanded" %>
@@ -17,7 +17,7 @@
<% end %> <% end %>
<% if feature? :facebook_login %> <% if feature? :facebook_login %>
<div class="small-12 medium-4 column end"> <div class="small-12 medium-6 large-4 column end">
<%= link_to t("omniauth.facebook.name"), user_omniauth_authorize_path(:facebook), <%= link_to t("omniauth.facebook.name"), user_omniauth_authorize_path(:facebook),
title: t("omniauth.facebook.sign_in"), title: t("omniauth.facebook.sign_in"),
class: "button-facebook button expanded" %> class: "button-facebook button expanded" %>
@@ -25,7 +25,7 @@
<% end %> <% end %>
<% if feature? :google_login %> <% if feature? :google_login %>
<div class="small-12 medium-4 column end"> <div class="small-12 medium-6 large-4 column end">
<%= link_to t("omniauth.google_oauth2.name"), user_omniauth_authorize_path(:google_oauth2), <%= link_to t("omniauth.google_oauth2.name"), user_omniauth_authorize_path(:google_oauth2),
title: t("omniauth.google_oauth2.sign_in"), title: t("omniauth.google_oauth2.sign_in"),
class: "button-google button expanded" %> class: "button-google button expanded" %>
@@ -40,11 +40,13 @@
<% elsif current_page?(new_user_registration_path) %> <% elsif current_page?(new_user_registration_path) %>
<div class="row"> <div class="row">
<div class="small-12 column"> <div class="small-12 column">
<p><%= t("omniauth.info_sign_up") %></p> <div class="margin-bottom text-center">
<strong><%= t("omniauth.info_sign_up") %></strong>
</div>
</div> </div>
<% if feature? :twitter_login %> <% if feature? :twitter_login %>
<div class="small-12 medium-4 column end"> <div class="small-12 medium-6 large-4 column end">
<%= link_to t("omniauth.twitter.name"), user_omniauth_authorize_path(:twitter), <%= link_to t("omniauth.twitter.name"), user_omniauth_authorize_path(:twitter),
title: t("omniauth.twitter.sign_up"), title: t("omniauth.twitter.sign_up"),
class: "button-twitter button expanded" %> class: "button-twitter button expanded" %>
@@ -52,7 +54,7 @@
<% end %> <% end %>
<% if feature? :facebook_login %> <% if feature? :facebook_login %>
<div class="small-12 medium-4 column end"> <div class="small-12 medium-6 large-4 column end">
<%= link_to t("omniauth.facebook.name"), user_omniauth_authorize_path(:facebook), <%= link_to t("omniauth.facebook.name"), user_omniauth_authorize_path(:facebook),
title: t("omniauth.facebook.sign_up"), title: t("omniauth.facebook.sign_up"),
class: "button-facebook button expanded" %> class: "button-facebook button expanded" %>
@@ -60,15 +62,17 @@
<% end %> <% end %>
<% if feature? :google_login %> <% if feature? :google_login %>
<div class="small-12 medium-4 column end"> <div class="small-12 medium-6 large-4 column end">
<%= link_to t("omniauth.google_oauth2.name"), user_omniauth_authorize_path(:google_oauth2), <%= link_to t("omniauth.google_oauth2.name"), user_omniauth_authorize_path(:google_oauth2),
title: t("omniauth.google_oauth2.sign_up"), title: t("omniauth.google_oauth2.sign_up"),
class: "button-google button expanded" %> class: "button-google button expanded" %>
</div> </div>
<% end %> <% end %>
</div>
<hr/> <div class="small-12 column auth-divider">
<span><%= t("omniauth.or_fill") %></span>
</div>
</div>
<% end %> <% end %>
<% end %> <% end %>

View File

@@ -15,7 +15,9 @@
<%= hidden_field_tag :confirmation_token,@confirmation_token %> <%= hidden_field_tag :confirmation_token,@confirmation_token %>
<%= f.submit(t("devise_views.confirmations.new.submit"), class: "button expanded") %> <div class="small-12 medium-6 small-centered">
<%= f.submit(t("devise_views.confirmations.new.submit"), class: "button expanded") %>
</div>
</div> </div>
<% end %> <% end %>

View File

@@ -7,7 +7,9 @@
<div class="small-12 column"> <div class="small-12 column">
<%= f.email_field :email, autofocus: true, placeholder: t("devise_views.passwords.new.email_label") %> <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.passwords.new.email_label") %>
<%= f.submit t("devise_views.passwords.new.send_submit"), class: "button expanded" %> <div class="small-12 medium-6 small-centered">
<%= f.submit t("devise_views.passwords.new.send_submit"), class: "button expanded" %>
</div>
</div> </div>
<% end %> <% end %>

View File

@@ -10,17 +10,17 @@
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<div class="row"> <div class="row">
<div class="small-12 columns"> <div class="small-12 column">
<%= f.email_field :email, autofocus: true, placeholder: t("devise_views.sessions.new.email_label"), tabindex: "1" %> <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.sessions.new.email_label"), tabindex: "1" %>
</div> </div>
<div class="small-12 columns"> <div class="small-12 column">
<%= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name), class: "float-right", tabindex: "3" %> <%= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name), class: "float-right", tabindex: "3" %>
<%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.sessions.new.password_label"), tabindex: "2" %> <%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.sessions.new.password_label"), tabindex: "2" %>
</div> </div>
<% if devise_mapping.rememberable? -%> <% if devise_mapping.rememberable? -%>
<div class="small-12 columns"> <div class="small-12 column">
<%= f.label :remember_me do %> <%= f.label :remember_me do %>
<%= f.check_box :remember_me, title: t('devise_views.sessions.new.remember_me'), label: false, tabindex: "4" %> <%= f.check_box :remember_me, title: t('devise_views.sessions.new.remember_me'), label: false, tabindex: "4" %>
<span class="checkbox"><%= t("devise_views.sessions.new.remember_me") %></span> <span class="checkbox"><%= t("devise_views.sessions.new.remember_me") %></span>
@@ -28,7 +28,7 @@
</div> </div>
<% end -%> <% end -%>
<div class="small-12 columns"> <div class="small-12 medium-6 small-centered">
<%= f.submit(t("devise_views.sessions.new.submit"), class: "button expanded") %> <%= f.submit(t("devise_views.sessions.new.submit"), class: "button expanded") %>
</div> </div>
</div> </div>

View File

@@ -25,7 +25,7 @@
<div class="small-12 medium-9 column"> <div class="small-12 medium-9 column">
<div class="row"> <div class="row">
<div class="small-12 medium-6 small-centered column"> <div class="small-12 medium-9 large-7 small-centered column">
<div class="auth-form margin"> <div class="auth-form margin">
<%= render 'layouts/flash' %> <%= render 'layouts/flash' %>

View File

@@ -33,8 +33,9 @@
terms: link_to(t("devise_views.users.registrations.new.terms_link"), "/conditions", title: t('shared.target_blank_html'), target: "_blank")).html_safe %></span> terms: link_to(t("devise_views.users.registrations.new.terms_link"), "/conditions", title: t('shared.target_blank_html'), target: "_blank")).html_safe %></span>
<% end %> <% end %>
<div class="small-12 medium-6 small-centered">
<%= f.submit t("devise_views.organizations.registrations.new.submit"), class: "button expanded" %> <%= f.submit t("devise_views.organizations.registrations.new.submit"), class: "button expanded" %>
</div>
</div> </div>
</div> </div>
<% end %> <% end %>

View File

@@ -46,8 +46,9 @@
target: "_blank")).html_safe %> target: "_blank")).html_safe %>
</span> </span>
<% end %> <% end %>
<div class="small-12 medium-6 small-centered">
<%= f.submit t("devise_views.users.registrations.new.submit"), class: "button expanded" %> <%= f.submit t("devise_views.users.registrations.new.submit"), class: "button expanded" %>
</div>
</div> </div>
</div> </div>
<% end %> <% end %>