consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #998 from consul/design-fixes

Browse Source 
Design fixes
This commit is contained in:
Juanjo Bazán
2016-03-19 10:33:03 +01:00
parent dd3000d3f7 1775ccb4da
commit bf1851bfc5
4 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/stylesheets/layout.scss
View File

@@ -421,10 +421,6 @@ header {
}
}
span {
color: $border;
}
.input-group {
padding-top: $line-height/4;
@@ -879,7 +875,7 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar {
}
.user-deleted {
top: -9px;
top: -4px;
}
.user-permissions {
@@ -1388,7 +1384,7 @@ table {
}
}
.date {
.date-of-birth {
select {
float: left;
@@ -1550,6 +1546,7 @@ table {
.comment {
margin: $line-height/4 0;
position: relative;
p {
margin-bottom: 0;
@@ -1727,6 +1724,7 @@ table {
td {
padding-left: $line-height*1.5;
position: relative;
word-break: break-all;
&:before {
color: $brand;

28
app/views/verification/residence/new.html.erb
View File

@@ -40,18 +40,32 @@
<div class="row">
<div class="small-12 medium-8">
<div class="small-12 medium-4 column">
<div class="small-12 medium-3 column">
<%= f.label t("verification.residence.new.document_type_label") %>
<%= f.select :document_type, document_types, prompt: "", label: false %>
</div>
<div class="small-12 medium-5 column end">
<%= f.label t("verification.residence.new.document_number") %>
<div class="inline-block">
<%= f.label t("verification.residence.new.document_number") %>
</div>
<div class="inline-block" data-toggle="info-document-number">
<span class="icon-help"></span>
<span class="sr-only"><%= t("verification.residence.new.document_number_help_title") %></span>
</div>
<div class="dropdown-pane" id="info-document-number" data-dropdown
data-hover="true" data-hover-pane="true">
<%= t("verification.residence.new.document_number_help_text_html") %>
</div>
<%= f.text_field :document_number, label: false %>
</div>
</div>
</div>
<div class="date small-12 medium-6 clear">
<div class="date-of-birth small-12 medium-6 clear">
<%= f.label t("verification.residence.new.date_of_birth") %>
<%= f.date_select :date_of_birth,
prompt: true,
@@ -62,7 +76,9 @@
<div class="small-12 medium-5 clear">
<%= f.label t("verification.residence.new.postal_code") %>
<p class="note"><%= t("verification.residence.new.postal_code_note") %></p>
<%= f.text_field :postal_code, label: false %>
<div class="medium-6">
<%= f.text_field :postal_code, label: false %>
</div>
</div>
<div class="small-12">
@@ -78,8 +94,8 @@
<% end %>
</div>
<div class="small-12 clear">
<%= f.submit t("verification.residence.new.verify_residence"), class: "button success" %>
<div class="small-12 medium-3 clear">
<%= f.submit t("verification.residence.new.verify_residence"), class: "button success expanded" %>
</div>
<% end %>
</div>

2
config/locales/verification.en.yml
View File

@@ -54,6 +54,8 @@ en:
accept_terms_text_title: I accept the terms and conditions of access of the Census
date_of_birth: Date of birth
document_number: Document number
document_number_help_title: Help
document_number_help_text_html: '<strong>DNI</strong>: 12345678A<br> <strong>Passport</strong>: AAA000001<br> <strong>Residence card</strong>: X1234567P'
document_type:
passport: Passport
residence_card: Residence card

2
config/locales/verification.es.yml
View File

@@ -54,6 +54,8 @@ es:
accept_terms_text_title: Acepto los términos de acceso al Padrón
date_of_birth: Fecha de nacimiento
document_number: Número de documento
document_number_help_title: Ayuda
document_number_help_text_html: '<strong>DNI</strong>: 12345678A<br> <strong>Pasaporte</strong>: AAA000001<br> <strong>Tarjeta de residencia</strong>: X1234567P'
document_type:
passport: Pasaporte
residence_card: Tarjeta de residencia