From 667039b12710ffc7ecf99b4f7674d870efcd81ea Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Sat, 5 Jan 2019 17:21:40 +0100 Subject: [PATCH 01/15] Style Preview Pdf - Customized the preview as shown by email - Added two svg for quote icons. (Need convert to font) - Ceate two class for quote icons. - Added tag strong into yml for text decoration - Customize css --- app/assets/fonts/quote-after.svg | 18 +++++ app/assets/fonts/quote-before.svg | 16 ++++ app/assets/stylesheets/dashboard.scss | 93 +++++++++++++++-------- app/assets/stylesheets/icons.scss | 22 ++++++ app/views/dashboard/poster/index.html.erb | 32 ++++---- app/views/dashboard/poster/index.pdf.erb | 17 +++-- config/locales/en/general.yml | 2 +- config/locales/es/general.yml | 6 +- 8 files changed, 146 insertions(+), 60 deletions(-) create mode 100644 app/assets/fonts/quote-after.svg create mode 100644 app/assets/fonts/quote-before.svg diff --git a/app/assets/fonts/quote-after.svg b/app/assets/fonts/quote-after.svg new file mode 100644 index 000000000..ae9cce890 --- /dev/null +++ b/app/assets/fonts/quote-after.svg @@ -0,0 +1,18 @@ + + + + + + + + + diff --git a/app/assets/fonts/quote-before.svg b/app/assets/fonts/quote-before.svg new file mode 100644 index 000000000..f8e9b71da --- /dev/null +++ b/app/assets/fonts/quote-before.svg @@ -0,0 +1,16 @@ + + + + + + + diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss index 53303f387..2cab2b84e 100644 --- a/app/assets/stylesheets/dashboard.scss +++ b/app/assets/stylesheets/dashboard.scss @@ -446,18 +446,22 @@ .dashboard-poster-preview { .poster-header { - background: $brand; + //background: $brand; + background: #0300ff; color: #fff; - padding: $line-height * 2 $line-height $line-height * 6; + padding: $line-height * 2 $line-height $line-height * 2; + height: rem-calc(600); h1 { color: #fff; - font-size: rem-calc(80); + font-size: rem-calc(60); line-height: rem-calc(80); } p { - font-size: rem-calc(24); + font-size: rem-calc(18); + max-width: 60%; + margin: 0 auto; } .intro { @@ -469,66 +473,86 @@ .proposal-image { margin: 0 auto; - max-width: 80%; + max-width: 90%; position: relative; &::before { background: #ff9e00; content: ''; height: rem-calc(120); - left: -36px; + left: -30px; position: absolute; - top: -180px; + top: -20px; width: rem-calc(120); } img { box-shadow: 0 30px 60px rgba(0, 0, 0, 0.25); - margin-top: rem-calc(-144); + //margin-top: rem-calc(-144); + margin-top: rem-calc(10); position: relative; width: 100%; } + + h2 { + // color: $text-medium; + margin: $line-height 0; + // margin-left: 10%; + // text-align: left; + } } - h2 { - color: $text-medium; - margin: $line-height 0; - margin-left: 10%; - text-align: left; - } + .poster-content { + margin-top: rem-calc(260); - h3 { - color: $brand; - font-size: rem-calc(50); - margin-bottom: $line-height * 2; + h2 { + font-size: rem-calc(28); + color: $text-medium; + margin: $line-height 0; + margin-left: 10%; + text-align: left; + } + + h3 { + //color: $brand; + color: #0300ff; + font-size: rem-calc(50); + margin-bottom: $line-height * 2; + margin-top: $line-height * 2; + max-width: 80%; + display: inline; + } .title-quote { display: inline-block; - top: rem-calc(-12); - vertical-align: baseline; + font-size: rem-calc(50); } } .poster-footer { border-left: 2px solid $border; - font-size: rem-calc(20); + font-size: rem-calc(19); margin: 0 auto; padding-left: $line-height / 2; width: 50%; + margin-top: rem-calc(50); } } // 11. Poster PDF // -------------- -.dashboard-poster-pdf { +@page { margin: 0; } +.dashboard-poster-pdf { .poster-header { background: $brand; color: #fff; - padding: rem-calc(320) rem-calc(160) rem-calc(640); + padding: $line-height * 2 $line-height $line-height * 2; + //padding: rem-calc(320) rem-calc(160) rem-calc(160); text-align: center; + h1 { color: #fff; font-size: rem-calc(250); @@ -552,7 +576,6 @@ margin: 0 auto; max-width: rem-calc(2000); position: relative; - &::before { background: #ff9e00; content: ''; @@ -565,26 +588,34 @@ img { box-shadow: 0 30px 60px rgba(0, 0, 0, 0.25); - margin-top: rem-calc(-600); + margin-top: rem-calc(50); position: relative; width: 100%; } + + h2 { + // color: $text-medium; + font-size: rem-calc(80); + margin-top: rem-calc(80); + } } .poster-content { margin: 0 auto; max-width: rem-calc(2000); + + h2{ + max-width: 60%; + text-align:left; + margin-top: rem-calc(100); + } } - h2 { - color: $text-medium; - font-size: rem-calc(80); - margin-top: rem-calc(80); - } + h3 { color: $brand; - font-size: rem-calc(200); + font-size: rem-calc(170); line-height: rem-calc(240); margin: rem-calc(80) 0; position: relative; diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss index 3d97084f4..bee2e2312 100644 --- a/app/assets/stylesheets/icons.scss +++ b/app/assets/stylesheets/icons.scss @@ -292,3 +292,25 @@ .icon-bars::before { content: '\22'; } + +.icon-quote-before::before { + content: ''; + background-size: cover; + display: block; + width: 60px; + height: 60px; + background-image: url(quote-before.svg); + fill:red; + background-repeat: no-repeat; +} + +.icon-quote-after::before { + content: ''; + background-size: cover; + display: block; + width: 60px; + height: 60px; + background-image: url(quote-after.svg); + fill:red; + background-repeat: no-repeat; +} diff --git a/app/views/dashboard/poster/index.html.erb b/app/views/dashboard/poster/index.html.erb index 6e8e0584c..68f5e9aff 100644 --- a/app/views/dashboard/poster/index.html.erb +++ b/app/views/dashboard/poster/index.html.erb @@ -5,31 +5,29 @@

<%= t("dashboard.poster.index.poster_title") %>
+ <%= t("dashboard.poster.index.poster_subtitle") %>

-

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

+

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

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

+ +
+ <% if proposal.image.present? %> + <%= image_tag proposal.image.attachment.url(:large) %> + <% else %> + <%= image_tag "default_mailing.jpg" %> + <% end %> +
-
- <% if proposal.image.present? %> - <%= image_tag proposal.image.attachment.url(:large) %> - <% else %> - <%= image_tag "default_mailing.jpg" %> - <% end %> -
- -
+

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

-

- " - <%= proposal.title %> - " -

- -

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

+ +

<%= proposal.title %>

+ +

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

diff --git a/app/views/dashboard/poster/index.pdf.erb b/app/views/dashboard/poster/index.pdf.erb index 58d70bfec..511941e9f 100644 --- a/app/views/dashboard/poster/index.pdf.erb +++ b/app/views/dashboard/poster/index.pdf.erb @@ -17,18 +17,19 @@

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

+ +
+ <% if proposal.image.present? %> + <%= wicked_pdf_image_tag proposal.image.attachment.url(:large) %> + <% else %> + <%= wicked_pdf_image_tag "default_mailing.jpg" %> + <% end %> +

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

+
-
- <% if proposal.image.present? %> - <%= wicked_pdf_image_tag proposal.image.attachment.url(:large) %> - <% else %> - <%= wicked_pdf_image_tag "default_mailing.jpg" %> - <% end %> -
-

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

" <%= proposal.title %> diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 29d9a86ec..b54a1cb93 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -566,7 +566,7 @@ 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 Decide Madrid 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 diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 46422fd8c..8556c9284 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -563,14 +563,14 @@ es: poster: index: title: Previsualización del poster - poster_title: "No te quedes mirando" + 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 Decide Madrid 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 decide.madrid.es y apoya esta propuesta. Necesitamos ser muchos. Decide tu también. ¡Gracias! new: title: Funcionalidad de póster options: From 981e718a480cbcc9de1f9fa320b005c901d184c2 Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Sat, 5 Jan 2019 19:31:23 +0100 Subject: [PATCH 02/15] Style Generate Pdf - Change some style - Fixing the bug to the svg that was not rendered - Change some rem to cm - The Lato font does not render well while Open Sans is correct. Strong and normal weight. --- app/assets/stylesheets/dashboard.scss | 102 +++++++++++++++++------ app/views/dashboard/poster/index.pdf.erb | 15 ++-- 2 files changed, 85 insertions(+), 32 deletions(-) diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss index 2cab2b84e..205f093a2 100644 --- a/app/assets/stylesheets/dashboard.scss +++ b/app/assets/stylesheets/dashboard.scss @@ -542,20 +542,18 @@ // 11. Poster PDF // -------------- -@page { margin: 0; } - .dashboard-poster-pdf { - .poster-header { - background: $brand; - color: #fff; - padding: $line-height * 2 $line-height $line-height * 2; - //padding: rem-calc(320) rem-calc(160) rem-calc(160); - text-align: center; + .poster-header { + background: #0300ff; + color: #fff; + padding: 5cm; + text-align: center; + height: 60cm; h1 { color: #fff; - font-size: rem-calc(250); + font-size: 6cm; line-height: rem-calc(250); text-align: left; } @@ -563,56 +561,108 @@ p { font-size: rem-calc(80); line-height: rem-calc(80); + font-family: 'Open Sans'; //With Lato not work + font-style: normal; + font-weight: 400; + color: #fff; &.intro { margin: rem-calc(160) auto; - max-width: 60%; + max-width: 80%; text-align: justify; } + + &.proposal_code{ + font-size: 1.7cm; + } } } .proposal-image { margin: 0 auto; - max-width: rem-calc(2000); + max-width: 90%; position: relative; + &::before { background: #ff9e00; content: ''; - height: rem-calc(400); - left: -120px; + height: rem-calc(420); + left: rem-calc(-130px); position: absolute; - top: -720px; - width: rem-calc(400); + top: rem-calc(-130px); + width: rem-calc(420); } img { box-shadow: 0 30px 60px rgba(0, 0, 0, 0.25); - margin-top: rem-calc(50); + //margin-top: rem-calc(-144); + margin-top: rem-calc(10); position: relative; width: 100%; } h2 { // color: $text-medium; - font-size: rem-calc(80); - margin-top: rem-calc(80); + margin: $line-height 0; + // margin-left: 10%; + // text-align: left; } } + // .proposal-image { + // margin: 0 auto; + // max-width: rem-calc(2000); + // position: relative; + // &::before { + // background: #ff9e00; + // content: ''; + // height: rem-calc(400); + // left: -120px; + // position: absolute; + // top: -720px; + // width: rem-calc(400); + // } + // + // img { + // box-shadow: 0 30px 60px rgba(0, 0, 0, 0.25); + // margin-top: rem-calc(50); + // position: relative; + // width: 100%; + // } + // + // h2 { + // // color: $text-medium; + // font-size: rem-calc(80); + // margin-top: rem-calc(80); + // } + // } + .poster-content { - margin: 0 auto; - max-width: rem-calc(2000); + margin-top: 20cm; - h2{ - max-width: 60%; - text-align:left; - margin-top: rem-calc(100); + h2 { + font-size: rem-calc(28); + color: $text-medium; + margin: $line-height 0; + margin-left: 10%; + text-align: left; + } + + h3 { + color: #0300ff; + font-size: 4.7cm; + margin-bottom: $line-height * 2; + margin-top: $line-height * 2; + max-width: 80%; + display: inline;margin: 0 auto; + } + + img{ + width:5cm; + height:5cm; } } - - h3 { color: $brand; font-size: rem-calc(170); diff --git a/app/views/dashboard/poster/index.pdf.erb b/app/views/dashboard/poster/index.pdf.erb index 511941e9f..30a56ec76 100644 --- a/app/views/dashboard/poster/index.pdf.erb +++ b/app/views/dashboard/poster/index.pdf.erb @@ -12,9 +12,13 @@ <%= t("dashboard.poster.index.poster_title") %>
<%= t("dashboard.poster.index.poster_subtitle") %> +

-

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

-

+ +

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

+

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

@@ -28,15 +32,14 @@
-

- " + <%= wicked_pdf_image_tag 'quote-before.svg' %> <%= proposal.title %> - " + <%= wicked_pdf_image_tag 'quote-after.svg' %>

-

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

+

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

From 1d910c0073ecf07179b41bb4be806121bd978240 Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Mon, 7 Jan 2019 16:28:09 +0100 Subject: [PATCH 03/15] Style PDF - Added icon finger - Chnage color quote - Add class icon-finger - Add some style - Remove Open Sans - Arranged the content in the A4 - Remove some style css --- app/assets/fonts/finger.svg | 17 +++ app/assets/fonts/quote-after.svg | 2 +- app/assets/fonts/quote-before.svg | 10 +- app/assets/stylesheets/dashboard.scss | 167 ++++++++++------------ app/assets/stylesheets/icons.scss | 13 +- app/views/dashboard/poster/index.html.erb | 51 +++---- app/views/dashboard/poster/index.pdf.erb | 7 +- 7 files changed, 138 insertions(+), 129 deletions(-) create mode 100644 app/assets/fonts/finger.svg diff --git a/app/assets/fonts/finger.svg b/app/assets/fonts/finger.svg new file mode 100644 index 000000000..c2e3eea1a --- /dev/null +++ b/app/assets/fonts/finger.svg @@ -0,0 +1,17 @@ + + + + diff --git a/app/assets/fonts/quote-after.svg b/app/assets/fonts/quote-after.svg index ae9cce890..748305640 100644 --- a/app/assets/fonts/quote-after.svg +++ b/app/assets/fonts/quote-after.svg @@ -3,7 +3,7 @@ - + - - diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss index 205f093a2..2b7c6e0ac 100644 --- a/app/assets/stylesheets/dashboard.scss +++ b/app/assets/stylesheets/dashboard.scss @@ -443,19 +443,70 @@ // 10. Poster preview // ------------------ -.dashboard-poster-preview { - +.dashboard-poster-preview, +.dashboard-poster-pdf { .poster-header { - //background: $brand; background: #0300ff; color: #fff; + h1 { + color: #fff; + text-align: left; + } + } + + .proposal-image { + margin: 0 auto; + position: relative; + + &::before { + background: #ff9e00; + content: ''; + position: absolute; + } + } + + .poster-content { + + margin: 0 auto; + + h2 { + color: $text-medium; + text-align: left; + } + + h3 { + color: #0300ff; + display: inline; + } + + .title-quote { + display: inline-block; + } + } + + .poster-footer { + color: $text-medium; + border-left: 2px solid $border; + } +} + + +.dashboard-poster-preview { + .preview-min-width { + min-width: 661px; + } + + .poster-header { padding: $line-height * 2 $line-height $line-height * 2; height: rem-calc(600); h1 { - color: #fff; font-size: rem-calc(60); line-height: rem-calc(80); + + .icon-finger::before{ + font-size: rem-calc(60); + } } p { @@ -477,50 +528,38 @@ position: relative; &::before { - background: #ff9e00; - content: ''; height: rem-calc(120); left: -30px; - position: absolute; top: -20px; width: rem-calc(120); } img { box-shadow: 0 30px 60px rgba(0, 0, 0, 0.25); - //margin-top: rem-calc(-144); margin-top: rem-calc(10); position: relative; width: 100%; } h2 { - // color: $text-medium; margin: $line-height 0; - // margin-left: 10%; - // text-align: left; } } .poster-content { + + max-width: 84%; + margin: 0 auto; margin-top: rem-calc(260); h2 { font-size: rem-calc(28); - color: $text-medium; margin: $line-height 0; - margin-left: 10%; - text-align: left; } h3 { - //color: $brand; - color: #0300ff; - font-size: rem-calc(50); + font-size: rem-calc(45); margin-bottom: $line-height * 2; - margin-top: $line-height * 2; - max-width: 80%; - display: inline; } .title-quote { @@ -530,7 +569,6 @@ } .poster-footer { - border-left: 2px solid $border; font-size: rem-calc(19); margin: 0 auto; padding-left: $line-height / 2; @@ -542,28 +580,26 @@ // 11. Poster PDF // -------------- + .dashboard-poster-pdf { .poster-header { - background: #0300ff; - color: #fff; padding: 5cm; - text-align: center; height: 60cm; h1 { - color: #fff; font-size: 6cm; line-height: rem-calc(250); - text-align: left; + + img{ + width: 4cm; + height: 2.5cm; + } } p { font-size: rem-calc(80); line-height: rem-calc(80); - font-family: 'Open Sans'; //With Lato not work - font-style: normal; - font-weight: 400; color: #fff; &.intro { @@ -573,7 +609,7 @@ } &.proposal_code{ - font-size: 1.7cm; + font-size: 1.7cm; } } } @@ -584,77 +620,38 @@ position: relative; &::before { - background: #ff9e00; - content: ''; height: rem-calc(420); - left: rem-calc(-130px); - position: absolute; - top: rem-calc(-130px); + left: rem-calc(-130); + top: rem-calc(-130); width: rem-calc(420); } img { - box-shadow: 0 30px 60px rgba(0, 0, 0, 0.25); - //margin-top: rem-calc(-144); margin-top: rem-calc(10); position: relative; width: 100%; } h2 { - // color: $text-medium; margin: $line-height 0; - // margin-left: 10%; - // text-align: left; } } - // .proposal-image { - // margin: 0 auto; - // max-width: rem-calc(2000); - // position: relative; - // &::before { - // background: #ff9e00; - // content: ''; - // height: rem-calc(400); - // left: -120px; - // position: absolute; - // top: -720px; - // width: rem-calc(400); - // } - // - // img { - // box-shadow: 0 30px 60px rgba(0, 0, 0, 0.25); - // margin-top: rem-calc(50); - // position: relative; - // width: 100%; - // } - // - // h2 { - // // color: $text-medium; - // font-size: rem-calc(80); - // margin-top: rem-calc(80); - // } - // } - .poster-content { + + max-width: 80%; + margin: 0 auto; margin-top: 20cm; h2 { - font-size: rem-calc(28); - color: $text-medium; + font-size: 3cm; margin: $line-height 0; - margin-left: 10%; - text-align: left; } h3 { - color: #0300ff; font-size: 4.7cm; - margin-bottom: $line-height * 2; - margin-top: $line-height * 2; + margin-top: $line-height; max-width: 80%; - display: inline;margin: 0 auto; } img{ @@ -663,27 +660,11 @@ } } - h3 { - color: $brand; - font-size: rem-calc(170); - line-height: rem-calc(240); - margin: rem-calc(80) 0; - position: relative; - width: 90%; - - .title-quote { - display: inline-block; - top: rem-calc(-40); - vertical-align: baseline; - } - } - .poster-footer { - border-left: 10px solid $border; - color: $text-medium; font-size: rem-calc(60); line-height: rem-calc(60); margin: 0 auto; + margin-top: 2cm; max-width: 60%; padding-left: rem-calc(40); width: 100%; diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss index bee2e2312..5256b236e 100644 --- a/app/assets/stylesheets/icons.scss +++ b/app/assets/stylesheets/icons.scss @@ -300,7 +300,6 @@ width: 60px; height: 60px; background-image: url(quote-before.svg); - fill:red; background-repeat: no-repeat; } @@ -311,6 +310,16 @@ width: 60px; height: 60px; background-image: url(quote-after.svg); - fill:red; + background-repeat: no-repeat; +} + + +.icon-finger::before { + content: ''; + background-size: cover; + display: inline-block; + width: 50px; + height: 50px; + background-image: url(finger.svg); background-repeat: no-repeat; } diff --git a/app/views/dashboard/poster/index.html.erb b/app/views/dashboard/poster/index.html.erb index 68f5e9aff..00390718f 100644 --- a/app/views/dashboard/poster/index.html.erb +++ b/app/views/dashboard/poster/index.html.erb @@ -1,33 +1,34 @@ <% content_for :action_title, t("dashboard.poster.index.title") %>
-
-

- <%= t("dashboard.poster.index.poster_title") %> -
- - <%= t("dashboard.poster.index.poster_subtitle") %> -

-

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

-

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

+
+
+

+ <%= t("dashboard.poster.index.poster_title") %> +
+ + <%= t("dashboard.poster.index.poster_subtitle") %> +

+

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

+

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

-
- <% if proposal.image.present? %> - <%= image_tag proposal.image.attachment.url(:large) %> - <% else %> - <%= image_tag "default_mailing.jpg" %> - <% end %> +
+ <% if proposal.image.present? %> + <%= image_tag proposal.image.attachment.url(:large) %> + <% else %> + <%= image_tag "default_mailing.jpg" %> + <% end %> +
+
+
+

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

+ +

<%= proposal.title %>

+ +

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

-
- -
-

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

- -

<%= proposal.title %>

- -

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

diff --git a/app/views/dashboard/poster/index.pdf.erb b/app/views/dashboard/poster/index.pdf.erb index 30a56ec76..b3ed9c716 100644 --- a/app/views/dashboard/poster/index.pdf.erb +++ b/app/views/dashboard/poster/index.pdf.erb @@ -11,8 +11,8 @@

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

@@ -28,11 +28,12 @@ <% else %> <%= wicked_pdf_image_tag "default_mailing.jpg" %> <% end %> -

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

+
+

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

<%= wicked_pdf_image_tag 'quote-before.svg' %> <%= proposal.title %> From 8064ac37798641b7a5be8a4b69c0a468131c0241 Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Tue, 8 Jan 2019 16:54:21 +0100 Subject: [PATCH 04/15] Converted the tag image into background image - Converted the TAG image into background image inside an overflow container because the height of the image in the pdf pushes to create 2 pages. - Remove unused css - --- app/assets/stylesheets/dashboard.scss | 48 +++++++++++------------ app/views/dashboard/poster/index.html.erb | 26 +++++++----- app/views/dashboard/poster/index.pdf.erb | 24 ++++++------ 3 files changed, 54 insertions(+), 44 deletions(-) diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss index 2b7c6e0ac..c4bc401a2 100644 --- a/app/assets/stylesheets/dashboard.scss +++ b/app/assets/stylesheets/dashboard.scss @@ -463,10 +463,19 @@ content: ''; position: absolute; } + + .overflow-image{ + border: 2px solid red; + overflow: hidden; + background-position: center; + background-size: contain; + background-repeat: no-repeat; + position: relative; + } } .poster-content { - + max-width: 90%; margin: 0 auto; h2 { @@ -482,15 +491,14 @@ .title-quote { display: inline-block; } - } - .poster-footer { - color: $text-medium; - border-left: 2px solid $border; + .poster-footer { + color: $text-medium; + border-left: 2px solid $border; + } } } - .dashboard-poster-preview { .preview-min-width { min-width: 661px; @@ -504,7 +512,7 @@ font-size: rem-calc(60); line-height: rem-calc(80); - .icon-finger::before{ + .icon-finger::before { font-size: rem-calc(60); } } @@ -527,6 +535,10 @@ max-width: 90%; position: relative; + .overflow-image { + height: 400px; + } + &::before { height: rem-calc(120); left: -30px; @@ -548,10 +560,6 @@ .poster-content { - max-width: 84%; - margin: 0 auto; - margin-top: rem-calc(260); - h2 { font-size: rem-calc(28); margin: $line-height 0; @@ -591,7 +599,7 @@ font-size: 6cm; line-height: rem-calc(250); - img{ + img { width: 4cm; height: 2.5cm; } @@ -608,7 +616,7 @@ text-align: justify; } - &.proposal_code{ + &.proposal_code { font-size: 1.7cm; } } @@ -626,10 +634,8 @@ width: rem-calc(420); } - img { - margin-top: rem-calc(10); - position: relative; - width: 100%; + .overflow-image{ + height: 37cm; } h2 { @@ -638,11 +644,7 @@ } .poster-content { - - max-width: 80%; - margin: 0 auto; - margin-top: 20cm; - + h2 { font-size: 3cm; margin: $line-height 0; @@ -661,8 +663,6 @@ } .poster-footer { - font-size: rem-calc(60); - line-height: rem-calc(60); margin: 0 auto; margin-top: 2cm; max-width: 60%; diff --git a/app/views/dashboard/poster/index.html.erb b/app/views/dashboard/poster/index.html.erb index 00390718f..0a2ac21f1 100644 --- a/app/views/dashboard/poster/index.html.erb +++ b/app/views/dashboard/poster/index.html.erb @@ -16,19 +16,27 @@
<% if proposal.image.present? %> - <%= image_tag proposal.image.attachment.url(:large) %> +
+ <%#= image_tag proposal.image.attachment.url(:large) %> <% else %> - <%= image_tag "default_mailing.jpg" %> +
);">
+ <%#= image_tag "default_mailing.jpg" %> <% end %>
+ +
+

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

+ +

+ + <%= proposal.title %> + +

+ +

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

+

-
-

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

- -

<%= proposal.title %>

- -

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

-
+
diff --git a/app/views/dashboard/poster/index.pdf.erb b/app/views/dashboard/poster/index.pdf.erb index b3ed9c716..6c2bdc237 100644 --- a/app/views/dashboard/poster/index.pdf.erb +++ b/app/views/dashboard/poster/index.pdf.erb @@ -24,23 +24,25 @@
<% if proposal.image.present? %> - <%= wicked_pdf_image_tag proposal.image.attachment.url(:large) %> +
');">
+ <%#= wicked_pdf_image_tag proposal.image.attachment.url(:large) %> <% else %> - <%= wicked_pdf_image_tag "default_mailing.jpg" %> +
');">
+ <%#= wicked_pdf_image_tag "default_mailing.jpg" %> <% end %> +
+
+

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

+

+ <%= wicked_pdf_image_tag 'quote-before.svg' %> + <%= proposal.title %> + <%= wicked_pdf_image_tag 'quote-after.svg' %> +

+

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

-
-

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

-

- <%= wicked_pdf_image_tag 'quote-before.svg' %> - <%= proposal.title %> - <%= wicked_pdf_image_tag 'quote-after.svg' %> -

-

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

-
From 4ec858f1a0d9d24e550801ed62a39248afb9f21f Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Tue, 8 Jan 2019 17:38:57 +0100 Subject: [PATCH 05/15] Email Style - Added style as per email sent - Change color - Changed alignment title - Added image decide madrid - Added Shadow to image --- app/assets/images/decide_madrid.png | Bin 0 -> 6955 bytes app/assets/stylesheets/dashboard.scss | 23 +++++++++++++++++---- app/views/dashboard/mailing/index.html.erb | 4 +++- 3 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 app/assets/images/decide_madrid.png diff --git a/app/assets/images/decide_madrid.png b/app/assets/images/decide_madrid.png new file mode 100644 index 0000000000000000000000000000000000000000..7ae6b26b40de43b9c9e4ce068171e299b0f84ac3 GIT binary patch literal 6955 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 JCBiQ1e*pV6t$F|e literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss index c4bc401a2..efc328b40 100644 --- a/app/assets/stylesheets/dashboard.scss +++ b/app/assets/stylesheets/dashboard.scss @@ -425,17 +425,32 @@ .dashboard-mail-preview { .mail-header { - background: #3700fd; + background: #0300ff; color: #fff; padding: $line-height; - text-align: center; + + h2 { + margin-top: $line-height; + } + } + + .margin-bottom { + img { + box-shadow: -16px 61px 49px -19px rgba(0,0,0,0.1); + } } .mail-body { text-align: justify; + color: $text-medium; .button { - background: #3700fd; + background: #064c86; + } + + img { + margin-top: $line-height; + max-width: rem-calc(120); } } } @@ -644,7 +659,7 @@ } .poster-content { - + h2 { font-size: 3cm; margin: $line-height 0; diff --git a/app/views/dashboard/mailing/index.html.erb b/app/views/dashboard/mailing/index.html.erb index abca60739..df442ed02 100644 --- a/app/views/dashboard/mailing/index.html.erb +++ b/app/views/dashboard/mailing/index.html.erb @@ -1,7 +1,7 @@ <% content_for :action_title, t("dashboard.mailing.index.title") %>
-
+

<%= proposal.title %>

<%= t("dashboard.mailer.forward.subtitle") %>

@@ -32,6 +32,8 @@ title: @proposal.title, url: proposal_url(@proposal), description: @proposal.summary } %> + + <%= image_tag "decide_madrid.png" %>
From 5fd9b2b633d249ca837a350531a432cd8f7b5c37 Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Tue, 8 Jan 2019 19:40:44 +0100 Subject: [PATCH 06/15] Change quote and fix font - Created new quotation marks without svg - Greater flexibility - Fix font Lato in PDF - change font family in pdf_font --- app/assets/stylesheets/dashboard.scss | 56 ++++++++++++++++++++--- app/assets/stylesheets/pdf_fonts.scss.erb | 5 +- app/views/dashboard/poster/index.html.erb | 13 ++---- app/views/dashboard/poster/index.pdf.erb | 12 ++--- 4 files changed, 62 insertions(+), 24 deletions(-) diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss index efc328b40..c52c2fc32 100644 --- a/app/assets/stylesheets/dashboard.scss +++ b/app/assets/stylesheets/dashboard.scss @@ -498,6 +498,37 @@ text-align: left; } + .quote { + font-family: Georgia, serif; + font-size: 14px; + + blockquote { + border: 0; + } + + .curly-quotes:before, + .curly-quotes:after { + color: #0300ff; + display: inline-block; + vertical-align: top; + height: rem-calc(18); + line-height: rem-calc(70); + font-size: rem-calc(60); + } + + .curly-quotes:before { + content: '\201C'; + margin-right: 4px; + margin-left: -8px; + } + + .curly-quotes:after { + content: '\201D'; + margin-left: 4px; + margin-right: -8px; + } + } + h3 { color: #0300ff; display: inline; @@ -510,6 +541,8 @@ .poster-footer { color: $text-medium; border-left: 2px solid $border; + padding-left: rem-calc(40); + margin: 0 auto; } } } @@ -593,8 +626,6 @@ .poster-footer { font-size: rem-calc(19); - margin: 0 auto; - padding-left: $line-height / 2; width: 50%; margin-top: rem-calc(50); } @@ -609,10 +640,12 @@ .poster-header { padding: 5cm; height: 60cm; + font-weight: normal; h1 { font-size: 6cm; line-height: rem-calc(250); + font-weight: bold; img { width: 4cm; @@ -622,12 +655,13 @@ p { font-size: rem-calc(80); - line-height: rem-calc(80); + line-height: rem-calc(100); color: #fff; + &.intro { margin: rem-calc(160) auto; - max-width: 80%; + max-width: 70%; text-align: justify; } @@ -660,6 +694,15 @@ .poster-content { + .quote { + .curly-quotes:before, + .curly-quotes:after { + font-size: rem-calc(200); + height: rem-calc(18); + line-height: rem-calc(150); + } + } + h2 { font-size: 3cm; margin: $line-height 0; @@ -669,6 +712,7 @@ font-size: 4.7cm; margin-top: $line-height; max-width: 80%; + line-height: 5cm; } img{ @@ -678,10 +722,8 @@ } .poster-footer { - margin: 0 auto; - margin-top: 2cm; + margin-top: 3cm; max-width: 60%; - padding-left: rem-calc(40); width: 100%; } } diff --git a/app/assets/stylesheets/pdf_fonts.scss.erb b/app/assets/stylesheets/pdf_fonts.scss.erb index bbf549949..07a577fa0 100644 --- a/app/assets/stylesheets/pdf_fonts.scss.erb +++ b/app/assets/stylesheets/pdf_fonts.scss.erb @@ -53,12 +53,13 @@ } @font-face { - font-family: 'Lato PDF'; + font-family: 'Lato PDF'; src: url("<%= ApplicationHelper.asset_data_base64('lato-bold.ttf') %>"); font-weight: bold; font-style: normal; } body, h1, h2, h3 { - font-family: Source Sans Pro PDF !important; + font-family: Lato PDF !important; + font-weight: lighter !important; } diff --git a/app/views/dashboard/poster/index.html.erb b/app/views/dashboard/poster/index.html.erb index 0a2ac21f1..0e12f97b3 100644 --- a/app/views/dashboard/poster/index.html.erb +++ b/app/views/dashboard/poster/index.html.erb @@ -17,26 +17,23 @@
<% if proposal.image.present? %>
- <%#= image_tag proposal.image.attachment.url(:large) %> <% else %>
);">
- <%#= image_tag "default_mailing.jpg" %> <% end %>

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

-

- - <%= proposal.title %> - -

+
+
+

<%= proposal.title %>

+
+

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

- diff --git a/app/views/dashboard/poster/index.pdf.erb b/app/views/dashboard/poster/index.pdf.erb index 6c2bdc237..7764fb055 100644 --- a/app/views/dashboard/poster/index.pdf.erb +++ b/app/views/dashboard/poster/index.pdf.erb @@ -34,15 +34,13 @@

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

-

- <%= wicked_pdf_image_tag 'quote-before.svg' %> - <%= proposal.title %> - <%= wicked_pdf_image_tag 'quote-after.svg' %> -

+
+
+

<%= proposal.title %>

+
+

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

- - From f317514258c784fef9d92f52a030ceb07ce31f78 Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Wed, 9 Jan 2019 14:52:51 +0100 Subject: [PATCH 07/15] Change Finger icon SVG to PNG - Suggestion DeCabeza until FontAwesome is inserted. - Remove SVG and convert to PNG --- app/assets/fonts/finger.svg | 17 ----------------- app/assets/images/finger.png | Bin 0 -> 12706 bytes app/assets/stylesheets/dashboard.scss | 9 ++++----- app/views/dashboard/poster/index.html.erb | 2 +- app/views/dashboard/poster/index.pdf.erb | 4 ++-- 5 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 app/assets/fonts/finger.svg create mode 100644 app/assets/images/finger.png diff --git a/app/assets/fonts/finger.svg b/app/assets/fonts/finger.svg deleted file mode 100644 index c2e3eea1a..000000000 --- a/app/assets/fonts/finger.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - diff --git a/app/assets/images/finger.png b/app/assets/images/finger.png new file mode 100644 index 0000000000000000000000000000000000000000..eebd36e3754a78f55c334aa318aa2a921caa1cc2 GIT binary patch literal 12706 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 literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss index c52c2fc32..89e3f23a3 100644 --- a/app/assets/stylesheets/dashboard.scss +++ b/app/assets/stylesheets/dashboard.scss @@ -560,8 +560,8 @@ font-size: rem-calc(60); line-height: rem-calc(80); - .icon-finger::before { - font-size: rem-calc(60); + img { + max-width: rem-calc(50) } } @@ -647,9 +647,8 @@ line-height: rem-calc(250); font-weight: bold; - img { - width: 4cm; - height: 2.5cm; + img{ + max-width: rem-calc(150) } } diff --git a/app/views/dashboard/poster/index.html.erb b/app/views/dashboard/poster/index.html.erb index 0e12f97b3..8810ad2a5 100644 --- a/app/views/dashboard/poster/index.html.erb +++ b/app/views/dashboard/poster/index.html.erb @@ -6,7 +6,7 @@

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

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

diff --git a/app/views/dashboard/poster/index.pdf.erb b/app/views/dashboard/poster/index.pdf.erb index 7764fb055..b5598d087 100644 --- a/app/views/dashboard/poster/index.pdf.erb +++ b/app/views/dashboard/poster/index.pdf.erb @@ -11,8 +11,8 @@

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

From 145e0ae659177d52747cadbd0458c1b78e5b48c2 Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Wed, 9 Jan 2019 15:10:50 +0100 Subject: [PATCH 08/15] Show Preview only in Large version - Add class Foundation show-for-large - Fixed width Preview so as not to make it responsive --- app/assets/stylesheets/dashboard.scss | 5 +++-- app/views/dashboard/poster/index.html.erb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss index 89e3f23a3..85bced319 100644 --- a/app/assets/stylesheets/dashboard.scss +++ b/app/assets/stylesheets/dashboard.scss @@ -548,8 +548,9 @@ } .dashboard-poster-preview { - .preview-min-width { - min-width: 661px; + + .preview-width { + width: 661px; } .poster-header { diff --git a/app/views/dashboard/poster/index.html.erb b/app/views/dashboard/poster/index.html.erb index 8810ad2a5..8d2882268 100644 --- a/app/views/dashboard/poster/index.html.erb +++ b/app/views/dashboard/poster/index.html.erb @@ -1,7 +1,7 @@ <% content_for :action_title, t("dashboard.poster.index.title") %>

-
+

<%= t("dashboard.poster.index.poster_title") %> From 003d3e82b071dc067509e75430abece38b59bc8a Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Wed, 9 Jan 2019 15:46:49 +0100 Subject: [PATCH 09/15] Convert Color to Variables - Added two temporal variables for colors. (Deciding how to call these new variables) - Replaced hexadecimal with variable - Remove white space in the html --- app/assets/stylesheets/_consul_settings.scss | 3 +++ app/assets/stylesheets/dashboard.scss | 12 ++++++------ app/views/dashboard/poster/index.html.erb | 4 ---- app/views/dashboard/poster/index.pdf.erb | 3 --- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/app/assets/stylesheets/_consul_settings.scss b/app/assets/stylesheets/_consul_settings.scss index 4a083bb62..9e8af3615 100644 --- a/app/assets/stylesheets/_consul_settings.scss +++ b/app/assets/stylesheets/_consul_settings.scss @@ -65,6 +65,9 @@ $alert-bg: #f2dede; $alert-border: #ebccd1; $color-alert: #a94442; +$pdf-primary: #0300ff; +$pdf-secondary: #ff9e00; + // 2. Foundation settings overrides // --------------------------------- diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss index 85bced319..5d588682c 100644 --- a/app/assets/stylesheets/dashboard.scss +++ b/app/assets/stylesheets/dashboard.scss @@ -425,7 +425,7 @@ .dashboard-mail-preview { .mail-header { - background: #0300ff; + background: $pdf-primary; color: #fff; padding: $line-height; @@ -461,7 +461,7 @@ .dashboard-poster-preview, .dashboard-poster-pdf { .poster-header { - background: #0300ff; + background: $pdf-primary; color: #fff; h1 { color: #fff; @@ -474,7 +474,7 @@ position: relative; &::before { - background: #ff9e00; + background: $pdf-secondary; content: ''; position: absolute; } @@ -508,7 +508,7 @@ .curly-quotes:before, .curly-quotes:after { - color: #0300ff; + color: $pdf-primary; display: inline-block; vertical-align: top; height: rem-calc(18); @@ -530,7 +530,7 @@ } h3 { - color: #0300ff; + color: $pdf-primary; display: inline; } @@ -550,7 +550,7 @@ .dashboard-poster-preview { .preview-width { - width: 661px; + width: rem-calc(661); } .poster-header { diff --git a/app/views/dashboard/poster/index.html.erb b/app/views/dashboard/poster/index.html.erb index 8d2882268..bc34812e6 100644 --- a/app/views/dashboard/poster/index.html.erb +++ b/app/views/dashboard/poster/index.html.erb @@ -13,7 +13,6 @@

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

-
<% if proposal.image.present? %>
@@ -21,16 +20,13 @@
);">
<% end %>
-

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

-

<%= proposal.title %>

-

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

diff --git a/app/views/dashboard/poster/index.pdf.erb b/app/views/dashboard/poster/index.pdf.erb index b5598d087..04f52b884 100644 --- a/app/views/dashboard/poster/index.pdf.erb +++ b/app/views/dashboard/poster/index.pdf.erb @@ -14,14 +14,12 @@ <%= wicked_pdf_image_tag("finger.png") %> <%= t("dashboard.poster.index.poster_subtitle") %> -

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

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

-
<% if proposal.image.present? %>
');">
@@ -31,7 +29,6 @@ <%#= wicked_pdf_image_tag "default_mailing.jpg" %> <% end %>
-

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

From 70171b0e172e125eb021f862eeada5da5e913abc Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Fri, 11 Jan 2019 18:51:55 +0100 Subject: [PATCH 10/15] Fix PDF and email - Inserted normal quotation marks - Remove class quote - Added max width mail preview - Added some styles in the email - Added image decide_madrid at the end of the email - Added cover to the image preview poster and PDF - Passed scss lint --- app/assets/stylesheets/dashboard.scss | 74 ++++++++------------- app/views/dashboard/mailer/forward.html.erb | 16 +++-- app/views/dashboard/mailing/index.html.erb | 4 +- app/views/dashboard/poster/index.html.erb | 6 +- app/views/dashboard/poster/index.pdf.erb | 10 +-- config/locales/en/general.yml | 2 +- config/locales/es/general.yml | 2 +- 7 files changed, 43 insertions(+), 71 deletions(-) diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss index 5d588682c..771b7eed7 100644 --- a/app/assets/stylesheets/dashboard.scss +++ b/app/assets/stylesheets/dashboard.scss @@ -424,11 +424,17 @@ .dashboard-mail-preview { + max-width: rem-calc(600); + .mail-header { background: $pdf-primary; color: #fff; padding: $line-height; + h1 { + font-size: rem-calc(60); + } + h2 { margin-top: $line-height; } @@ -437,6 +443,7 @@ .margin-bottom { img { box-shadow: -16px 61px 49px -19px rgba(0,0,0,0.1); + width: 100% } } @@ -446,6 +453,9 @@ .button { background: #064c86; + box-shadow: -4px 18px 45px -19px rgba(0,0,0,0.75); + margin-bottom: $line-height; + margin-top: $line-height; } img { @@ -480,11 +490,10 @@ } .overflow-image{ - border: 2px solid red; - overflow: hidden; background-position: center; - background-size: contain; + background-size: cover; background-repeat: no-repeat; + overflow: hidden; position: relative; } } @@ -498,37 +507,6 @@ text-align: left; } - .quote { - font-family: Georgia, serif; - font-size: 14px; - - blockquote { - border: 0; - } - - .curly-quotes:before, - .curly-quotes:after { - color: $pdf-primary; - display: inline-block; - vertical-align: top; - height: rem-calc(18); - line-height: rem-calc(70); - font-size: rem-calc(60); - } - - .curly-quotes:before { - content: '\201C'; - margin-right: 4px; - margin-left: -8px; - } - - .curly-quotes:after { - content: '\201D'; - margin-left: 4px; - margin-right: -8px; - } - } - h3 { color: $pdf-primary; display: inline; @@ -539,10 +517,10 @@ } .poster-footer { - color: $text-medium; border-left: 2px solid $border; - padding-left: rem-calc(40); + color: $text-medium; margin: 0 auto; + padding-left: rem-calc(40); } } } @@ -554,15 +532,15 @@ } .poster-header { - padding: $line-height * 2 $line-height $line-height * 2; height: rem-calc(600); + padding: $line-height * 2 $line-height $line-height * 2; h1 { font-size: rem-calc(60); line-height: rem-calc(80); img { - max-width: rem-calc(50) + max-width: rem-calc(50); } } @@ -648,8 +626,8 @@ line-height: rem-calc(250); font-weight: bold; - img{ - max-width: rem-calc(150) + img { + max-width: rem-calc(150); } } @@ -665,7 +643,7 @@ text-align: justify; } - &.proposal_code { + &.proposal-code { font-size: 1.7cm; } } @@ -683,7 +661,7 @@ width: rem-calc(420); } - .overflow-image{ + .overflow-image { height: 37cm; } @@ -695,10 +673,10 @@ .poster-content { .quote { - .curly-quotes:before, - .curly-quotes:after { + .curly-quotes::before, + .curly-quotes::after { font-size: rem-calc(200); - height: rem-calc(18); + height: rem-calc(18); line-height: rem-calc(150); } } @@ -715,9 +693,9 @@ line-height: 5cm; } - img{ - width:5cm; - height:5cm; + img { + width: 5cm; + height: 5cm; } } diff --git a/app/views/dashboard/mailer/forward.html.erb b/app/views/dashboard/mailer/forward.html.erb index 3788c94aa..685332e40 100644 --- a/app/views/dashboard/mailer/forward.html.erb +++ b/app/views/dashboard/mailer/forward.html.erb @@ -4,18 +4,18 @@ -
-

<%= @proposal.title %>

-

<%= t("dashboard.mailer.forward.subtitle") %>

+ 		+

"<%= @proposal.title %>"

+

<%= t("dashboard.mailer.forward.subtitle").html_safe %>
<% if @proposal.image.present? %> - <%= image_tag @proposal.image.attachment.url(:large), style: "max-width: 100%;" %> + <%= image_tag @proposal.image.attachment.url(:large), style: "width: 100%; box-shadow: -16px 61px 49px -19px rgba(0,0,0,0.1);" %> <% else %> - <%= image_tag "default_mailing.jpg", style: "max-width: 100%;" %> + <%= image_tag "default_mailing.jpg", style: "width: 100%; box-shadow: -16px 61px 49px -19px rgba(0,0,0,0.1);" %> <% end %>

<%= t("dashboard.mailer.forward.hi")%>

@@ -27,10 +27,11 @@ <%= link_to proposal_url(@proposal), - style: "font-family: 'Open Sans',arial,sans-serif; background: #3700fd; + style: "font-family: 'Open Sans',arial,sans-serif; background: #064c86; border-radius: 6px; color: #fff !important; font-weight: bold; padding: 17px 20px; text-align: center; text-decoration: none; - font-size: 20px; min-width: 200px; display: inline-block;", + font-size: 20px; min-width: 200px; display: inline-block; + box-shadow: -4px 18px 45px -19px rgba(0,0,0,0.75);", target: "_blank" do %> <%= t("dashboard.mailer.forward.support_button") %> <% end %> @@ -58,4 +59,5 @@ + <%= image_tag("decide_madrid.png", style: "max-width: 120px; display: block; margin: 0 auto; margin-top: 30px") %> diff --git a/app/views/dashboard/mailing/index.html.erb b/app/views/dashboard/mailing/index.html.erb index df442ed02..bd8ff737b 100644 --- a/app/views/dashboard/mailing/index.html.erb +++ b/app/views/dashboard/mailing/index.html.erb @@ -2,8 +2,8 @@
-

<%= proposal.title %>

-

<%= t("dashboard.mailer.forward.subtitle") %>

+

"<%= proposal.title %>"

+

<%= t("dashboard.mailer.forward.subtitle").html_safe %>

diff --git a/app/views/dashboard/poster/index.html.erb b/app/views/dashboard/poster/index.html.erb index bc34812e6..2dd9f699e 100644 --- a/app/views/dashboard/poster/index.html.erb +++ b/app/views/dashboard/poster/index.html.erb @@ -22,11 +22,7 @@

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

-
-
-

<%= proposal.title %>

-
-
+

"<%= proposal.title %>"

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

diff --git a/app/views/dashboard/poster/index.pdf.erb b/app/views/dashboard/poster/index.pdf.erb index 04f52b884..041f397cb 100644 --- a/app/views/dashboard/poster/index.pdf.erb +++ b/app/views/dashboard/poster/index.pdf.erb @@ -17,24 +17,20 @@

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

-

+

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

<% if proposal.image.present? %> -
');">
- <%#= wicked_pdf_image_tag proposal.image.attachment.url(:large) %> +
<% else %>
');">
- <%#= wicked_pdf_image_tag "default_mailing.jpg" %> <% end %>

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

-
-

<%= proposal.title %>

-
+

"<%= proposal.title %>"

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

diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index b54a1cb93..e03133062 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -588,7 +588,7 @@ en: sent: The email has been sent mailer: forward: - subtitle: If you support me, we will achieve it. + subtitle: If you support me,
we will achieve it. support_button: Support this proposal share_in: Share in hi: "Hello!" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 8556c9284..53b7ab1c1 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -588,7 +588,7 @@ es: sent: El e-mail ha sido enviado mailer: forward: - subtitle: Si me apoyas, lo conseguiremos. + subtitle: Si me apoyas,
lo conseguiremos. support_button: Apoyar esta propuesta share_in: Compartir en hi: "¡Hola!" From a6d822cc7a1ab9c779d6088de34533b93261e58f Mon Sep 17 00:00:00 2001 From: taitus Date: Sun, 13 Jan 2019 15:50:43 +0100 Subject: [PATCH 11/15] Add zoom and dpi values to correct the pdf display when environment is not development. --- app/controllers/dashboard/poster_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/dashboard/poster_controller.rb b/app/controllers/dashboard/poster_controller.rb index be880bdac..4484dd447 100644 --- a/app/controllers/dashboard/poster_controller.rb +++ b/app/controllers/dashboard/poster_controller.rb @@ -7,6 +7,8 @@ class Dashboard::PosterController < Dashboard::BaseController format.pdf do render pdf: 'poster', page_size: 'A4', + dpi: 300, + zoom: 0.32, show_as_html: Rails.env.test? || params.key?('debug'), margin: { top: 0 } end From 394a7e55ee63447b6c21e8714d62da330caa8f9f Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Mon, 14 Jan 2019 13:05:45 +0100 Subject: [PATCH 12/15] Fixed some style preview email and email - Removed class large-7 - Changed font size preview-email and email - Changed text color in the email - Changed some font size and padding in the email - Added some padding in preview email - Pass scss-lint - Changed padding and added font size. --- app/assets/stylesheets/dashboard.scss | 23 ++++++++++++++------- app/views/dashboard/mailer/forward.html.erb | 14 ++++++------- app/views/dashboard/mailing/index.html.erb | 6 ++++-- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss index 771b7eed7..3f5c92692 100644 --- a/app/assets/stylesheets/dashboard.scss +++ b/app/assets/stylesheets/dashboard.scss @@ -429,7 +429,7 @@ .mail-header { background: $pdf-primary; color: #fff; - padding: $line-height; + padding: $line-height * 2; h1 { font-size: rem-calc(60); @@ -442,19 +442,20 @@ .margin-bottom { img { - box-shadow: -16px 61px 49px -19px rgba(0,0,0,0.1); - width: 100% + box-shadow: -16px 61px 49px -19px rgba(0, 0, 0, 0.1); + width: 100%; } } .mail-body { - text-align: justify; color: $text-medium; + padding: $line-height * 2; + text-align: left; .button { background: #064c86; - box-shadow: -4px 18px 45px -19px rgba(0,0,0,0.75); - margin-bottom: $line-height; + box-shadow: -4px 18px 45px -19px rgba(0, 0, 0, 0.75); + margin-bottom: $line-height * 2; margin-top: $line-height; } @@ -462,6 +463,11 @@ margin-top: $line-height; max-width: rem-calc(120); } + + p { + font-size: rem-calc(24); + line-height: rem-calc(30); + } } } @@ -473,6 +479,7 @@ .poster-header { background: $pdf-primary; color: #fff; + h1 { color: #fff; text-align: left; @@ -489,7 +496,7 @@ position: absolute; } - .overflow-image{ + .overflow-image { background-position: center; background-size: cover; background-repeat: no-repeat; @@ -533,7 +540,7 @@ .poster-header { height: rem-calc(600); - padding: $line-height * 2 $line-height $line-height * 2; + padding: $line-height * 2 $line-height; h1 { font-size: rem-calc(60); diff --git a/app/views/dashboard/mailer/forward.html.erb b/app/views/dashboard/mailer/forward.html.erb index 685332e40..108a121a0 100644 --- a/app/views/dashboard/mailer/forward.html.erb +++ b/app/views/dashboard/mailer/forward.html.erb @@ -4,8 +4,8 @@ - @@ -18,9 +18,9 @@ <%= image_tag "default_mailing.jpg", style: "width: 100%; box-shadow: -16px 61px 49px -19px rgba(0,0,0,0.1);" %> <% end %> -

<%= t("dashboard.mailer.forward.hi")%>

-

<%= t("dashboard.mailer.forward.introduction", org: setting['org_name']) %>

-

<%= t("dashboard.mailer.forward.support") %>

+

<%= t("dashboard.mailer.forward.hi")%>

+

<%= t("dashboard.mailer.forward.introduction", org: setting['org_name']) %>

+

<%= t("dashboard.mailer.forward.support") %>

-

"<%= @proposal.title %>"

+ 		+

"<%= @proposal.title %>"

<%= t("dashboard.mailer.forward.subtitle").html_safe %>
@@ -40,13 +40,13 @@
-

<%= t("dashboard.mailer.forward.share") %>

+

<%= t("dashboard.mailer.forward.share") %>

diff --git a/app/views/dashboard/mailing/index.html.erb b/app/views/dashboard/mailing/index.html.erb index bd8ff737b..417425d39 100644 --- a/app/views/dashboard/mailing/index.html.erb +++ b/app/views/dashboard/mailing/index.html.erb @@ -1,6 +1,6 @@ <% content_for :action_title, t("dashboard.mailing.index.title") %>
-
+

"<%= proposal.title %>"

<%= t("dashboard.mailer.forward.subtitle").html_safe %>

@@ -24,7 +24,9 @@ proposal_url(@proposal), class: "button large" %>
- <%= t("dashboard.mailer.forward.share") %> +

+ <%= t("dashboard.mailer.forward.share") %> +

<%= t("dashboard.mailer.forward.share_in") %>

From 56dadcb7017f7e21aba67511608850c56a5794ff Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Wed, 16 Jan 2019 14:32:01 +0100 Subject: [PATCH 13/15] Changed logo image - The original logo is white. Created black version for white background. - Added logo in preview email and send email. --- app/assets/images/logo_header_black.png | Bin 0 -> 3423 bytes app/views/dashboard/mailer/forward.html.erb | 2 +- app/views/dashboard/mailing/index.html.erb | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 app/assets/images/logo_header_black.png diff --git a/app/assets/images/logo_header_black.png b/app/assets/images/logo_header_black.png new file mode 100644 index 0000000000000000000000000000000000000000..7d9242f230a0a38bf2c78b6016951d8f6c224442 GIT binary patch literal 3423 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 N9#4u7xxzI<@*m%%pxOWc literal 0 HcmV?d00001 diff --git a/app/views/dashboard/mailer/forward.html.erb b/app/views/dashboard/mailer/forward.html.erb index 108a121a0..21bfd2a69 100644 --- a/app/views/dashboard/mailer/forward.html.erb +++ b/app/views/dashboard/mailer/forward.html.erb @@ -59,5 +59,5 @@
-

<%= t("dashboard.mailer.forward.share_in") %>

+

<%= t("dashboard.mailer.forward.share_in") %>
- <%= image_tag("decide_madrid.png", style: "max-width: 120px; display: block; margin: 0 auto; margin-top: 30px") %> + <%= image_tag("logo_header_black.png", style: "max-width: 120px; display: block; margin: 0 auto; margin-top: 30px") %> diff --git a/app/views/dashboard/mailing/index.html.erb b/app/views/dashboard/mailing/index.html.erb index 417425d39..c2eefa7eb 100644 --- a/app/views/dashboard/mailing/index.html.erb +++ b/app/views/dashboard/mailing/index.html.erb @@ -35,7 +35,7 @@ url: proposal_url(@proposal), description: @proposal.summary } %> - <%= image_tag "decide_madrid.png" %> + <%= image_tag "logo_header_black.png" %>
From 44964c35f959366015e6853882e197604470e650 Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Wed, 16 Jan 2019 15:12:27 +0100 Subject: [PATCH 14/15] Added quotes images - Created white quote images png (before and after) - Added images quotes to preview email and email. - Added max width to images quotes png --- app/assets/images/quote-after-white.png | Bin 0 -> 1892 bytes app/assets/images/quote-before-white.png | Bin 0 -> 1897 bytes app/assets/stylesheets/dashboard.scss | 5 +++++ app/views/dashboard/mailer/forward.html.erb | 8 +++++--- app/views/dashboard/mailing/index.html.erb | 4 +++- 5 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 app/assets/images/quote-after-white.png create mode 100644 app/assets/images/quote-before-white.png diff --git a/app/assets/images/quote-after-white.png b/app/assets/images/quote-after-white.png new file mode 100644 index 0000000000000000000000000000000000000000..5889b1780d996e5b4b43d92b6655c8e1238f0c95 GIT binary patch literal 1892 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 - -

"<%= @proposal.title %>"

-

<%= t("dashboard.mailer.forward.subtitle").html_safe %>

+ + <%= image_tag 'quote-before-white.png', style: 'max-width: 40px; vertical-align: top;' %> +

<%= @proposal.title %>

+ <%= image_tag 'quote-after-white.png', style: 'max-width: 40px; vertical-align: top;' %> +

<%= t("dashboard.mailer.forward.subtitle").html_safe %>

diff --git a/app/views/dashboard/mailing/index.html.erb b/app/views/dashboard/mailing/index.html.erb index c2eefa7eb..6db3347d3 100644 --- a/app/views/dashboard/mailing/index.html.erb +++ b/app/views/dashboard/mailing/index.html.erb @@ -2,7 +2,9 @@
-

"<%= proposal.title %>"

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

<%= proposal.title %>

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

<%= t("dashboard.mailer.forward.subtitle").html_safe %>

From d81d1537d0079ee9b563433ea41a2eb1d9741b96 Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Wed, 16 Jan 2019 18:28:14 +0100 Subject: [PATCH 15/15] Created new quotes - Created blue images quotes - Added quotes images to preview poster - Added quotes images to download poster - Removed reference to Decide Madrid and use %{org} - Removed reference to decide.madrid.es and use %{link} - FIxed some style (font, padding, maring) in PDF - Passed scss-lint --- app/assets/images/quote-after-blue.png | Bin 0 -> 1953 bytes app/assets/images/quote-before-blue.png | Bin 0 -> 1952 bytes app/assets/stylesheets/dashboard.scss | 46 ++++++++++------------ app/views/dashboard/poster/index.html.erb | 11 ++++-- app/views/dashboard/poster/index.pdf.erb | 17 ++++---- config/locales/en/general.yml | 4 +- config/locales/es/general.yml | 4 +- 7 files changed, 43 insertions(+), 39 deletions(-) create mode 100644 app/assets/images/quote-after-blue.png create mode 100644 app/assets/images/quote-before-blue.png diff --git a/app/assets/images/quote-after-blue.png b/app/assets/images/quote-after-blue.png new file mode 100644 index 0000000000000000000000000000000000000000..f85ad04c4eca6f47fc1a6d78a1c4a663b455c882 GIT binary patch literal 1953 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m^Cs(B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk*h0bFQqR!T z(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvqnWFLp#@B@XI^nhVqS78Om8MauPI)=R?bDKi6!|(A^G_^ zu-FU8$S=t+&d4uNaCQd8mZ^exAZL&z!^MGl-2$;A%4s5VsU|`|*ba4!+xbkK768HA^KnD7-S%@>=(0i@wW!OvoqCa#RxWWOfS@UoaxoRxAf;; zL6J<6h4aO;UZ@&&6iBsyU7*XuWU!n4T0<1?zZ(yJdG1u>5R3?m;5p@J>>n+XEo!sA zQNQoTuZNuer$wq?PCIA2N#5hb&Qiu1=hY?GY!_nH_b;wik5@ z9n|JLaQ*!v)*i)q&qI6m7O|_G+rQF;zu;wU*kXIVLQmO@z?dr`O%?|~@2)hvsL#-p zp8Y*5u0UYx>j&0`74j<>EQPMelzP|y591OtEt#L{-sp9bDb;w!q79BgN|7_)Fs2j+!Z^nc7AsS_ELI)z9lCvCj6hCAXOxU1)@YF-eUFB^?2brBd>{aOA zpSuvfXZqlQ2#*0G94%{EoacQInQSHjPJx% znH}>37wDakuNK|TGEdx$aR-MrGn4+4;AHIbP0l+XkKqjBTA literal 0 HcmV?d00001 diff --git a/app/assets/images/quote-before-blue.png b/app/assets/images/quote-before-blue.png new file mode 100644 index 0000000000000000000000000000000000000000..4c97bc0f7be1496519e134b4ad4fdf57008920b4 GIT binary patch literal 1952 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m^Cs(B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk*h0bFQqR!T z(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvqnWFLp#@B@XI^nhVqS78Om8MauO(i+R?bDKi6!|(A^G_^ zu-FU8$S=t+&d4uNaCQd8mZ^exAZL&z!^MGl-2$;B;zewLjzkt$A5x8<%YI zdE=xR`6VboP<5Y6%RUa#9}`3(*}ewYx;q9)iiUV8?EP|KawJDund-?!-C=4|@2)V> zG~v#^{kA@7pTNuC-)0*d3%%j_bEEz4+~RZfK<@K1Y)TV7Vs!c&L=SK!ux?P>*Tesob4h91wX`8-BJ%=SHtdOX&TJb%zU+!o~GE>4Qn-6D}8=qUXCXmCrD-p6MO#2|~&hw_H|Be*2ZN@XryI*=+m`PkT}(^Qal^3+MBay#JeTS+;L; zz?PPcLg(ZTME6&%lg{>b4!!TjE- z>+hTe-XAzCB3~L;NO>-h+R}LYf!N{cGwqtokJVk^i+>qj&gs;$)zoFf#w87t&rFuT z`s(b05F_a+hHt+%g>8sl#`Wb4(~Jz89VbgNGP+KE*E}G|`|XzF!akh|jF(Kl$b>g^ zE6sM1j+A=yv?0ny>~_dz2Q!J4D?fV8&g{Lh#fRIW`P=$tfyBjK4ECAT7jD$539fQj zbUfWj>g~m4F`R}fo*3e>=kftSij)tk<>LF!T+Un zXBqbk$18<5s4+9~G~`YHF2#Fe@$pwnw=gW)uwrqR_h#qoHuFkX*+`q*u4a7|nJJ(Y z(ENB!TKk??-#4t#DDC^apu1Mz;riL0vK`V}?YI_+oSZg8T=q)R<%^$!rO2=jn@1&yan@ z^ughh++X>`=8gZ^FU*x*!Q@}Vvai2V-C~Bx2Jt(LiTu_6uI$-;Iqn@_^$kNJuIQg& zH9k^#+wyKL!{Ga}+W>B5!>FVdQ&MBb@0I+oNBme*a literal 0 HcmV?d00001 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: