diff --git a/app/assets/images/icon_home_debate.png b/app/assets/images/icon_home_debate.png deleted file mode 100644 index 77fc23ff0..000000000 Binary files a/app/assets/images/icon_home_debate.png and /dev/null differ diff --git a/app/assets/images/icon_home_decide.png b/app/assets/images/icon_home_decide.png deleted file mode 100644 index 93f4c516a..000000000 Binary files a/app/assets/images/icon_home_decide.png and /dev/null differ diff --git a/app/assets/images/icon_home_do.png b/app/assets/images/icon_home_do.png deleted file mode 100644 index 3dc089706..000000000 Binary files a/app/assets/images/icon_home_do.png and /dev/null differ diff --git a/app/assets/images/icon_home_proposal.png b/app/assets/images/icon_home_proposal.png deleted file mode 100644 index bcf3c3825..000000000 Binary files a/app/assets/images/icon_home_proposal.png and /dev/null differ diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 71a7b9434..7f8379919 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -648,11 +648,12 @@ footer { } } -h2.sidebar-title { +.sidebar-title { border-top: 2px solid $brand; display: inline-block; font-size: rem-calc(16); - margin: -1px 0 rem-calc(12); + font-weight: bold; + margin: -1px 0 $line-height/2; padding-top: $line-height/4; text-transform: uppercase; } diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index ed6027618..c8d3e9b9c 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -48,49 +48,55 @@ diff --git a/app/views/shared/_top_links.html.erb b/app/views/shared/_top_links.html.erb index ae77cb1c2..88b7f7dfe 100644 --- a/app/views/shared/_top_links.html.erb +++ b/app/views/shared/_top_links.html.erb @@ -4,14 +4,14 @@ setting['transparency_url'].presence || t("layouts.header.external_link_transparency_url"), target: "_blank", rel: "nofollow", - title: t('shared.target_blank_html') %> + title: t("shared.go_to_page") + t("layouts.header.external_link_transparency") + t('shared.target_blank_html') %>
  • <%= link_to t("layouts.header.external_link_opendata"), setting['opendata_url'].presence || t("layouts.header.external_link_opendata_url"), target: "_blank", rel: "nofollow", - title: t('shared.target_blank_html') %> + title: t("shared.go_to_page") + t("layouts.header.external_link_opendata") + t('shared.target_blank_html') %>
  • <% if setting['blog_url'] %> @@ -20,7 +20,7 @@ setting['blog_url'], target: "_blank", rel: "nofollow", - title: t('shared.target_blank_html') %> + title: t("shared.go_to_page") + t("layouts.header.external_link_blog") + t('shared.target_blank_html') %> <% end %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index dc5686997..727ec67b7 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -25,24 +25,20 @@
    - <%= image_tag("icon_home_debate.png", size: "168x168", alt: "", title: t("welcome.debates.title")) %>

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

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

    - <%= image_tag("icon_home_proposal.png", size: "168x168", alt: "", title: t("welcome.proposal.title")) %>

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

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

    - <%= image_tag("icon_home_decide.png", size: "168x168", alt: "", title: t("welcome.decide.title")) %>

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

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

    - <%= image_tag("icon_home_do.png", size: "168x168", alt: "", title: t("welcome.do.title")) %>

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

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

    diff --git a/config/locales/en.yml b/config/locales/en.yml index 9e9c1ad36..fdfd821bd 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -527,14 +527,15 @@ en: proposals: Proposals budget: Participatory budget searcher: Searcher + go_to_page: "Go to page of " social: - blog: Blog - facebook: Facebook - twitter: Twitter - youtube: YouTube + blog: "%{org} Blog" + facebook: "%{org} Facebook" + twitter: "%{org} Twitter" + youtube: "%{org} YouTube" whatsapp: WhatsApp - telegram: Telegram - instagram: Instagram + telegram: "%{org} Telegram" + instagram: "%{org} Instagram" spending_proposals: form: association_name_label: 'If you propose in name of an assocation or collective add the name here' diff --git a/config/locales/es.yml b/config/locales/es.yml index efc2da5fe..ca5b33a4e 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -527,14 +527,15 @@ es: proposals: Propuestas budget: Presupuestos participativos searcher: Buscador + go_to_page: "Ir a la página de " social: - blog: Blog - facebook: Facebook - twitter: Twitter - youtube: YouTube + blog: "Blog de %{org}" + facebook: "Facebook de %{org}" + twitter: "Twitter de %{org}" + youtube: "YouTube de %{org}" whatsapp: WhatsApp - telegram: Telegram - instagram: Instagram + telegram: "Telegram de %{org}" + instagram: "Instagram de %{org}" spending_proposals: form: association_name_label: 'Si propones en nombre de una asociación o colectivo añade el nombre aquí' @@ -703,4 +704,4 @@ es: alt: "Selecciona el texto que quieres comentar y pulsa en el botón con el lápiz." invisible_captcha: sentence_for_humans: "Si eres humano, por favor ignora este campo" - timestamp_error_message: "Eso ha sido demasiado rápido. Por favor, reenvía el formulario." + timestamp_error_message: "Eso ha sido demasiado rápido. Por favor, reenvía el formulario." \ No newline at end of file