diff --git a/app/assets/images/quote-after-blue.png b/app/assets/images/quote-after-blue.png new file mode 100644 index 000000000..f85ad04c4 Binary files /dev/null and b/app/assets/images/quote-after-blue.png differ diff --git a/app/assets/images/quote-before-blue.png b/app/assets/images/quote-before-blue.png new file mode 100644 index 000000000..4c97bc0f7 Binary files /dev/null and b/app/assets/images/quote-before-blue.png differ diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss index ce93979a7..c473d1ce9 100644 --- a/app/assets/stylesheets/dashboard.scss +++ b/app/assets/stylesheets/dashboard.scss @@ -531,8 +531,6 @@ .poster-footer { border-left: 2px solid $border; color: $text-medium; - margin: 0 auto; - padding-left: rem-calc(40); } } } @@ -599,6 +597,11 @@ .poster-content { + img { + max-width: rem-calc(40); + vertical-align: top; + } + h2 { font-size: rem-calc(28); margin: $line-height 0; @@ -617,8 +620,9 @@ .poster-footer { font-size: rem-calc(19); - width: 50%; margin-top: rem-calc(50); + padding-left: rem-calc(40); + width: 50%; } } @@ -629,14 +633,14 @@ .dashboard-poster-pdf { .poster-header { - padding: 5cm; - height: 60cm; font-weight: normal; + height: 60cm; + padding: 5cm; h1 { font-size: 6cm; - line-height: rem-calc(250); font-weight: bold; + line-height: rem-calc(250); img { max-width: rem-calc(150); @@ -644,10 +648,9 @@ } p { + color: #fff; font-size: rem-calc(80); line-height: rem-calc(100); - color: #fff; - &.intro { margin: rem-calc(160) auto; @@ -683,14 +686,10 @@ } .poster-content { - - .quote { - .curly-quotes::before, - .curly-quotes::after { - font-size: rem-calc(200); - height: rem-calc(18); - line-height: rem-calc(150); - } + img { + height: 3cm; + vertical-align: top; + width: 3cm; } h2 { @@ -700,20 +699,17 @@ h3 { font-size: 4.7cm; + line-height: 5.5cm; margin-top: $line-height; max-width: 80%; - line-height: 5cm; - } - - img { - width: 5cm; - height: 5cm; } } .poster-footer { - margin-top: 3cm; - max-width: 60%; - width: 100%; + display: block; + margin-left: 15cm; + margin-top: 2cm; + max-width: 55%; + padding-left: 4cm; } } diff --git a/app/views/dashboard/poster/index.html.erb b/app/views/dashboard/poster/index.html.erb index 2dd9f699e..d0589b2e0 100644 --- a/app/views/dashboard/poster/index.html.erb +++ b/app/views/dashboard/poster/index.html.erb @@ -9,7 +9,8 @@ <%= image_tag("finger.png") %> <%= t("dashboard.poster.index.poster_subtitle") %> -

<%= t("dashboard.poster.index.intro_text").html_safe %>

+

<%= t("dashboard.poster.index.intro_text", org: Setting["org_name"]).html_safe %>

+

<%= t("dashboard.poster.index.proposal_code", code: proposal.code) %>

@@ -22,8 +23,12 @@

<%= t("dashboard.poster.index.support") %>

-

"<%= proposal.title %>"

-

<%= t("dashboard.poster.index.footer").html_safe %>

+ <%= image_tag 'quote-before-blue.png' %> +

<%= proposal.title %>

+ <%= image_tag 'quote-after-blue.png' %> +

+ <%= t("dashboard.poster.index.footer", link: Setting["url"]).html_safe %> +

diff --git a/app/views/dashboard/poster/index.pdf.erb b/app/views/dashboard/poster/index.pdf.erb index 041f397cb..979a31eee 100644 --- a/app/views/dashboard/poster/index.pdf.erb +++ b/app/views/dashboard/poster/index.pdf.erb @@ -9,13 +9,14 @@

- <%= t("dashboard.poster.index.poster_title") %> + <%= t("dashboard.poster.index.poster_title") %>
<%= wicked_pdf_image_tag("finger.png") %> <%= t("dashboard.poster.index.poster_subtitle") %> +

- <%= t("dashboard.poster.index.intro_text").html_safe %> + <%= t("dashboard.poster.index.intro_text", org: Setting["org_name"]).html_safe %>

<%= t("dashboard.poster.index.proposal_code", code: proposal.code) %> @@ -28,11 +29,13 @@ <% end %>

-

<%= t("dashboard.poster.index.support") %>

-
-

"<%= proposal.title %>"

-
-

<%= t("dashboard.poster.index.footer").html_safe %>

+

<%= t("dashboard.poster.index.support") %>

+ <%= wicked_pdf_image_tag 'quote-before-blue.png' %> +

<%= proposal.title %>

+ <%= wicked_pdf_image_tag 'quote-after-blue.png' %> +

+ <%= t("dashboard.poster.index.footer", link: Setting["url"]).html_safe %> +

diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index e03133062..b1d00f0f3 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -566,11 +566,11 @@ en: poster_title: "Do not keep looking," poster_subtitle: "back me up! ;)" intro_text: - I am participating in Decide Madrid with my own citizen proposal and only if you also add you can I achieve the + I am participating in %{org} with my own citizen proposal and only if you also add you can I achieve the necessary support to make Madrid the city we all want. proposal_code: "Code of the proposal: %{code}" support: Support my proposal - footer: Visit decide.madrid.es and support this proposal. We need to be many. Decide your too. Thank you! + footer: Visit %{link} and support this proposal. We need to be many. Decide your too. Thank you! new: title: Poster feature options: diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 53b7ab1c1..7ae3622a9 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -566,11 +566,11 @@ es: poster_title: "No te quedes mirando," poster_subtitle: "¡apóyame! ;)" intro_text: - Estoy participando en Decide Madrid con mi propia propuesta ciudadana y sólo si tú también te sumas podré lograr el + Estoy participando en %{org} con mi propia propuesta ciudadana y sólo si tú también te sumas podré lograr el apoyo necesario para hacer de madrid la ciudad que todos queremos. proposal_code: "Código de la propuesta: %{code}" support: Apoya mi propuesta - footer: Entra en decide.madrid.es y apoya esta propuesta. Necesitamos ser muchos. Decide tu también. ¡Gracias! + footer: Entra en %{link} y apoya esta propuesta. Necesitamos ser muchos. Decide tu también. ¡Gracias! new: title: Funcionalidad de póster options: