From d6c7528df37448716a5bfbecf00e783a41a0155c Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 12 Aug 2015 15:26:46 +0200 Subject: [PATCH] Improves styles of debates show page --- app/assets/fonts/icons.eot | Bin 4036 -> 4172 bytes app/assets/fonts/icons.svg | 1 + app/assets/fonts/icons.ttf | Bin 3880 -> 4016 bytes app/assets/fonts/icons.woff | Bin 2920 -> 3040 bytes app/assets/stylesheets/debates.scss | 20 ++++++++++++++++---- app/assets/stylesheets/icons.scss | 3 +++ app/views/debates/show.html.erb | 25 ++++++++++++++++--------- config/locales/en.yml | 1 + config/locales/es.yml | 1 + 9 files changed, 38 insertions(+), 13 deletions(-) diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot index 0bb2d0d644deedf8be5f2befa4d3c91dccd279b6..72be3d3a44e933c5d6c2d78416a269ad0501c8b9 100644 GIT binary patch delta 646 zcmYjPO=}ZT6g}_FOwvs3%&19g>qnBtAwel=5={dt4W{3%Mif*;ks;Pv$QLA}>L$9# zqTr(CxsX;}^ap6P3gSXHQc&Ee6pA4D2aMg+O&9f&&Z3L=-Z|%<%YFC0_sRFwuS^<1 zV?pVco3%`RA(hXjR$c=7V*rOn28V`m1`gsC;{ME~NG!8;{WZX@62F|yTcrbAfrrG` zX^l@?<gfFWLuk z9VOnAx9*m31@jb7689IZ{FIiMqYCZsNGp_z1;%C8Vr&Z6?nm6^+n{aay zfNvZBuI)ZKT6){gAzrZK%n(1>4VD*4eu|l*!g~oX^EsxAsPsf^a7BEUI%S2fvGQBm zbk$^-FxeVgqnUWnMGONh#Z9thGmqGB9_7{V|{Fp4pZV*-;nhx5qb S0w5mfhiSCW^@HwRPxBw^7k+L4 delta 502 zcmYjNODIHP6#oAIK5{+ol?4_wqckR(JQgSx7GAMXL>3<1E{5jbnaL=utSuD&4J(m_ zQu0{Xu^>@0*~waJ8jD$&%}|_c?!w}n^L^hrf8T%3qyN^Y+!{b|OKFpjQ<0;sF2`!F zO94hPfU3Uko?di91@sT%{-Ke^mZ7hSGk}c~AF~`YUYV;|B>qA%5H=I>pC3px|3>|S zu)R7rdQklhNZo+;IX`R8$eI1LC}qC26?$<>Qvo|>nZ?`s6;0K;E{?ep#~3!L-|q6L z>CB#oLusIdIE%z%i6wT=uF2()`dwg@DUKqk<7uNaiy}?}@SJK|{$Dx%^n!d5C#-=P z;+0J@TeR~I2C>9Lgb(<-XqI+FhO6R1s + diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf index f69b18def69502806d382e2072346656bd3b690d..6da756d474faa6f78e9026ff49b7a63a4ef42da5 100644 GIT binary patch delta 642 zcmYL{J!n%=6vxlG?<3~LyccOw(;`jN^pQ{uNnUIku(i_Ev=t-;MJ4#bqsC@P(m+C5 zr|3|j;Lv)V+PH{=o6#zWgKiyMM5WL{2f@|i(hPQ}Cochqd++)E&%O72-1}mn>8k?* zfD`V60Q2eel}nZL+b;pMC#0U5nZA&Q36P1a#Dkg35hHVW<23+YC%(E+G|S#Y{{!MZ z8W$JMO8MxBZUU`9{$q=Udv{mg{@4T%W&xCPK4;#MApDAa-)SWB`CQ!;BTS;hZW4y` z#p;Uf7d|C!5{C*)3+9PW>Ib@Dn0TmYu9V>#tdl=UJXkV|IW@6H!JY3&E0vcjRn~_e zDS;6Ar>x?rz|~BB|F$-M01ienz?VO*Y-eSy>|>lj7e9wLvB(>E7InUdVX|emh8o{s z4SrhiiV_9fo)!-5brE#XaTj-~F>dH1f=LY8JaJFYnZS^Svd0}aCNU8_X$y?%ZViKD ziMZjz-bekZe*KM&u`MQxxW!z{`!#GT(ON`tX^xaKNB#jF?KavV$ZS(gF8{85b19Kp zR8dk6D|0x`$DM(oA4*nj03t}x=-LuE;CZ7@;RY(N236>Rrc{pckHX zZJG2PzM=N;pUzn!1_mEdL-v>vPKJ$WY?QC7ZeCKy_;b}yo!U`-GxJt5NRQ2|cq*~i c(%LM5MzcuVX?OdJ!RK2$f7|Q--nX*<0MXihN&o-= delta 439 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 W6eY-q{{I17G#Qd%uC$N}K>iDnsxamN delta 2757 zcmX|@c{tQ-8^?dsjFEjAA?su(OhXv^+E^lE&2FrX?1z{vjU^HtVMJtKvWGZBWan73 zM8u>+Mv*mZ($V|teXr|%uIuy1_wzi@eP7S>*S*BE#?2LOj>Vc=Tbly_69HfXz{Osh z&Lv91fZ~WJD)|Q%Yi$Mq3_9QrABaE*T5{dc;2IWmPGA-UK>}(3%-jm40JG_`3yxt{==M001%JJmB*pc)58303$o-q(PKnyTuy>P=Zba%)B6CFcj$=l;9sq z1f?}7gnmOugAo1Qh+sj+P%y*)3kwbiaP#*9-S5T=U=!b$x8yd00z<$vOm?9A-3SRl z0SGZK!Il~*aPy+DWTdK@X-qZ0Qg3o`(od*H5u;7qA9B)`Vg?+ogp;IyJ#f6~M zaLw$Hd;c7t%6BzcS=LFInVBic7vvYViUgH9p>GQM70 z>9Jjz3s5M+?Sui5yq6ifU|>q4VUGGL685xt@kuUcJ8-Qrx5}ACMrP+1-M8IuOnM}8 z$spt<`#y2R?`-DZ-s+X}B~^5l`b+hVHy~Qv=&}weAJWxF7YEMVNgs2eB{7>LLg^g^ zwklOV&oaxX`@V-^)wF+0w3`zf;2Tp!3}32pay|_kq4=KekBTseJYRNucKgkRt@5J` z%6X*e3$pG5S0<_Vu-7v2_ zqmdn3bFoFf|McrE!~i!t`bqde(8E%e@~i6>ot)pGq2YfS@U92P#@IJpxuU_ zs8wevvQ(|Zr-KH6Yf?oik5%p|L2DDsJLYYvYj*w=v=nw~Ho48+sdVeGX8j!YjW|_}Pdk|HYjm^gH&((i?d!da{Filg{wj`kXvzo5=J(7yZ4MbMSYKc{C>N~S) zYFlYM-E-g8WfO_|!`TRr5a`fALdeK*I!dIy>*=rZJ&D(>E%A$fDvR>UhWsnvu)+Dv zEibnSk{^%4@DG@CSE5?89uGIRY&VZYMpj51=aM5=|8Zz2^xO>LH)@aVh~Z$*L!0g> z*C@Yd<4X(Hw;D}4`-dP8=>|(9i$c3`M?z}OZD=c3%o^wyBY*q zbw`c-XWCh?9a_!#;whY(=$Ik5vk~E%EX0-V&!OZx-g-pRT>%4K-jm>S9BfcdxC;yoOAVwqUK-?W zN=mS0hiSx}_Ym}j1Y4n4nvhK7D~u&l#uXz|1u78`=9m}V_ z!Q(Yp2A)fVH@?xt70Q_eP{EwWGC)_VVq;~cAp z;Nl3ieV-eB`rU(fPYZkRr5c{SwBq0x4O^)|r#(Zmp4U(9kTlT_#Vu8uze=#jF7srV zTNujS(45iAR7FC*e>jewIJ|^BmaK5VlOFa#em$k54Zs5~yn9rVv@<$wcD{Pmr8{`P zo#n%L!?^UIp2+HsWTD^PMtIpx}D8Wc*erz6GY z`MjD{m7nvJ7gMzUX-WN4Ag@R>be3nkq^T3(Se0ApgIZs$@j+ds(+=RA2$jA;B`Lj1 zb&%bbo!gV0IFM~rWjFQEnZRVBk2|{e2YCKi?!4^1mbla|G@Q$>icSei9OLl{Figeh zSL>Iknc-xHg!$-bZdqPFX?^Ti+bQ9sBJBsuAq1s7nKk*tEtxQpfZoc9pI{cmy^ zuU*|Ir}R&eHmAC`MChN!8S1j+pLnXJ1uroh@MQdR8A*&9C43v@ZG!a&_$;K+N;NFi$y*Fpx!j_5 ze?j7f5E*<|93kf~LMBfbvdBt|qL4hYJ)^MFx9 zn=>Ou&#PDY&L97JPrGk=`zqQ^r=Uk@zCkaE$m+!@JLsW}WkR=wf}8VL@2s+4Vso z!wHVIjt%i0JBRVM(w@2vr7ydQZ8FGP6Bg
 <%= link_to t("debates.show.back_link"), debates_path, class: 'left back' %> + + <% if current_user && @debate.editable_by?(current_user) %> + <%= link_to edit_debate_path(@debate), :class => 'right' do %> + + <%= t("debates.show.edit_debate_link") %> + <% end %> + <% end %> + +

<%= @debate.title %>

@@ -12,23 +21,24 @@ <%= @debate.description %> <%= render 'shared/tags', debate: @debate %> - -

<%= social_share_button_tag(@debate.title) %>

@@ -45,8 +55,5 @@ <% end %> <%= render @debate.root_comments.recent %> - <% if current_user && @debate.editable_by?(current_user) %> - <%= link_to t("debates.show.edit_debate_link"), edit_debate_path(@debate), :class => 'button radius right' %> - <% end %> - + \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index b036f8125..eb4f53262 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -41,6 +41,7 @@ en: leave_comment: Write a comment login_to_comment: Log in to participate edit_debate_link: Edit + share: Share edit: editing: Edit debate show_link: Show debate diff --git a/config/locales/es.yml b/config/locales/es.yml index 7995483d4..2bd718f2f 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -41,6 +41,7 @@ es: leave_comment: Deja tu comentario login_to_comment: Entra para participar edit_debate_link: Editar + share: Compartir edit: editing: Editar debate show_link: Ver debate