From 2e4f32f10908dcbb5f10c78bd9600ec94c91d3ee Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Tue, 15 Sep 2015 14:19:36 +0200 Subject: [PATCH 1/3] Updates custom icons font --- app/assets/fonts/icons.eot | Bin 9140 -> 9296 bytes app/assets/fonts/icons.svg | 2 ++ app/assets/fonts/icons.ttf | Bin 8984 -> 9140 bytes app/assets/fonts/icons.woff | Bin 6860 -> 6984 bytes app/assets/stylesheets/icons.scss | 6 ++++++ 5 files changed, 8 insertions(+) diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot index f43277dfcdc8adcf7990659167d744793ab0d057..8515de027f04e76d7db898b6c3b8eff35d8f1ac1 100644 GIT binary patch delta 1514 zcmYjRU2GIp6h7zPJ9lPw+MSlp&UXL0JG2S!Wz6H93T z38;|-|Nk1v1tp5`hbBD6BCfcC!Y*agNb4+o+&&qlR0O;d(J&` z=A7@I*}g0N+E63F>`|>ErYm04(Y0e+Ck|CP0J#$YknCIEy8#{sN%$b)%-|!f#lh>F zzXrf32tPKudt^fW@Ht^d5RdH`**9_L4si0Hpao;c*rDw|U0@WC{{oPj-MMXKtM=rX zZdHS+!~gQFwC4-*8yed)Io^S-V0B1As)aap&)V+1nebk+}%lUeefdvXK;1H$i26P45(I%Xf*{5kcKQ|z=NFn zjlCkW884?!@tAs(pYCpfN8x4o1h?aP*2L!ce$gQM#T(*+xTT$uOn#_W=^gqmea;9O ztBonsHTRoSp(EAT!iDf;_{;FMnQ^fR`7pe$E@^(z(WNePSzp>nve3!buwuE=QR!lV zKoSMNP;MuUZj|mcQ%mIfN`A|(<*o5VBHp^Z>?U(d>rpU{bTQ5uXUGH-w3Kz7L~EhIE9xTZ4`rO8ZYg)Cul zl#l$wkz#vye+ zQbA4q6B#g#5XzuFQVqImW1$clT-Qaluz5URXel+f)W>4=EuhZ0Cs}P&^+nUzrglU( zJFP^f<8TTf-|n|lMt-4{scX?;5p7^mwXFU@G}KG=4+$=HrY_b$Kv2f|sTY!|!C1xS zkcT{8$LmnX%IqC=BKEBC3vIr-9jiE%j<%>?lZzrl`^_)(&Bj+&V*^IrTrtfYHxgBU$Nv=Bh@-2UiM-Gq8Bvks2PoC)fQdVjiC)3QT)T=}!p}uYCiUizpo5>ByM6R0T_XR}6J_b&c8f3?lAA_G$HX?FF}}k%vu#JQ zv~6+sw?e=(jGvx5RGvOY9OG07(EuJ?HPQQF0v!{Df2!(NH{`vj& zed@%m)6@)|uin5Vw)v8I6Vr#M>Qm<@FEH;6hx$H}bQ;Y(yNg+kBh9v^4zKB@(y{|XxYxEiYh7mG` zj1SC|dD8sYIurh->CvXQ8^`4?PXWV{0eCI@%ju5p$P=$szP}LA(YBN*pe_9PQOcwoVL>=IH0B*Sg2CHv0LzztM8c z4F%sXY-og>Q-E%YF2+{CPFjdn4IJ#}*w=vW$Hqf|5-iX-l!{7^yX!dsD$+SOL7%zr zdabVA)(#;F=8sI8|47)8OiUj;{C}+fR2Bccm6{vh-U=PjFu?$@6^WNFOC9;;aqcQX#=IVI80}Gzf%7va=Utqtf|$ zpbX}Iof>kv;}*DLMj$Lz3xop{PWJ~Q(r6_89S>PNskR2tvJLPwAR&zct=l=g0{==SY_k%Ql`2X@RM6L5S diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg index d15481e5b..492cc8d0b 100644 --- a/app/assets/fonts/icons.svg +++ b/app/assets/fonts/icons.svg @@ -38,4 +38,6 @@ + + diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf index 7a786cc38f4c95c7a2f933bcf9670b8acc1354c1..5f40432b1f444138b926a8c04bf8e257814f22bd 100644 GIT binary patch delta 1504 zcmYLJYiv|i5S}^b+}GarZkOJDZ+E-9-MxJX+wK#T7D{OgsG(M3R6t!yq1F}}s054= zgJJ|@LpW$iKok3e5F`Y%jWHULKbl4{B*esoNA$mmQGzjw7Uvcc&&i#+-J{GFtF+IsRMO3K>8$|#s=5+55N9f2|qP5 zS)G#KUm(l~;)$Kry;Jw@ktIk^(Sg2m;=qm{FEO&me+Fop8yl@|SDrc7OR}5vmB+?L z4^~BvDRh~Xpk-`wdcS^`Zzp__@X*BWk?Nk^hh1_JgF*JVrRWgs=)rh&DkS5|Dys zNJ3f;vDZYZIhmH9u(14vo$YOhP4Ft5!5#QHYi09%TExXV@s_wG?kML}roOM$X=QC( zo7X-1O8vAEFs6;uox-(vS>zLF#D5eD#G$89-(l-6^$9F8q8p( z#}p<uW;nk(ZZr1cHkR zqf9->N;&Ul<#^*VweMtKe^!;n#*}}|FxNP(tm_Ky9q?ZDheFdE4&5 zAsP2qP?1~x8w}lps+%5F*8Ho(9uMkV(?q@S@<=AzUTA9%g~OqCkXGOn^9AL{fdqER z?*d!w91OyH@DV_!=oHBzC!1rkCpavEaTb)vgX>Y3KLsBZT-BKD2t7h@JhYBVp)y$u zRlFQBkii>x0~%S09hLutUJy>U%aPB8D|V&a6$}&tm7M@SNKsujbcEBH$TOzkb%5Q6OIGPcft@`DG=rL4fUF@*{)tL&-+9FhRsx}k4 zN=)vKE#oAreHeR#+D6DsyvOf$QlO30kVK@asGKwp#Jg1LE)*y)#J{F4L%A=JXe3Op zkGYQrf2CmRp-Y}gqccR zx*{(&_Z?JpO;r?)ULl7r7{ROf0eGPiLX_itx#TNm)5(Ghfmf1BRI4==T(-%XQ?qmaf^cnj))W*3%<9jN*2LNect znNlI&oy39g39MVMH`F4K>xzh%&bkAOO`Tvt`ZuUQFkq}h? delta 1314 zcmYLJ>u(fQ6u;-(JCB`hcem~CZ1=%#J4QaHmw53`w zs6>oLEv7YuBSys-Us1k@==#-=5G{r;8bcyUi68s}{9qt4L{rZc6Yrh5bARWYd+vG8 zx4Yl1o);j5XcR9CDfU;ZhaQ_<7=1$s=WnK_ckddkiV>kRzQ?$2s*Tyf7USb9FjH^?%vom56c@G;Iw@ufk zj)#gD?()_*V0z}%>}mCpI>QD`GXKPibL`-Y)eqizBE0p12qKe(_$5BH_~?s6i8>@2VW2(1aWLtt;9v%WN`)-VQkqm!GcW*p00S7bf+{E@^;pAmd{>Yb zLOuTHMrflBjhYH0{S(Sdtx?wV;WLO0E%ncvRsn3I@0-`e?3E~SY&_QwM7g)XaUiW_ zy}oPT@W7x;n_8Uav8c7v>+JM)TG7CcF3;=QQJ-m<1GF>rFuDc~ksGU+Sl+-v?FSl* z?QH;5V1dptk{W#-+nz$u&;nB$hH6w{ne1@8d%L<@6N%Ptvg|9^Y||HZ77BFBJ{m8G zz2dU?Scs0IS7ggPHxKL4qe}b$W`P#sL&}dJ{Tkl~&E&Rj;lv=&vDQ5hrfaR0X09wL zIz$I7!IEgf63)^6)+aHKbR;B{W8`$h?u|!d z(cWmqHrOoN@LY-{HwDqo6|xw$WA+9*ocvSiv1pElQyqSy&ZI7~QAm1vIL_H-le&_e zc(xRkse@lSG{IM>`g`eD{p_=BCevs0#_r;UCHzv+biX)&p2=)b?50jvGe0l^X(pR( z(z*3euz&Ced)6p==##92eL%Oes{xGI<;c#;z>A9W#y~l#Iw(S)R zD7xM@V5)$jYnma5+V4XT%{g7Xe&fu7LvC)6PUSLQJ9jAe=1L#`*R4N|Ek5*H_Wysw G(Bi)gQ127~ diff --git a/app/assets/fonts/icons.woff b/app/assets/fonts/icons.woff index 0f52d3a5427d5728906187824d9d7c5b974bd3e7..e22db04bd60d8a3fcd205570ef0ec96ea30420dd 100644 GIT binary patch delta 6857 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 rq$u5|{ Date: Tue, 15 Sep 2015 14:19:56 +0200 Subject: [PATCH 2/3] Fixes proposal moderation --- app/assets/stylesheets/admin.scss | 6 ++++++ app/views/moderation/proposals/index.html.erb | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 378ff15c0..26c38f17a 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -203,6 +203,12 @@ body.admin { margin-left: rem-calc(12); } +.proposal-description { + height: rem-calc(60); + overflow: hidden; + max-width: rem-calc(750); +} + // 04. Stats // - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/views/moderation/proposals/index.html.erb b/app/views/moderation/proposals/index.html.erb index c7abaf18a..f8939932b 100644 --- a/app/views/moderation/proposals/index.html.erb +++ b/app/views/moderation/proposals/index.html.erb @@ -40,7 +40,7 @@  •  <%= proposal.author.username %>
-
+
<%= proposal.description %>
@@ -51,7 +51,6 @@ <% end %> - <%= submit_tag t('moderation.proposals.index.block_authors'), name: "block_authors", class: "button radius alert", From fd488092de77527c50d7417e60afe93f48319b46 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Tue, 15 Sep 2015 14:21:09 +0200 Subject: [PATCH 3/3] Adds styles for proposal percentage and attached --- app/assets/stylesheets/debates.scss | 10 +++- app/assets/stylesheets/proposals.scss | 79 ++++++++++++++++++++------- app/views/proposals/_votes.html.erb | 4 +- app/views/proposals/show.html.erb | 12 ++-- config/locales/en.yml | 2 + config/locales/es.yml | 2 + 6 files changed, 83 insertions(+), 26 deletions(-) diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss index cfd0fc323..23e7d3a55 100644 --- a/app/assets/stylesheets/debates.scss +++ b/app/assets/stylesheets/debates.scss @@ -467,11 +467,17 @@ } } + .debate-description { + font-size: rem-calc(15); + line-height: rem-calc(30); + } + ul, ol { + margin: rem-calc(12) 0; li { - font-size: rem-calc(13); - margin-bottom: rem-calc(12); + font-size: rem-calc(15); + margin-bottom: rem-calc(15); } } diff --git a/app/assets/stylesheets/proposals.scss b/app/assets/stylesheets/proposals.scss index 6a38a4efe..81eafc78e 100644 --- a/app/assets/stylesheets/proposals.scss +++ b/app/assets/stylesheets/proposals.scss @@ -39,6 +39,15 @@ } } + .percentage { + font-size: rem-calc(10); + color: $brand; + vertical-align: top; + position: absolute; + top: 17px; + right: 18px; + } + abbr { color: white; @@ -400,6 +409,10 @@ } } + h4 { + margin: rem-calc(12) 0; + } + .edit-proposal { margin-bottom: 0; } @@ -422,11 +435,17 @@ } } + .proposal-description { + font-size: rem-calc(15); + line-height: rem-calc(30); + } + ul, ol { + margin: rem-calc(12) 0; li { - font-size: rem-calc(13); - margin-bottom: rem-calc(12); + font-size: rem-calc(15); + margin-bottom: rem-calc(15); } } @@ -454,6 +473,45 @@ } } + blockquote { + margin-top: rem-calc(12); + padding-top: 0; + font-size: rem-calc(15); + line-height: rem-calc(30); + } + + .document-link { + border: 1px solid $border; + display: block; + margin-top: rem-calc(12); + padding: rem-calc(12); + position: relative; + + a { + padding-left: rem-calc(24); + } + + :before { + color: #007BB7; + content: "G"; + font-family: "icons" !important; + font-size: rem-calc(24); + left: rem-calc(6); + padding-top: rem-calc(3); + position: absolute; + top: 0; + } + } + + .video-link { + @extend .document-link; + + :before { + color: #CC181E; + content: "D"; + } + } + .supports { @include supports; border: 0; @@ -470,23 +528,6 @@ line-height: $line-height; padding: rem-calc(24); } - - @media (min-width: $small-breakpoint + em-calc(1)) and (max-width:$medium-breakpoint) { - .in-favor, .against { - text-align: left; - width: rem-calc(100); - } - } - - .divider { - display: none; - } - - @media (min-width: $medium-breakpoint) { - .divider { - display: inline-block; - } - } } .leave-comment { diff --git a/app/views/proposals/_votes.html.erb b/app/views/proposals/_votes.html.erb index 526b114d5..9443e548b 100644 --- a/app/views/proposals/_votes.html.erb +++ b/app/views/proposals/_votes.html.erb @@ -2,11 +2,13 @@
+ + <%= supports_percentage(proposal) %> / <%= t("proposals.proposal.total_percent") %> +
<%= t("proposals.proposal.supports", count: proposal.total_votes) %>  - (<%= supports_percentage(proposal) %>) "> <%= t("proposals.proposal.supports_necessary") %> diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index c85f3d2d9..6b4fa0bda 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -19,7 +19,6 @@
<% end %> -
<%= avatar_image(@proposal.author, seed: @proposal.author_id, size: 32, class: 'author-photo') %> @@ -53,6 +52,7 @@   <%= link_to t("proposals.show.comments", count: @proposal.comments_count), "#comments" %>  •  + <%= link_to t("proposals.show.code") %> <%= @proposal.code %>  •  @@ -60,16 +60,20 @@
-
<%= @proposal.summary %>
+
<%= @proposal.summary %>
<%= safe_html_with_links @proposal.description %> <% if @proposal.external_url.present? %> -
<%= text_with_links @proposal.external_url %>
+ <% end %> <% if @proposal.video_url.present? %> -
<%= text_with_links @proposal.video_url %>
+ <% end %>

<%= @proposal.question %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index dd0a9c4da..a8c0c8d70 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -171,6 +171,7 @@ en: other: "%{count} supports" supports_necessary: "53.726 necessary supports" census_percent: "2% of census" + total_percent: "100%" already_supported: "You already supported this proposal!" form: proposal_title: Proposal title @@ -191,6 +192,7 @@ en: show: back_link: Back author_deleted: Deleted user + code: "Proposal code:" comments_title: Comments comments: zero: No comments diff --git a/config/locales/es.yml b/config/locales/es.yml index f3c2a2f5e..8de1f4cc8 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -171,6 +171,7 @@ es: other: "%{count} apoyos" supports_necessary: "53.726 apoyos necesarios" census_percent: "2% del Censo" + total_percent: "100%" already_supported: "¡Ya has apoyado esta propuesta!" form: proposal_title: Título de la propuesta @@ -191,6 +192,7 @@ es: show: back_link: Volver author_deleted: Usuario eliminado + code: "Código de la propuesta:" comments_title: Comentarios comments: zero: Sin comentarios