From 927b1e8e5d40816e81a8988d153b6ee05d5d0034 Mon Sep 17 00:00:00 2001 From: Ana Date: Fri, 11 Mar 2016 00:21:39 +0100 Subject: [PATCH 01/21] Share with WhatsApp in debates --- Gemfile | 3 +++ Gemfile.lock | 3 +++ app/assets/stylesheets/application.scss | 4 +++- app/assets/stylesheets/participation.scss | 12 ++++++++++++ app/views/debates/show.html.erb | 7 ++++++- 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 573192fa8..cbe3d1ece 100644 --- a/Gemfile +++ b/Gemfile @@ -59,6 +59,9 @@ gem 'tolk' # Web interface for translations gem 'browser' gem 'turnout' gem 'redcarpet' + +gem 'font-awesome-sass', '~> 4.5.0' # icons + group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' diff --git a/Gemfile.lock b/Gemfile.lock index fab1252d1..7726d1248 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,6 +163,8 @@ GEM i18n (~> 0.5) faraday (0.9.2) multipart-post (>= 1.2, < 3) + font-awesome-sass (4.5.0) + sass (>= 3.2) foundation-rails (6.2.0.1) railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) @@ -457,6 +459,7 @@ DEPENDENCIES email_spec factory_girl_rails faker + font-awesome-sass (~> 4.5.0) foundation-rails foundation_rails_helper fuubar diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 822e4cd4c..445af82fb 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -11,4 +11,6 @@ @import "annotator.min"; @import "annotator_overrides"; @import "jquery-ui/datepicker"; -@import "datepicker_overrides"; \ No newline at end of file +@import "datepicker_overrides"; +@import "font-awesome-sprockets"; +@import "font-awesome"; diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 182c52863..72b8c44e2 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -337,6 +337,18 @@ .debate-show, .proposal-show { + .social-share-button{ + display:inline; + } + + .whatsapp{ + margin-left: 0.5px; + color: white; + vertical-align: top; + background-color: #43d854; + padding: 7px 9.5px 7px 9.5px; + } + .edit-debate, .edit-proposal { margin-bottom: 0; } diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index eb3f5bbc0..935a785b0 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -54,8 +54,13 @@

<%= t("debates.show.share") %>

+
<%= social_share_button_tag(@debate.title) %> - + <% if browser.mobile? %> + + <%= icon('whatsapp', class: 'fa-2x whatsapp') %> + + <% end %> <% end %> From f866c7be8fdeba0c0218eefcd56e7b5751b431db Mon Sep 17 00:00:00 2001 From: Ana Date: Fri, 11 Mar 2016 00:25:29 +0100 Subject: [PATCH 02/21] Share with WhatsApp in proposals --- app/views/proposals/show.html.erb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 2b060d501..96b38fae9 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -86,7 +86,13 @@

<%= t("proposals.show.share") %>

+
<%= social_share_button_tag(@proposal.title) %> + <% if browser.mobile? %> + + <%= icon('whatsapp', class: 'fa-2x whatsapp') %> + + <% end %> From f4b7e0c14203989878c444cbcb0ffbc88e1475da Mon Sep 17 00:00:00 2001 From: Ana Date: Fri, 11 Mar 2016 00:34:07 +0100 Subject: [PATCH 03/21] Share with Whatsapp improvement --- app/assets/stylesheets/participation.scss | 2 +- app/views/debates/show.html.erb | 15 ++++++++------- app/views/proposals/show.html.erb | 15 ++++++++------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 72b8c44e2..a8ee508d6 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -337,7 +337,7 @@ .debate-show, .proposal-show { - .social-share-button{ + .social_share_full .social-share-button{ display:inline; } diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index 935a785b0..459561c10 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -54,13 +54,14 @@

<%= t("debates.show.share") %>

-
- <%= social_share_button_tag(@debate.title) %> - <% if browser.mobile? %> - - <%= icon('whatsapp', class: 'fa-2x whatsapp') %> - - <% end %> + <% end %> diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 96b38fae9..58fef7bae 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -86,13 +86,14 @@

<%= t("proposals.show.share") %>

-
- <%= social_share_button_tag(@proposal.title) %> - <% if browser.mobile? %> - - <%= icon('whatsapp', class: 'fa-2x whatsapp') %> - - <% end %> + From 8119df26fb2321f71d181106633b1e19afb3064f Mon Sep 17 00:00:00 2001 From: Ana Date: Sat, 12 Mar 2016 22:20:35 +0100 Subject: [PATCH 04/21] Use of fontastic instead of font-awesome --- Gemfile | 2 -- Gemfile.lock | 3 --- app/assets/fonts/icons.eot | Bin 9564 -> 9904 bytes app/assets/fonts/icons.svg | 1 + app/assets/fonts/icons.ttf | Bin 9408 -> 9748 bytes app/assets/fonts/icons.woff | Bin 7496 -> 7800 bytes app/assets/stylesheets/application.scss | 2 -- app/assets/stylesheets/icons.scss | 3 +++ app/assets/stylesheets/participation.scss | 10 ++++++---- app/views/debates/show.html.erb | 4 ++-- app/views/proposals/show.html.erb | 4 ++-- 11 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Gemfile b/Gemfile index cbe3d1ece..0d9f64f56 100644 --- a/Gemfile +++ b/Gemfile @@ -60,8 +60,6 @@ gem 'browser' gem 'turnout' gem 'redcarpet' -gem 'font-awesome-sass', '~> 4.5.0' # icons - group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' diff --git a/Gemfile.lock b/Gemfile.lock index 7726d1248..fab1252d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,8 +163,6 @@ GEM i18n (~> 0.5) faraday (0.9.2) multipart-post (>= 1.2, < 3) - font-awesome-sass (4.5.0) - sass (>= 3.2) foundation-rails (6.2.0.1) railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) @@ -459,7 +457,6 @@ DEPENDENCIES email_spec factory_girl_rails faker - font-awesome-sass (~> 4.5.0) foundation-rails foundation_rails_helper fuubar diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot index 7323d578fd97c45babb7d99ac69f377304b9e790..5fe0c1d3d094b8e011bd8776b56cf2100f7e7056 100644 GIT binary patch delta 781 zcmYjPPfXKL82{dD*N$#$_qQFgmC>!;SYXHoD+#b*1Wil?6O2K##8f~?I- zXcW2EQ`UlAs{w=lFQ|K`X71j!2XglS*bIQWJUwYm@Et8NCrA>j0x*Zzw1vhSGxOut z(~XyH0L%x()mdxVh81{=dJp2%oHaWsmG6H7(4HVSXU{JzK3*$52gvvlzXyUY-1c$R zb6x5?0v|;JV8?5t{;yJ~^Ij~@D^eis&Mw)xs=F5Vt?N5c4+Gdl_6Y#aZ@Nj^wqGzlLZ!a#H*9}$l>r^nWRHA@5{$qt z{8dFoR^(We=XfryWeX&0^pmn#?j>@`m7;&uSk(0?NSbB7XjX_>?(WJO?xVTAJckb6 zl*9ErMXm?dBYD&4?lLjbB$ZWn($Bm*0e-vZ<- z_y_A7`QMJ&&%nSK0py1z=Oz|#vpfT;XA%I4tx8WUF8KeSff=a21}M*wo>Q6Tnf_CO zfq_MWfkDRCoH6SI0|WCOAU`TMv7&&X zl3^=Q-U7&1$V<#k<+toS!@!^z0u;+D$S*E&Gr7pkz@T&l$lt-h2vh~c*+5^!^V@u7 z;AR2}Ffd%&Ys!yIGckb0Ie^sU)r@+KI+JfPUiJmr3RDEbGGK!k7?uEeAR}cMSQt8h zG#3L%3rMdYLoh=X(2pSC2xKQh*#EBq`5+w}li8TpFfwf3%*@RQRKNKEi>>TrOXW|j uCJed^hLa6cRGCe54JSva6ap# diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg index e272b9550..51044c3e2 100644 --- a/app/assets/fonts/icons.svg +++ b/app/assets/fonts/icons.svg @@ -48,4 +48,5 @@ + diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf index 4db54078da27f3f3a2e6576813fffc478c62c3e1..b0b1565817b71faba9fe7231ca4b2baec218a300 100644 GIT binary patch delta 767 zcmYL`PiWIn9LIm}rA@jtP5&p|)@EIrq+Quo*KW;VTT$F5!rX=%GNmYS&J|p@=n9)d zsO~0S#CjOhix&^FgE%}Zc<~|#0}(c_A`0FHdaA!v!51FyeZJrK`;y;#Z_hrSssjN4 zAKV27W+x}-&)u5d{sy4`LN$J7d}0zV0gL<@IXN?z%g-E^-vE#Wc%jSQCcL8Vw zwO7m5y4`GI66hb%_bjj6zHXn)+yiiF0Lo@%$-2hnx})eF;Vf1vOLfbYqi!t50MIJc z+9nUoPvn=#S69{+t!FzgdI6aC$mOcFX~P!0Mt>MNxoTCH{Kfkp0Mw_bt=enrwI|z! z=NKg*ziTyz4cfoU?koP$WAIWe132*5=sPR5g-2wJ^fgN4;G*tm&hNKoyj2abhvZyR z99-}aR{=agaSt#JvoHr+*s?QDwaEHQ&7$mPuvF^fZk zX~X$crCW@*&k>lsHhLQ;4NObmOv%@Dg34+Q%3RDz#{Jwm$D{XYCF)1L50V$?-86*9t zC51c)29$V@UN$m`&Tz2Ps120*^`5vAXq@jpb`L-w6dF^i&J6Sw8a4GMKH^t(fs*Wg eDODo8XQN`()-BtH#vLs|dKYa0kyj1_qTSKv5ZY7gsliNCq|_zXixw@DJ8E z^1mIkpMilf0>}?b&P^=fW_bow&m;g8Ta}(zT=4%t&?E+x8lXH!dQN4UXZlYC1_l-h z1_oK1jMT&wwi&CXfpT|%*eoL>wLXzWpNSQySp+Dcl95|d!Fih*XdvSTAU`1|KRI#X zj9DKT7?}3}`BAxv6$K2H3|oQn7C^p2USe)4zh&nc1_s3tpjci(esPJL$wh7k2BjlF z{tmF`fF8`=bbV7izs*+$ZYH2M28K&}P5B`-lPUisMq5Um$##sFeSy{hML}2wtdoIZ z36KX0AQ=W0h7KUj#lXS91cVF>ehk43RY1>zfFqEd2x0%f2IPZua7@l(TEob&S)7@h z5vYE%3X84m+QC4L((KVdBN4XGaxt>bI<_;A*#>p2{Wf`?6zf+as JK{(Nr9{_y5U@8Cr diff --git a/app/assets/fonts/icons.woff b/app/assets/fonts/icons.woff index 33d2d4dee85d5db357db665de1a95c7741bb1621..edcc9bc61d0fe59d992202df6dba2a316ddfd00d 100644 GIT binary patch delta 7679 zcmXw;WlS7Q*M=8gyx8Jeptwu1!WOqK?i6=-iga7t-CYV4cQ3lQJ1p*Qg%+oLJa6(% za{aik$(hN?Br`u|Ncc{a&b%e=a|*G%~e4L}Eg3{mIgd3AqYv-~T@s>h$(%^XaeUrQuj zb29*dQ1_?epQg2iiTSI$dv#2&2%vG&5?Q~>*QID)Gs!FT$WTs1Bx?tE?^pT$RVclp z2LvFUIhc6AE=U>lno<7;s|vu;#KGd#MZMAx+dtm9z#IgAs$**a|wL8Z=y6%RG&6GAD`lq z@)NFEn6VGU3Uk0`XP?|+$GLgV%I{R8UxqQWK z=P4c{^FpRja(43ly8p%c?YY>&dWN_C!Gw+|6(kC)c%ZKKE=EW6=272hwe~OC1-$KR z$yW=CDnDF<)_N!H(-0@KZ1m~o%x2m7Sit+`TY4*vDVl0c7Q7EELsd-aR8^kj{5`SU_%<7o9Wq-y*yVnQcTRnBrf(lH?z{!q3`iM)^uj2 zkk0FqK5*9W?mO>>uoYI)$o{<+eC-`Qify0OuuK#nfc|gKUj!Ee zHv?AN9e4JA93QBS!Z-&~w?}^`-`V=HcT$OiHo~Z5bHj3@awD7uAWqe%F-yj$kR9r1 z#f$s1+h3j6<9&svkry2&9q&B-O^FTef3re=J)Yk_Pdwh0S9SOd&QHw0_+Yz@zqH&G zF25j55L@z1f+ovpgL%BqgSGav>fK0Wf~K#mh4h(r zG4J(IXX4yqo8Ac%)T@s&XsTIgGL{vLL{u=bXewzQRYqmlNNJKP!?=(E?r58`DA<2B zNmWWmybJWCAl_|O?;m8$8XH$nn8iF$C%WaKx89H5z7|c*@7s6TVPxOumlaH0Y`J+w zmZ==5U2y^EEL+fn6p?z~?E9Nv?ZC(yHnx=gNX$gu^cX{)2$g__xXN8QA?>sw(A8}E zh>n;hd7>;hNci#rKGuK5`_pgoFx~u%ZDXCPmj>jTk54EglLI+p+1R5j5G*lBEF1`h z0xt17Y^ROdMj{w8%Sva61c?%vKwoPMW(U^dHjWQ4dXqF%4)n8g+TRaDFl6_74JIIk zn%9kpRE?tMKwz8kT;f0t^rzR)RK1bPMa3&VCGa$xfPy3ZV8tUKL)RkJnr(M2d_u#@ zC&ei4M8U8;5V?TkaKgO)y?T1-SOoN1LS|-o#_T7j!U8qKzxfYV*0-IT+I?mw6( zWXsOmCwovHmLyH}(%F?pUMei&S!2BaRJ3xNy6DlwpsA7&a51h`zqXq4W9K((!cRhX zsi}tz_QO4-)sH0|L9AUWw#16b3bni1`u>dA!g-f|;lywA-H#rQ?A@VR81A+j(uB*9 z!Q+?FlXcp{7WTq5;$Yq+Rc6g*3zcZ7F6yxi5gMVS=S$EzudJk30y{j;S=KBqA3;W@ zIvEQt1(7U4G!3-SNwGKvE$xOo>$r^S`IX`O znkME3IgcE@H}kJ>UUFy~X3To>^52vrNp%}$<>B)7fq=Okk>rUVnbX4vt8xsDKM9FG zS2BAfr$(wZeNJ+AeE$JeJc}Iz%SAM+Lb@a}v9Td!_nPWL`+Rl)&vDJjvUp5{2hM{11)RACzNo*m>GG^cBoSYz2jX zTG*3QR$6Z9Yg~l`qGNb9I5_8IfrZsh9@~X3RXeYckd(NKkEM}p{|BQv| zx4tKuCD+d%fzYkIeBlDggaeXkka83ajj;~xR>xLHbH|8WlQ9O#FT5s(1PW6r`F>Ot zK`B}Kp6bx9iKT?{mMOrXyS?kVL5(z1NlI}4jy?zTvV)2Nc*wUXSuUR#|&XYCry06i6p&ktx= z0}7JXahzS~=Y~p_6goz3gEy2f zJ-X&!2tcCkTY9?}6FG-G($zDilR(2SsFpo~elWWnsCcalXrd=v722gcYsZ98yj!4C z2GNY@CllfyKgIcsE{ek#RH|01lY!4@j99#CS~5rE!-ae8SUr12w@L?`kc1qj2upim zFv`^&yq68v3R;j;8x|yw3b>^ElHy=CvmK#k?{ zD7RdIDyh9t)hqvvL(KyZuc4DQ@Zljzf#nwoqX_UxMZcyaji?YP6sfgpB_oeyFac?1 zn9mA~951EHhL>_gb*z{s)cStV$8X|D!DW!sfN_&^qy+I(Rl^DNK>k_|^dv9vTw0S` zIq&S~mpWx?&cu;xawW+dLI`a%+J>bGq4hBII^OCyW-GmZzs$DcU@H z?k>9FxzSS|tyaAZ5;dij(fjbFxJTunhzSQz`V58CvA)yC#3_&WQu)SMIG9UdnOPHvAk+!1u&ZRu2gE6Z>ryd`e+#-qhlMOF&F z(;U!{P$QJuzx2}hl%iZtt$O}tU;yL~okCa;AS!)vG-l@b3l7H~aN3Vxvl#Yw79{sL ztP4}r+PIFZ;Y(~Ycz?xnyIK_5xq$n{Bp^3KK^x~Iet1)azGfg7sve!58PbFXM7eTv zGa3Fs#}Z9K9qcf=S@sT zd^}dL=x-p|m2!}SA>^E9iK}3lU zRMSaU(~DGF-GsnaY*uBU_{zP50fT8ih5Jco5#!`?KVhu+no(OG;BL$&oN9@W_Lp~U zr*mY8=v0_!B-++Y%I<_wI2`DX7>>m*op}BCg!{AU`LM!ad!FXp4YWsNC~s?$!3RH4 zxAUd`*>}`N+wb~BcYzf4)VjkJ<^m&`*0s?$7*uE2zYOt-@9zhpZY8*sE3&<>Pu;g9 z+~!{e);vm*@)a5^zchNK6W?lweCh#9tp#x(6c+)Rb z#wv1jf#r0rzta5R?8|u?96I_q^EeQSTTGqIEehb#_+gw<^Kf_+NIXkCn9C-P0_jOS zi?k!whB#Gy9sGy^l`-)+x$dc^b!3g%ja&Kb|5tOMNx5%j6cRGQlOXAZfY`_qzT33I z6thDRu``{RPyd!SZ??MFSaDa={_6bQK?t3JQ=ZBXae*GNqc8bU;k$zgLn@+@>!M2X zDNgQ*Ag>xcfl}FPS%uI|;15071J{$c9kfyd@?S6r;$rKPpqa$1m5xT2k|6bXM{15z z>v@pnV#eU+`wDFkBe8m>x|IpS{#lOfGoj!G)j35L2$K9Mc@g9Ki;_WoT1#;`e0Wvr z>n|=fDrW3RNeLE}?{(nfXr9U4nBtN_mguULdfz_7NzXJTt2*rr*70ymCck;39Q_O< zgG{mc5A#B2&@33`g(?V|AfBT?SsBZLGmdpbWhaUl+imu@r!@a)+K(ey@pqwfSa(|L zxrI;qULm=sk^uk+fa`wGa-CP&+ z!}M~<=xJtov?2kz%?0x~;-GVrBqsK-E8^AIKj^NO<8Vt7;W})zH@=_20@qJ}5&FQy?mau=EH96*E z@_oyK-dFV@kW@p6iZTE4QPAUx{edf*?ETHVBCfdQ32E=obyZOlkdAw#@Q`zv~@i21>lVELO(>KU8_+D+yO`(06dr0>ohR{iLcn1C3~$g|?N zv0VI-k31X^kZ%{pXfu~?EoR~VHA9EiC{m4WWCs_uJD*x<@!qG1p2&Ka&(?DsL{abo)sp%IJ=t^Ouz<7UOd3-oR=>AB6wNh3Q#y_Q8QJ%SUmU9hn03eo z%5B6#ku9oM*coqYdGPK4b9CP9y^E~VVUU`b-cz24(_;>hO(RRquI*=XLqf!tB7>xo zq6C#vP20vY9Xtgdy+{f8F6DY@n+N0)*~nI&ope^cv9zgyQ55??e^6^^+0_?YAg|Ok zN>*Sc&R`hNaE!qINyod9AyO`l(ZtdkD(ee!Q&<5!*=S4Dljf zxpZpY0B0_x8Si?tSF<^(TCOLyh%ZF1wakDk5`P^L|$RS7j)ib7_kX#OTUdGsRZL@=&U~MgWhWpwIk->0iuYG5t zgXL30c7ThVVmiz4rL1Cul-9^~x~-PfPH#)%4ez+p0aFtvTauP{U2nC59n-P>$sEu9 zK`ie|QI-+Q&S}0#_YaR>4jf&Ep)+$#tRFM{SvkV`W`$LW*de`SmE^h&Q9%VMkIgZP^K zmOlJ3e#=YiF&G`XC-RE~uWg1&rm76(SGEy`ub;Igs8iU2MH>a5Z0{PqwBsNYU)!~Q z8G`@mUCx)>@T`!Yv|pXC>3cmx&MS2a`UKmb!Kr5gnc1DMX?8dA*#w%(e&tun`OHU5 zf%QTsI)vJv>teL_G{P7p_);<+Mz%58;qf+!87=9dHxfNOK^mBY?Fg*G{eTvw%)G5C zU?2PviWw4+8&bQ`E3kB<9=@g@*aO|^_0^4Q1maBYCFJAC*$xo_*Rzg5oV_&R^ig~7?^+gyrKrHc2Zn@ z9s|KpF2o|{h~JYFTQ zR{e4^(Oj;tYGQR#g`BOzmu(%2!in6~-x%k2BfTdQ?w8SF(CEhAJpc0GW}xqS!mrD8 zo2(7LTv9afUeR%0iJzw~fm`*iv~cL}mDBA%(ddq0Xysn9*E{L)bHZrejbmIMO! zXzT~HdNbjRUE^SM+aW}6aKVoj$Hj~vN$BVL_ZTbIJ_6AwRpwXL1uRL!C%DcUqIC$W z{r+#YzLZ8GmNjiga?Gr9wDx^mv|o0Fl{D4~+$BUhDN{w5pT_do!|{K8Kx5Mj;N=>4 zH0Q@#CxzY_=z@+t;10K9gH7zs(={ri#?Y3D9)b~h8?Zw-m8(;;<@E#j1iTY@DScP$ zqf%uJOh7DM?9b4PzZ#*XpMD&Z^jzPJ511X|9ubHS~#%^1ROgOpK*8 zMH$>%?DWX4X3+n{@fSl@5q}z7{?EzZvi-E{`Sr>!by>h;QV%lQG}remD^JZrR<-R*7eA#Lp2mqNXAj=5g1Void|W z{kWL#jxI!-&oAL8XZKBmsSbfstUIqriy5N{gPm$QEH(^V@?D5PNNoI^sSWlg6-$p+ zs&J8KUi3gvxs3-UchFQp8&1YdNsW~f4s^MW`g!+TN>N+N_tXMvhQkodTv_{CZ$Cr3 zf-j{^^hBV3{76$wb4UgPwC~tsHvNQ^E^2i#70}&;S4lx}Zs?fkmg27T zv2}`=HozlqrP*up6iLrqsX}X2X($l!rbHZDC#=(&eylF(joZ=A>_PINd>nRN_+aw& z?BFbfQSdxaJSeVXFD0%&^HCrHVybkNv+Ek%TJ%pFzqQxAiu2CcncvF<5ECMfq|Q{?(I*!zT7`uI<0$ihSN!%Bt%4C z`dJc@U0NJOo6GLakb65?si%KvE%V10kEHml4QD@ij#X3JcGLkr`{tdszdEn=aDp|S zI*pn}LF%rnE|aagl!?i5HuO}1q}~%Xrl+lb!N7st<6wXPpk2|s-LiUT$85&O zBKgv;zbL$QxOG*jO=w+7$n2Zrfg$EnujS}y?s}M<)7l4~1xm%k>50HDAWNf1f4!?akRD;D6SXC(( zx})`Tu-oN~OV0Q@{VWde3t&LOV{L7uWlVOInMhGfYP%zG=RV>F#eTQf+txB6*xcml zfmw}2WeDYG83^8s-XnoV>GUcET{6t?o6K?Bt6Ph`qN?EJw`h`f8u0HspG2X; zd^gdq000#Lfc3xr9b#&2VO)gLu>>Nt4o6e@^$Fa@WB;!bgQDDDo66?b=vF0KU@cVC#9i?nd9U!aHW_hbHZoPUbEE01451t^ojG zDz5uyDs8RJt=`?>yJLKZ4>7Zn#P(gjyYu(_Ut3yuFb6E0t&@k(`+Ugn;`2LtNXu|1 zPUb%E1CnaJXT<-7Sq%U(cd~wWM(=s$eG(9+VDzYqv%AOp+63Mm);p8{H~@^#w{X7? zsiglrZJMhNAK3)Bh)|_j?<5>Yj#i1jjk#KpZVOb+55PEvq6@%+X_9OVijsjd+^eFA zxd(Ed^X;I{_D4a{Gvat);?#_u9xSPo%0hfSEeURezO>$)$p8b@h+y<$wrJnt@ry$k z+O0y9qNZlzTlX9I>}~xi;4WdSuG-M@!bgO2GKYM)f6LI~V&Tl`xt)!~)Nj4N+A#iT z+vVkH~2}T@Y#{hOX$|) zxOD*>WgPwDdtAIQQrDgELVMd>2ab9>YCgH= zcxMH_!s$B8MSh)$#4L?)TU@!9V9yx7J|+8%eseN*U3_~oR$N~s9SRqzab0>RQE{hM z;Y`V&t!!OiZUizb6VDkt8MBV$KG^i|Iy2+@ey}dg^Qo1eKWO(r3BAOvylZ9cRZFZ9 z?Be`38_WeR--JHDc6OEr99$Q?dSs7V__*-oD4&dN5a9|$7IcPM!UdFjn6`PRdJ&JK zq5Zo>FL}BvX1F|Ih^GpyUuY5Y1VzUnto z?Er2*d238Ox#y=?d`a%4XifUez(LFJhvB$>Z|jl;r^(L?!4rxDl|>*j+qRWJTpR|& z4B;ZC(8hjy=O4DIpdtYOOk7V*evXH44sYfxu{og6G$SsFc82x0{CF?lgyanWw)Y(- z#tF!M0MJS;Nlx;5c|&$+{uv`hoNj|9Q~)+}sJ$VCdlo3`;+Bw?3!K2}+u}g4<^92M z_~YoXvH4`HJ0B){e+?WMWI9`*X%#0=q#}sZl$J|1t|yIONQDORSn8hKh>rihqOO;g z!7?)2YVoC>TYuyaeB6hJ9xHRVj?{81W;CM)|N2gw#@8mQ^)q?u8L;S;v~jN9O9b?zR+jH zWLGg|OYvxHYRPKzR%Dh;86xn`M3->3B?Kb@_A!1_pnLq)wUj7g-j24%rr9LvI{4_& zn6|6YTB?!wuUg)g<>ipD>EvOC4)*ixJhCvSlCr*U+3j164xetVJTBt z-_B!tVS3HPwrUrYeTLHFRY_Ivrycq$QI=&HUq+4hl<}|SI;xJHU&Z93wgI^0BWzo6 z<9j@O+eB!_V2Ftn@bjbs)a$_)9*TwrVS!|7UoQW4^dBSJ+?RHQ~Ys;}_4R9{V@&y?<=1fLiE z;l?sKc@w6m5p;gz!1)=IY$dxah93+O)= zoj`(xE>~gZ+G;7>Q~UvQxP7;2SgrZ1B+8R++cxXibjW_vn~ex!4b9&bdQ_g0Bi8lS z+mVG|sI!O$L8iP~AyNWWVJRAQ4c;u6@(@23To7o0!#4C^CH_>iuyw8lp=5w z%{nzUO_^A0+cZ76O}!7MFX=?Q_-S-@>N}nxr}fGdk&SJT`lN%kX5Hk>WO~ben;r+>ZaZlq&z!PBXh$|XQ2=gQfe<>5|pc&XC>WarBrXV zv{;Zm2l!&+SK_dgZn=0J(w5mIsXFfhrGJb6mF4bkQoy*T=0_0)=gsB`K!>ZElAA|eErKQgZHXBV|1 z6;;8NHgn+5n7V_~+SoW`t5e3$1;KOb>c)NPY<(%8u~nfG6n#wl0)(<@7pWdvs=7Q1 zggjJjx}N?@JkMoiDSDeqkXg6zpO^S1NqA8Pj8pc^wEi2SF)fqo>0t>gYW5XBdH-VM zI(0^8X6XTGoxDD>l~%I-6&Ywg)WP-ED4KIw@*@G?HI_d9So2u=6fbE_dyj-+pUu)r z>zSTRI@E&NVtl2Pj2h_7XXXi?A%edGf`Q;nkGyUAaLwg+<$CDDyW zJO>vWpk4VHu4IrUyRR-!N-LW)PxCk|EF6L1C?I5bj8)9l%rNh8Z!V$)PFSWOdB+(S zC13D>G1PefFMV4fTuDrus_|}*qF%U*VJ&)yy_&hnD+yY^y>eCZ&yGRlTr=$;BuRYP z%aegnr_H9=bxVn29S=Psw%+hvM8U*@qQG3(r3r3*xA8r5cT0b7bGHN zhz*x=)gX;@&AdiEv5-6NAszKy^(qZ@iKP@kGOp8fB zaCvMGa1f(9gfz4{RR(|DEoftuNocbY#1`Aj5->RwQU=MFHlf~V#51^QLvMG~g9`+d zupucjA;MVJIoM{@5@H;m2&fA*wXO8=DpM$9Q@thsW;R_h&uA(YSwX~1=+gG)GPAcT zyA$u1<>KnI((munKTg11!}o0H z=#0xLOb7cX71YT|=;DNH_cXv?bkfr@VMy2a=Q*2q*sY$#4@p)dJYJImk;qQVyg2@X z0#L{G7KiQT7SXRn+G&yvSY`K!MFv61u|_RHN#TsJ>57N={Th-w+A_Q6&Ack=tnEnZ zr>NUzv9!N}Jz2F+TPgHnloY^>_0V%Nqu^pzL6o}&^+=4^7AuCI5H$u@9fAw0DdIdI<#neB3tG&6!P+Idi>kj;leP<#U?OI?r=Gn{xCGMsVcCn zk(R5VQ}V~?Bv@Kd)HogS@&}A08csi*W9g(99v?O&{s(zKT9_|T-LV~98p{&`45U3! ze>%qu5gTu+lS?iZz-G!X{L5z_t?`rgo^pIMqFy&MLTExMS%s9-i*uzX-%H8qJ+;C44{zF`*o-@&4h1-=l;Qr;srD2~T$!r$A@h}AGi ztsk+l#Men8yx32sD)<6RgL{J6#TYXJVgQcu)mlkqja; zxJR-Yr-ck0s~h9w9MGK!ixC1(4_3-U;6PJm zRLTD$mt@8VN)k=l5r@F??dCEU&B%SXWo46_Bn^|jtj<~m5Af7g_=Tz(T^@L(C+Iy8I1-t@L3l#@eu%AVKnb>hmDzgK~P zbNLXp+pRsTnifM4551{;VudFxgu+siqi8JolbeJi;@Q>U+)mS;aGuQdGDlVag<}gy zkbgaP&*-@%k$h0qf5S)f{vf`cU!}8C5$0OKyj`yKD`xm8Gf;Yw)zCVQy+g?d>5r0h z1q-?@Oo?&AnHiu`kaxbBL}#@mR`L)CUbR)z$e)q1ft)SpXhqr3r~@cH(5Gm5gQMp( zCHG3B@h=-0`wB%~B><$4(A3`_{uO>JO`fR|(w6fm{+OHjIO5q@GaGF%&p8T><2H7l zHDq%}WSCbwlrk>UUa2>18u5zOqbouaS)}mK9FaDeV4<0|31)c z(uxFJ=gWx0G(-)a^M#$Sa-&#NS1sHt@(FJWBYcZB)Jk>=^=i^9XJfPoVo?oZC5E<) z*Q$L&I36vGLBq-jGn&-}yf=s30ir9(_M{u0^!)!dV5_AvIvqBuf|eTlOi}iK?%?Pod(#w zb>7`}dz>9)m?%18uAwEkxa9i_gbr+Kh?55WVT(H+q5C+l+Bj!xYwAz~Cy3x+{qZU% zvLFxiipsY87b{Zi;cj$#XqWgNqe_t_jV`dYB`I%cBCe?+{&PUD!ks=F z18SCp%Pd75sqLOxVT}nMt`knjygUx}E2}Kild0YeJ6c9Ui z!Pok1L#8-iScPnNYurM~rFtZT|4Rg=@)yWzh6@LzMw_ioVBobnP_${*Lnx9Q)zawN z$SV9tV-x!)@S{o(15VK=F#G3Cs?U`7;R^x3_{2ncMR_B`(EI2J%$xY)<(x1Gv(3WGk4$pDb*)LR#VFL7;v@efO&mA`B*9|4b0{0E7eHucZZ#EnzPHp(O=k9h^ zm-$bhOjnlcWRjgd{6a96?Rb`k;`ItwH$I4(N3xy!a|&LP5|Sdnfq6uJBZlX>n;O0y z3Wa$;m)=Bu6d&#Egi}m~8y-5Bk}9#n4jF+uL93yA!LE$5q?Uhd?!m439QXP}Ps)y= zPU7Dex~52;z1jVf`WV?5x-Zvz#`n5I)=5hle6U*UooMU=ITw0_d}!eWHwCx~m(mF@ zAk=sM&y<8Kz0)${U}7=S=wlRTi}>1M1PZjr9!!uTdUqX@>(dnp8es<*t(=1rRc%@g zo|5p7v-r!d0DX=7bk%VoE1_MO2*q_={DzKNd9}83k6A$`o&2l$Jpj(-VXvQ>74=K~ z_pai{;zrPnLl%0q_luztCbT=8!(aG@&TR*9w|y>hwRjT=HVN(yw>Fzc`c6)lXZ`EkB!NsWF(rUe5i9hq*_+ zVTb3Tt0>#nxfgB2t}RqD`Gjvh9=GpPj0hJTNL!ts!r z@+c%D=pcHgpO?AJiW~OkdO-WyXur2;(y$j#*phyXqAklxr^Mpub8XGO!i#q-)Nu*H zzI|{ZoHu9jm+kpRL2G#BVR-kO0Xp|Dv7T}>aDEC4oCB;i4jWr=^Fey*_ZDE3!q*3I z45#9KP-&Em$=WFR_p`n+;%riHV~8M;zCt3p;{sW(kA@_PXN6xQJVS{we=Ev!NIH9& zDnoBy4}G9=)~>n=!E^D?PXbH?u4^RXCac)MX@s2gjn8oxp7klnXXuAU3fKse7Y0Lw z3+X4bV0%7$;^Pmxf<8b|stE_>A-U5NZL&21GjaPslrH%7X$(edGD!{E5K8UFdXWlp z8Jx}mq5ZgQ5e=7*5C0;%YWz)~K2U;T*7@g8A|#>p5o&gP-(-*A{WHS8@NKQ!6AplV zh+bTV$G+me)(V60hX{4vSlY>HGc&-Up$T(IV39f#SH-A4eEnW9^Q=Ap2ZYMwD3jtE z8PsKy)tgbo&yemXVGwN`11*g5jY=PKGLg~cRk91qE^36WMaXFd9^a8lrvfTV=6bQ| zKU)QAA=}xvlL=7z3;)}FsHADhE<4uvd` z3uHavJb26NOW80C6h$8)a0cmz2Cyax;8#XTej^`*y1v~D_r~De;=&}Y1w19k7&e~h z%hu&)^`-#AW>l6f4ZCsy;i>Vadh+m&UjiD#1P!>jK1}gZc9eER7v~ONEt;a7`tV0x zbvx7MG``w-5pY!FJL5~zldXAbJ0^Sp`CQ>{qHm(-Ep&7duLL=tFL4vTMseFHg2xo# z+}U!cvvhnv+Fa|v*$ftM*o;e;M0J>{@2l`J7;dW&NYB!K3@kJv3x{!Ig6UEr9QxTR zzXNb*;~Wn8RIDyzwZjuv4sZ5DjV-Ffp!XYwcLe&5V-GN7F_d(u^mrQhQEEwS=KP3v znQmD%U;Vm_8Xo4UArFC722%*70nAF*yE0f;?tVB!JBYa0J9F4tZb?I^>3|76lOA02 z{W7>UChbrjO9Xk2HDVWUU%0ZT&d3|23&lj@ciX$`(YtpKdbnDLxyER5+r)fpkri@m zp3Tj&!)JgX+$Jg!k_SK4fded&O6h)dpoxBEM!M_ShVRL#z?Ve+)KIB?1jbtF{oNl^(gx;=2!MzVFoIl=Xn~2LYFOcK$0(8n*eO{0 z>Jf+?WfCOJYEdcIxRCQL!Eyh+HT?;+{0s94sl-y5VXPyOojkLm7-%@lT@6Xw_}02u z;9W{-UTyf-&4{pUwsPC!K_*&5jj2h+JmyCsM0$eUQGt5%n2}^+rCru@6y#_!dD`JydZ#HPee3jd}6)`c&-Revi>sB-DdHB({ zhwLt^RHR|lD1iAYyLBr#ag=+udw&u4*A?=M7+MOU2-z2mBusKsu3# zbVL^8qgRzSpMe+y=jzlnF*_L|l^iT#=cWGaMg@{$kal}pqe^o3+oHW@>X~N1H{nyO jqwPA(P}lgE(j%mAATIa+&VY>sVjP<7`;T4%0O5ZCM~NL$ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 445af82fb..68065e82a 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -12,5 +12,3 @@ @import "annotator_overrides"; @import "jquery-ui/datepicker"; @import "datepicker_overrides"; -@import "font-awesome-sprockets"; -@import "font-awesome"; diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss index b13b09f46..2c06f745a 100644 --- a/app/assets/stylesheets/icons.scss +++ b/app/assets/stylesheets/icons.scss @@ -160,3 +160,6 @@ .icon-no-notification:before { content: "\78"; } +.icon-whatsapp:before { + content: "\50"; +} diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index a8ee508d6..afa0659e7 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -337,18 +337,20 @@ .debate-show, .proposal-show { - .social_share_full .social-share-button{ + .social-share-full .social-share-button{ display:inline; } - .whatsapp{ + .whatsapp:before{ + vertical-align: 10px; margin-left: 0.5px; color: white; - vertical-align: top; background-color: #43d854; - padding: 7px 9.5px 7px 9.5px; + padding: 9.5px 9.8px 9.5px 9.8px; + font-size: 1.7em; } + .edit-debate, .edit-proposal { margin-bottom: 0; } diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index 459561c10..4182fab9a 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -54,11 +54,11 @@

<%= t("debates.show.share") %>

-

<%= t("proposals.show.share") %>

-