diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss index d25beb53f..6e251d6dd 100644 --- a/app/assets/stylesheets/debates.scss +++ b/app/assets/stylesheets/debates.scss @@ -9,6 +9,9 @@ // 05.2. Debates Show // 06. Comments // 07. Tags +// 08. Login and Sign Up +// 08.1. Login +// 08.2. Sign Up // // 01. Variables @@ -17,7 +20,7 @@ $font-family-sans-serif: 'Roboto', 'Helvetica Neue', Helvetica, Arial, sans-serif; $line-height: rem-calc(24); -$background: #F9F9F9; +$background: #E9E9E9; $border: #DEE0E3; $brand: #0077B9; @@ -81,6 +84,16 @@ body { display: inline-block; } +::selection { + background: $brand; + color: white; +} + +::-moz-selection { + background: $brand; + color: white; +} + // 03. Header // - - - - - - - - - - - - - - - - - - - - - - - - - @@ -493,10 +506,66 @@ header { background: #e5f1f8; border: 1px solid $brand; } +} +// 08. Login and Sign Up +// - - - - - - - - - - - - - - - - - - - - - - - - - + +// 08.1. Login +// - - - - - - - - - - - - + +.auth { + background: $background; + box-shadow: 0px -4px 5px $background; + min-height: $line-height*20; + + .panel { + background: white; + margin-top: $line-height*2; + + h1 { + font-size: rem-calc(30); + font-weight: bolder; + } + } } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/views/debates/_form.html.erb b/app/views/debates/_form.html.erb index 7735c4c28..180ada9e6 100644 --- a/app/views/debates/_form.html.erb +++ b/app/views/debates/_form.html.erb @@ -1,19 +1,18 @@ <%= form_for(@debate) do |f| %> - <% if @debate.errors.any? %> -
-

<%= pluralize(@debate.errors.count, t("debates.form.one_error"), t("debates.form.multiple_errors")) %> <%= t("debates.form.not_saved") %>:

+ <% if @debate.errors.any? %> +
+

<%= pluralize(@debate.errors.count, t("debates.form.one_error"), t("debates.form.multiple_errors")) %> <%= t("debates.form.not_saved") %>:

+ +
+ <% end %> - -
- <% end %> - -

<%= t("debates.form.debate_title") %>

-

<%= t("debates.form.title_instructions") %>

- <%= f.text_field :title %> +

<%= t("debates.form.debate_title") %>

+

<%= t("debates.form.title_instructions") %>

+ <%= f.text_field :title %>

<%= t("debates.form.debate_text") %>

diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 1e3baccc8..8a70d0362 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,16 +1,28 @@ -

<%= t("devise_views.passwords.new.title") %>

+
+
+
+
+

<%= t("devise_views.passwords.new.title") %>

-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> + <%= devise_error_messages! %> -
- <%= f.label :email, t("devise_views.passwords.new.email_label") %>
- <%= f.email_field :email, autofocus: true %> -
+
+
+ <%= f.label :email, 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") %> -
-<% end %> +
+
+ <%= f.submit t("devise_views.passwords.new.send_submit"), class: "button radius" %> +
+
+ <% end %> -<%= render "devise/shared/links" %> + <%= render "devise/shared/links" %> +
+
+
+
\ No newline at end of file diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index d7203d549..ebeae271b 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -1,42 +1,61 @@ -

<%= t("devise_views.registrations.new.title") %>

+
+
+
+
+

<%= t("devise_views.registrations.new.title") %>

-<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> - <%= devise_error_messages! %> + <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> + <%= devise_error_messages! %> +
+
+ <%= f.label :first_name, t("devise_views.registrations.new.first_name_label") %> + <%= f.text_field :first_name, autofocus: true, placeholder: t("devise_views.registrations.new.first_name_label") %> +
+
-
- <%= f.label :first_name, t("devise_views.registrations.new.first_name_label") %>
- <%= f.text_field :first_name, autofocus: true %> -
+
+
+ <%= f.label :last_name, t("devise_views.registrations.new.last_name_label") %> + <%= f.text_field :last_name, placeholder: t("devise_views.registrations.new.last_name_label") %> +
+
-
- <%= f.label :last_name, t("devise_views.registrations.new.last_name_label") %>
- <%= f.text_field :last_name %> -
+
+
+ <%= f.label :email, t("devise_views.registrations.new.email_label") %> + <%= f.email_field :email, placeholder: t("devise_views.registrations.new.email_label") %> +
+
-
- <%= f.label :email, t("devise_views.registrations.new.email_label") %>
- <%= f.email_field :email %> -
+
+
+ <%= f.label :password, t("devise_views.registrations.new.password_label"), class: "inline-block" %> + <% if @minimum_password_length %> + <%= t("devise_views.registrations.new.min_length", min: @minimum_password_length) %> + <% end %> + <%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.registrations.new.password_label") %> +
+
-
- <%= f.label :password, t("devise_views.registrations.new.password_label") %> - <% if @minimum_password_length %> - <%= t("devise_views.registrations.new.min_length", min: @minimum_password_length) %> - <% end %>
- <%= f.password_field :password, autocomplete: "off" %> -
+
+
+ <%= f.label :password_confirmation, t("devise_views.registrations.new.password_confirmation_label") %> + <%= f.password_field :password_confirmation, autocomplete: "off", placeholder: t("devise_views.registrations.new.password_confirmation_label") %> +
+
-
- <%= f.label :password_confirmation, t("devise_views.registrations.new.password_confirmation_label") %>
- <%= f.password_field :password_confirmation, autocomplete: "off" %> -
+ <%= render 'shared/captcha', resource: resource %> - <%= render 'shared/captcha', resource: resource %> +
+
+ <%= f.submit t("devise_views.registrations.new.submit"), class: "button radius expand" %> +
+
+ <% end %> -
- <%= f.submit t("devise_views.registrations.new.submit"), class: 'button radius' %> -
-<% end %> - -<%= render "devise/shared/links" %> + <%= render "devise/shared/links" %> +
+
+
+
\ No newline at end of file diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index e4e706cc6..fbe91ca68 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,26 +1,42 @@ -

