- <%= image_tag("icon_home_debate.svg") %> -

<%= t("welcome.debates.title") %>

+ <%= image_tag("icon_home_debate.svg", size: "168x168") %> +

<%= t("welcome.debates.title") %>

<%= t("welcome.debates.description") %>

- <%= image_tag("icon_home_proposal.svg") %> -

<%= t("welcome.proposal.title") %>

+ <%= image_tag("icon_home_proposal.svg", size: "168x168") %> +

<%= t("welcome.proposal.title") %>

<%= t("welcome.proposal.description") %>

- <%= image_tag("icon_home_decide.svg") %> -

<%= t("welcome.decide.title") %>

+ <%= image_tag("icon_home_decide.svg", size: "168x168") %> +

<%= t("welcome.decide.title") %>

<%= t("welcome.decide.description") %>

- <%= image_tag("icon_home_done.svg") %> -

<%= t("welcome.do.title") %>

+ <%= image_tag("icon_home_done.svg", size: "168x168") %> +

<%= t("welcome.do.title") %>

<%= t("welcome.do.description") %>

From 5c863d110753678973e7523d127a42e8ef7800b9 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Tue, 22 Sep 2015 21:14:52 +0200 Subject: [PATCH 4/7] Adds menu word on mobile version --- app/assets/stylesheets/participacion.scss | 4 ++++ app/views/layouts/_header.html.erb | 2 +- config/locales/en.yml | 1 + config/locales/es.yml | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss index edcad4875..51dc4f3e7 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/app/assets/stylesheets/participacion.scss @@ -524,6 +524,10 @@ header { &.menu-icon a { padding: 0 rem-calc(24); + + span::after { + right: 0; + } } } diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 62bb45674..1d1c091c7 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -13,7 +13,7 @@
-
-
- <% if notice %> -
- ">× - <%= notice %> -
- <% end %> +
+
+ <% if notice %> +
+ ">× + <%= notice %> +
+ <% end %> - <% if alert %> -
- ">× - <%= alert %> -
- <% end %> + <% if alert %> +
+ ">× + <%= alert %> +
+ <% end %> - <%= yield %> + <%= yield %> +
-
+ +
+ <%= render 'layouts/footer' %> +
\ No newline at end of file From dd7f4291040f4ea5011bde62580e9e46e0d10228 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 28 Sep 2015 13:38:28 +0200 Subject: [PATCH 7/7] Changes notes tag on forms --- app/views/debates/_form.html.erb | 2 +- app/views/organizations/registrations/new.html.erb | 2 +- app/views/proposals/_form.html.erb | 8 ++++---- app/views/simple_captcha/_simple_captcha.erb | 2 +- app/views/users/registrations/edit.html.erb | 4 ++-- app/views/users/registrations/new.html.erb | 2 +- doc/style-guide.html | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/views/debates/_form.html.erb b/app/views/debates/_form.html.erb index 379ea60c2..adf7c432d 100644 --- a/app/views/debates/_form.html.erb +++ b/app/views/debates/_form.html.erb @@ -14,7 +14,7 @@
<%= f.label :tag_list, t("debates.form.tags_label") %> - <%= t("debates.form.tags_instructions") %> +

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

<% @featured_tags.each do |tag| %> <%= tag.name %> diff --git a/app/views/organizations/registrations/new.html.erb b/app/views/organizations/registrations/new.html.erb index b9bc32f4a..5c3b1097d 100644 --- a/app/views/organizations/registrations/new.html.erb +++ b/app/views/organizations/registrations/new.html.erb @@ -8,7 +8,7 @@ <%= f.fields_for :organization do |fo| %> <%= fo.text_field :name, autofocus: true, maxlength: Organization.name_max_length, placeholder: t("devise_views.organizations.registrations.new.organization_name_label") %> <%= fo.label t("devise_views.organizations.registrations.new.responsible_name_label") %> - <%= t("devise_views.organizations.registrations.new.responsible_name_note") %> +

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

<%= fo.text_field :responsible_name, maxlength: Organization.responsible_name_max_length, label: false %> <% end %> diff --git a/app/views/proposals/_form.html.erb b/app/views/proposals/_form.html.erb index 1d98a05d6..40b0e5b52 100644 --- a/app/views/proposals/_form.html.erb +++ b/app/views/proposals/_form.html.erb @@ -17,7 +17,7 @@
<%= f.label :summary, t("proposals.form.proposal_summary") %> - <%= t("proposals.form.proposal_summary_note") %> +

<%= t("proposals.form.proposal_summary_note") %>

<%= f.text_area :summary, rows: 4, maxlength: 200, label: false, placeholder: t('proposals.form.proposal_summary') %>
@@ -30,7 +30,7 @@
<%= f.label :video_url, t("proposals.form.proposal_video_url") %> - <%= t("proposals.form.proposal_video_url_note") %> +

<%= t("proposals.form.proposal_video_url_note") %>

<%= f.text_field :video_url, placeholder: t("proposals.form.proposal_video_url"), label: false %>
@@ -41,7 +41,7 @@
<%= f.label :tag_list, t("proposals.form.tags_label") %> - <%= t("proposals.form.tags_instructions") %> +

<%= t("proposals.form.tags_instructions") %>

<% @featured_tags.each do |tag| %> <%= tag.name %> @@ -53,7 +53,7 @@ <% if current_user.unverified? %>
<%= f.label :responsible_name, t("proposals.form.proposal_responsible_name") %> - <%= t("proposals.form.proposal_responsible_name_note") %> +

<%= t("proposals.form.proposal_responsible_name_note") %>

<%= f.text_field :responsible_name, placeholder: t("proposals.form.proposal_responsible_name"), label: false %>
<% end %> diff --git a/app/views/simple_captcha/_simple_captcha.erb b/app/views/simple_captcha/_simple_captcha.erb index f97b9b5a6..5f57da6fc 100644 --- a/app/views/simple_captcha/_simple_captcha.erb +++ b/app/views/simple_captcha/_simple_captcha.erb @@ -2,7 +2,7 @@ <%= simple_captcha_options[:image] %> <%= simple_captcha_options[:refresh_button] %> - <%= simple_captcha_options[:label] %> +

<%= simple_captcha_options[:label] %>

<%= simple_captcha_options[:field] %>
diff --git a/app/views/users/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb index 55e462a21..1db32f63f 100644 --- a/app/views/users/registrations/edit.html.erb +++ b/app/views/users/registrations/edit.html.erb @@ -18,7 +18,7 @@
<%= f.label :password, t("devise_views.users.registrations.edit.password_label") %> - <%= t("devise_views.users.registrations.edit.leave_blank") %> +

<%= t("devise_views.users.registrations.edit.leave_blank") %>

<%= f.password_field :password, autocomplete: "off", label: false, placeholder: t("devise_views.users.registrations.edit.password_label") %>
@@ -29,7 +29,7 @@
<%= f.label :current_password, t("devise_views.users.registrations.edit.current_password_label") %> - <%= t("devise_views.users.registrations.edit.need_current") %> +

<%= t("devise_views.users.registrations.edit.need_current") %>

<%= f.password_field :current_password, label: false, autocomplete: "off", placeholder: t("devise_views.users.registrations.edit.current_password_label") %>
diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb index 19d4dc5d7..5d676e288 100644 --- a/app/views/users/registrations/new.html.erb +++ b/app/views/users/registrations/new.html.erb @@ -14,7 +14,7 @@
<%= f.label t("devise_views.users.registrations.new.username_label") %> - <%= t("devise_views.users.registrations.new.username_note") %> +

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

<%= f.text_field :username, maxlength: User.username_max_length, placeholder: t("devise_views.users.registrations.new.username_label"), label: false %> <%= f.email_field :email, placeholder: t("devise_views.users.registrations.new.email_label") %> diff --git a/doc/style-guide.html b/doc/style-guide.html index a1a99d374..d7e56940a 100644 --- a/doc/style-guide.html +++ b/doc/style-guide.html @@ -344,7 +344,7 @@ form input[type]:not([type=submit]) {
- Mensaje de información para rellenar el campo +

Mensaje de información para rellenar el campo