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

Merge pull request #406 from AyuntamientoMadrid/improves_styles

Browse Source 
Improves styles
This commit is contained in:
Raimond Garcia
2015-09-07 16:57:20 +02:00
parent 1c0622adf9 0bda3fefad
commit b3b4b79f41
13 changed files with 101 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/assets/stylesheets/debates.scss
View File

@@ -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);

15
app/assets/stylesheets/participacion.scss
View File

@@ -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
app/views/account/show.html.erb
View File

@@ -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">

10
app/views/debates/_form.html.erb
View File

@@ -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>

5
app/views/debates/show.html.erb
View File

@@ -13,6 +13,11 @@
<% end %>
<h1><%= @debate.title %></h1>
<!-- SI HAY 1 DENUNCIA POR CADA 5 VOTOS POSITIVOS MUESTRA ESTE MENSAJE -->
<div class="alert-box alert radius margin-top">
<strong><%= t("debates.show.flag") %></strong>
</div>
<!-- /. SI HAY 1 DENUNCIA POR CADA 5 VOTOS POSITIVOS MUESTRA ESTE MENSAJE -->
<div class="debate-info">
<%= avatar_image(@debate.author, seed: @debate.author_id, size: 32, class: 'author-photo') %>

12
app/views/layouts/_footer.html.erb
View File

@@ -21,17 +21,23 @@
<div class="footer-sections small-12 medium-8 column">
<div class="small-12 medium-4 column">
<h4><%= t("layouts.footer.participation_title") %></h4>
<h4>
<%= link_to t("layouts.footer.participation_title"), root_path %>
</h4>
<p><%= t("layouts.footer.participation_text") %></p>
</div>
<div class="small-12 medium-4 column">
<h4><%= t("layouts.footer.transparency_title") %></h4>
<h4>
<%= link_to t("layouts.footer.transparency_title"), "/transparency" %>
</h4>
<p><%= t("layouts.footer.transparency_text") %></p>
</div>
<div class="small-12 medium-4 column">
<h4><%= t("layouts.footer.open_data_title") %></h4>
<h4>
<%= link_to t("layouts.footer.open_data_title"), "/opendata" %>
</h4>
<p><%= t("layouts.footer.open_data_text") %></p>
</div>
</div>

16
app/views/layouts/application.html.erb
View File

@@ -16,21 +16,25 @@
<%= render 'layouts/header' %>
<% if notice %>
<div data-alert class="alert-box success alert-layout">
<a href="#" class="close">&times;</a>
<div class="row">
<div class="alert-messages">
<div class="row">
<div data-alert class="alert-box success radius">
<a href="#" class="close">&times;</a>
<%= notice %>
</div>
</div>
</div>
<% end %>
<% if alert %>
<div data-alert class="alert-box alert alert-layout">
<a href="#" class="close">&times;</a>
<div class="row">
<div class="alert-messages">
<div class="row">
<div data-alert class="alert-box alert radius">
<a href="#" class="close">&times;</a>
<%= alert %>
</div>
</div>
</div>
<% end %>
<%= yield %>

69
app/views/users/registrations/edit.html.erb
View File

@@ -1,45 +1,40 @@
<div class="row">
<div class="account small-12 medium-9 column small-centered">
<i class="icon-angle-left left"></i>&nbsp;<%= link_to t("devise_views.users.registrations.edit.back_link"), :back, class: "left back" %>
<i class="icon-angle-left left"></i>&nbsp;<%= 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 %>

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

@@ -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>

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

@@ -14,7 +14,7 @@ en:
debate_topics: Debate topics
hidden_debates: Hidden debates
hidden_comments: Hidden comments
hidden_users: Hidden users
hidden_users: Blocked users
organizations: Organizations
officials: Officials
moderators: Moderators

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

@@ -14,7 +14,7 @@ es:
debate_topics: Temas de debate
hidden_debates: Debates ocultos
hidden_comments: Comentarios ocultos
hidden_users: Usuarios ocultos
hidden_users: Usuarios bloqueados
organizations: Organizaciones
officials: Cargos públicos
moderators: Moderadores

8
config/locales/en.yml
View File

@@ -34,7 +34,7 @@ en:
footer:
description:
"The city you want, it will be the city you want. %{more_info} here on this page.
This Open Government Portal is %{open_source}, and code is in %{github}.
This Open Government Portal use Consul v.0.9 application, is %{open_source}, and code is in %{github}.
Madrid, for the whole world."
more_info: Get more information
more_info_url: "/more_information"
@@ -111,9 +111,8 @@ en:
debate_text: Initial text for debate
tags_label: Topics
tags_instructions: >
Tag this debate. You can choose among our proposals on the list or add any other topic you want by
writing them separated by ",".
Some suggestions:
Tag this debate. You can choose among our proposals on the list or add any other topic you want.
tags_placeholder: "Add topics writing them separated by ','"
show:
back_link: Back
author_deleted: Deleted user
@@ -125,6 +124,7 @@ en:
login_to_comment: "You need to %{signin} or %{signup} to comment."
edit_debate_link: Edit
share: Share
flag: "This debate has been flag as innapropiate for some users."
edit:
editing: Edit debate
show_link: Show debate

6
config/locales/es.yml
View File

@@ -34,7 +34,7 @@ es:
footer:
description:
"La ciudad que quieres, será la ciudad que quieras. %{more_info} sobre esta página.
Este Portal de Gobierno Abierto es %{open_source}, y su código se encuentra en %{github}.
Este Portal de Gobierno Abierto usa la aplicación Consul v.0.9 que es %{open_source}, y su código se encuentra en %{github}.
De Madrid, para el mundo entero."
more_info: Obtén más información
more_info_url: "/more_information"
@@ -112,8 +112,7 @@ es:
tags_label: Temas
tags_instructions: >
Etiqueta este debate. Puedes elegir entre nuestras propuestas o introducir las que desees.
Para ello solo tienes que escribir las etiquetas que desees separadas por ",".
Algunas recomendaciones:
tags_placeholder: "Escribe las etiquetas que desees separadas por ','"
show:
back_link: Volver
author_deleted: Usuario eliminado
@@ -125,6 +124,7 @@ es:
login_to_comment: "Necesitas %{signin} o %{signup} para comentar."
edit_debate_link: Editar
share: Compartir
flag: "Este debate ha sido marcado como inapropiado por varios usuarios."
edit:
editing: Editar debate
show_link: Ver debate