<%= t("devise_views.sessions.new.title") %>

+
+
+
+
+

<%= t("devise_views.sessions.new.title") %>

-<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> -
- <%= f.label :email, t("devise_views.sessions.new.email_label") %>
- <%= f.email_field :email, autofocus: true %> -
+ <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> +
+
+ <%= f.label :email, t("devise_views.sessions.new.email_label") %> + <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.sessions.new.email_label") %> +
+
-
- <%= f.label :password, t("devise_views.sessions.new.password_label") %>
- <%= f.password_field :password, autocomplete: "off" %> -
+
+
+ <%= f.label :password, t("devise_views.sessions.new.password_label") %> + <%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.sessions.new.password_label") %> +
+
- <% if devise_mapping.rememberable? -%> -
- <%= f.check_box :remember_me %> - <%= f.label :remember_me, t("devise_views.sessions.new.remember_me") %> + <% if devise_mapping.rememberable? -%> +
+
+ <%= f.check_box :remember_me %> + <%= f.label :remember_me, t("devise_views.sessions.new.remember_me") %> +
+
+ <% end -%> + +
+
+ <%= f.submit(t("devise_views.sessions.new.submit"), class: "button radius expand") %> +
+
+ <% end %> + + <%= render "devise/shared/links" %> +
+
- <% end -%> - -
- <%= f.submit(t("devise_views.sessions.new.submit"), class: "button radius") %> -
-<% end %> - -<%= render "devise/shared/links" %> +
\ No newline at end of file diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb index d7db78921..d7a77614e 100644 --- a/app/views/devise/shared/_links.html.erb +++ b/app/views/devise/shared/_links.html.erb @@ -1,25 +1,27 @@ -<%- if controller_name != 'sessions' %> - <%= link_to t("devise_views.shared.links.login"), new_session_path(resource_name) %>
-<% end -%> +
+ <%- if controller_name != 'sessions' %> + <%= link_to t("devise_views.shared.links.login"), new_session_path(resource_name) %>
+ <% end -%> -<%- if devise_mapping.registerable? && controller_name != 'registrations' %> - <%= link_to t("devise_views.shared.links.signup"), new_registration_path(resource_name) %>
-<% end -%> + <%- if devise_mapping.registerable? && controller_name != 'registrations' %> + <%= link_to t("devise_views.shared.links.signup"), new_registration_path(resource_name) %>
+ <% end -%> -<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> - <%= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name) %>
-<% end -%> + <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> + <%= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name) %>
+ <% end -%> -<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> - <%= link_to t("devise_views.shared.links.new_confirmation"), new_confirmation_path(resource_name) %>
-<% end -%> + <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> + <%= link_to t("devise_views.shared.links.new_confirmation"), new_confirmation_path(resource_name) %>
+ <% end -%> -<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> - <%= link_to t("devise_views.shared.links.new_unlock"), new_unlock_path(resource_name) %>
-<% end -%> + <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> + <%= link_to t("devise_views.shared.links.new_unlock"), new_unlock_path(resource_name) %>
+ <% end -%> -<%- if devise_mapping.omniauthable? %> - <%- resource_class.omniauth_providers.each do |provider| %> - <%= link_to t("devise_views.shared.links.signin_with_provider", provider: provider.to_s.titleize), omniauth_authorize_path(resource_name, provider) %>
- <% end -%> -<% end -%> + <%- if devise_mapping.omniauthable? %> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= link_to t("devise_views.shared.links.signin_with_provider", provider: provider.to_s.titleize), omniauth_authorize_path(resource_name, provider) %>
+ <% end -%> + <% end -%> +
\ No newline at end of file