From 68591fa7d6c4e8944cdd0322d3bcacd17d00e301 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 1 Sep 2017 12:52:13 +0200 Subject: [PATCH] removes image and improves layout of welcome index page --- app/assets/images/icon_home.png | Bin 8999 -> 0 bytes app/views/welcome/index.html.erb | 53 +++++++++++++++++-------------- config/locales/en/general.yml | 3 +- config/locales/es/general.yml | 3 +- 4 files changed, 31 insertions(+), 28 deletions(-) delete mode 100644 app/assets/images/icon_home.png diff --git a/app/assets/images/icon_home.png b/app/assets/images/icon_home.png deleted file mode 100644 index 2284856ebd52e2bcb122f9f1b83dae2c5538b358..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8999 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 diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 727ec67b7..b8c361fed 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -2,45 +2,50 @@ <%= render "shared/canonical", href: root_url %> <% end %> -
+
-
+

<%= t("layouts.header.open_city_title") %>

-

- <%= t("layouts.header.open_city_slogan_html") %>  - <%= link_to t("layouts.header.more_info"), more_info_path %> +

+ <%= t("layouts.header.open_city_slogan_html") %>

-
- <%= link_to t("layouts.header.see_all"), proposals_path, class: "button see-more expanded" %> +
+ <%= link_to t("layouts.header.more_info"), more_info_path, class: "button expanded large" %>
- -
- <%= image_tag(image_path_for("icon_home.png"), size: "330x240", alt:"") %> -
<% cache [locale_and_user_status, @featured_debates, @featured_proposals, 'featured'] do %>
-
-
-

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

-

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

+
+
+

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

-
-

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

-

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

+
+

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

+
-
-

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

-

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

+
+
+

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

-
-

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

-

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

+
+

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

diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 4ca81fa39..24d72cfb8 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -220,11 +220,10 @@ en: no_notifications: "You don't have new notifications" open: open open_city_slogan_html: There are cities that are governed directly by their inhabitants, who discuss the topics they are concerned about, propose ideas to improve their lives and decide among themselves which ones will be carried out. - open_city_title: Love the city, and it will become a city you love. + open_city_title: Love the city, and it will become a city you love open_gov: Open government proposals: Proposals poll_questions: Voting - see_all: See proposals budgets: Participatory budgeting spending_proposals: Spending Proposals admin: diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index bc52a91d6..ee64c92dc 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -220,11 +220,10 @@ es: no_notifications: No tienes notificaciones nuevas open: abierto open_city_slogan_html: Existen ciudades gobernadas directamente por sus habitantes, que debaten sobre temas que les preocupan, proponen ideas para mejorar sus vidas y deciden entre todas y todos las que se llevan a cabo. - open_city_title: La ciudad que quieres será la ciudad que quieras. + open_city_title: La ciudad que quieres será la ciudad que quieras open_gov: Gobierno %{open} proposals: Propuestas poll_questions: Votaciones - see_all: Ver propuestas budgets: Presupuestos participativos spending_proposals: "Propuestas de inversión" admin: