Improves layout styles
This commit is contained in:
@@ -240,6 +240,14 @@
|
||||
a {
|
||||
color: $text;
|
||||
}
|
||||
|
||||
ul, ol {
|
||||
|
||||
li {
|
||||
font-size: rem-calc(13);
|
||||
margin-bottom: rem-calc(12);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.truncate {
|
||||
@@ -433,6 +441,14 @@
|
||||
}
|
||||
}
|
||||
|
||||
ul, ol {
|
||||
|
||||
li {
|
||||
font-size: rem-calc(13);
|
||||
margin-bottom: rem-calc(12);
|
||||
}
|
||||
}
|
||||
|
||||
.author-photo {
|
||||
line-height: $line-height*2;
|
||||
margin-right: rem-calc(6);
|
||||
|
||||
@@ -280,7 +280,7 @@ header {
|
||||
min-height: rem-calc(48);
|
||||
|
||||
@media (min-width: $small-breakpoint) {
|
||||
min-height: rem-calc(189);
|
||||
min-height: 189px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -901,12 +901,6 @@ form {
|
||||
}
|
||||
}
|
||||
|
||||
.alert-layout {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
span.error, small.error {
|
||||
background: $alert-bg;
|
||||
color: $alert-color;
|
||||
@@ -923,6 +917,11 @@ label.error, label.error a {
|
||||
color: $alert-color;
|
||||
}
|
||||
|
||||
.alert-messages {
|
||||
background-color: white;
|
||||
padding-top: rem-calc(24);
|
||||
}
|
||||
|
||||
// 10. User account
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
||||
@@ -1351,7 +1350,7 @@ table {
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
||||
.verification {
|
||||
min-height: 60%;
|
||||
min-height: rem-calc(600);
|
||||
|
||||
@media (min-width: $small-breakpoint) {
|
||||
.left + .left {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<div class="small-12 column">
|
||||
<%= link_to t("account.show.change_credentials_link"), edit_user_registration_path, class: "button radius small secondary right" %>
|
||||
|
||||
<div class="verification">
|
||||
<div>
|
||||
<span class="right verify-account">
|
||||
<% if current_user.level_three_verified? %>
|
||||
<p class="verified">
|
||||
|
||||
@@ -20,16 +20,18 @@
|
||||
<a class="js-add-tag-link"><%= tag.name %></a>
|
||||
<% end %>
|
||||
</span>
|
||||
<%= f.text_field :tag_list, value: @debate.tag_list.to_s, label: false %>
|
||||
<%= f.text_field :tag_list, value: @debate.tag_list.to_s, label: false, placeholder: t("debates.form.tags_placeholder") %>
|
||||
</div>
|
||||
|
||||
<div class="small-12 column">
|
||||
<% if @debate.new_record? %>
|
||||
<%= f.label :terms_of_service do %>
|
||||
<%= f.check_box :terms_of_service, label: false %>
|
||||
<%= t("form.accept_terms",
|
||||
policy: link_to(t("form.policy"), "/privacy", target: "blank"), conditions: link_to(t("form.conditions"), "/conditions", target: "blank")).html_safe
|
||||
%>
|
||||
<span class="checkbox">
|
||||
<%= t("form.accept_terms",
|
||||
policy: link_to(t("form.policy"), "/privacy", target: "blank"),
|
||||
conditions: link_to(t("form.conditions"), "/conditions", target: "blank")).html_safe %>
|
||||
</span>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
@@ -16,21 +16,25 @@
|
||||
<%= render 'layouts/header' %>
|
||||
|
||||
<% if notice %>
|
||||
<div data-alert class="alert-box success alert-layout">
|
||||
<a href="#" class="close">×</a>
|
||||
<div class="row">
|
||||
<div class="alert-messages">
|
||||
<div class="row">
|
||||
<div data-alert class="alert-box success radius">
|
||||
<a href="#" class="close">×</a>
|
||||
<%= notice %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<% if alert %>
|
||||
<div data-alert class="alert-box alert alert-layout">
|
||||
<a href="#" class="close">×</a>
|
||||
<div class="row">
|
||||
<div class="alert-messages">
|
||||
<div class="row">
|
||||
<div data-alert class="alert-box alert radius">
|
||||
<a href="#" class="close">×</a>
|
||||
<%= alert %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<%= yield %>
|
||||
|
||||
@@ -1,45 +1,40 @@
|
||||
<div class="row">
|
||||
<div class="account small-12 medium-9 column small-centered">
|
||||
<i class="icon-angle-left left"></i> <%= link_to t("devise_views.users.registrations.edit.back_link"), :back, class: "left back" %>
|
||||
|
||||
<i class="icon-angle-left left"></i> <%= link_to t("devise_views.users.registrations.edit.back_link"), :back, class: "left back" %>
|
||||
<h1><%= t("devise_views.users.registrations.edit.edit") %></h1>
|
||||
|
||||
<h1><%= t("devise_views.users.registrations.edit.edit") %></h1>
|
||||
<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
|
||||
<%= devise_error_messages! %>
|
||||
<div class="row">
|
||||
<div class="small-12 column">
|
||||
<%= f.label :email, t("devise_views.users.registrations.edit.email_label") %>
|
||||
<%= f.email_field :email, label: false, autofocus: true, placeholder: t("devise_views.users.registrations.edit.email_label") %>
|
||||
</div>
|
||||
|
||||
<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
|
||||
<%= devise_error_messages! %>
|
||||
<div class="row">
|
||||
<div class="small-12 column">
|
||||
<%= f.label :email, t("devise_views.users.registrations.edit.email_label") %>
|
||||
<%= f.email_field :email, label: false, autofocus: true, placeholder: t("devise_views.users.registrations.edit.email_label") %>
|
||||
</div>
|
||||
<div class="small-12 column">
|
||||
<% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
|
||||
<div><%= t("devise_views.users.registrations.edit.waiting_for") %> <%= resource.unconfirmed_email %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
<div class="small-12 column">
|
||||
<% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
|
||||
<div><%= t("devise_views.users.registrations.edit.waiting_for") %> <%= resource.unconfirmed_email %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="small-12 column">
|
||||
<%= f.label :password, t("devise_views.users.registrations.edit.password_label") %>
|
||||
<span class="note"><%= t("devise_views.users.registrations.edit.leave_blank") %></span>
|
||||
<%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.users.registrations.edit.password_label") %>
|
||||
</div>
|
||||
|
||||
<div class="small-12 column">
|
||||
<%= f.label :password, t("devise_views.users.registrations.edit.password_label") %>
|
||||
<span class="note"><%= t("devise_views.users.registrations.edit.leave_blank") %></span>
|
||||
<%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.users.registrations.edit.password_label") %>
|
||||
</div>
|
||||
<div class="small-12 column">
|
||||
<%= f.label :password_confirmation, t("devise_views.users.registrations.edit.password_confirmation_label") %>
|
||||
<%= f.password_field :password_confirmation, label: false, autocomplete: "off", placeholder: t("devise_views.users.registrations.edit.password_confirmation_label") %>
|
||||
</div>
|
||||
|
||||
<div class="small-12 column">
|
||||
<%= f.label :password_confirmation, t("devise_views.users.registrations.edit.password_confirmation_label") %>
|
||||
<%= f.password_field :password_confirmation, label: false, autocomplete: "off", placeholder: t("devise_views.users.registrations.edit.password_confirmation_label") %>
|
||||
</div>
|
||||
<div class="small-12 column">
|
||||
<%= f.label :current_password, t("devise_views.users.registrations.edit.current_password_label") %>
|
||||
<span class="note"><%= t("devise_views.users.registrations.edit.need_current") %></span>
|
||||
<%= f.password_field :current_password, label: false, autocomplete: "off", placeholder: t("devise_views.users.registrations.edit.current_password_label") %>
|
||||
</div>
|
||||
|
||||
<div class="small-12 column">
|
||||
<%= f.label :current_password, t("devise_views.users.registrations.edit.current_password_label") %>
|
||||
<span class="note"><%= t("devise_views.users.registrations.edit.need_current") %></span>
|
||||
<%= f.password_field :current_password, label: false, autocomplete: "off", placeholder: t("devise_views.users.registrations.edit.current_password_label") %>
|
||||
</div>
|
||||
|
||||
<div class="small-12 column">
|
||||
<%= f.submit t("devise_views.users.registrations.edit.update_submit"), class: "button radius" %>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
<div class="small-12 column">
|
||||
<%= f.submit t("devise_views.users.registrations.edit.update_submit"), class: "button radius" %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
@@ -54,10 +54,12 @@
|
||||
<div class="small-12">
|
||||
<%= f.label :terms_of_service do %>
|
||||
<%= f.check_box :terms_of_service, label: false %>
|
||||
<%= t("verification.residence.new.accept_terms_text",
|
||||
terms_url: link_to(t("verification.residence.new.terms"), "/census_terms",
|
||||
target: "_blank")).html_safe
|
||||
%>
|
||||
<span class="checkbox">
|
||||
<%= t("verification.residence.new.accept_terms_text",
|
||||
terms_url: link_to(t("verification.residence.new.terms"), "/census_terms",
|
||||
target: "_blank")).html_safe
|
||||
%>
|
||||
</span>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user