From d81d1537d0079ee9b563433ea41a2eb1d9741b96 Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Wed, 16 Jan 2019 18:28:14 +0100 Subject: [PATCH] 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: