From 5a8ad832406d586f337cb8bf2065179dc4e93418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Tue, 29 Sep 2015 22:40:19 +0200
Subject: [PATCH 01/37] fixes right titles in stats graphs

---
 app/views/admin/stats/show.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/stats/show.html.erb b/app/views/admin/stats/show.html.erb
index 31a0dbf2c..ae404f8ad 100644
--- a/app/views/admin/stats/show.html.erb
+++ b/app/views/admin/stats/show.html.erb
@@ -80,12 +80,12 @@
       </div>
 
       <div class="small-12 medium-6 left">
-        <h2><%= t "admin.stats.show.combined_title" %></h2>
+        <h2><%= t "admin.stats.show.visits_title" %></h2>
         <%= visits_chart_tag id: "visits" %>
       </div>
 
       <div class="small-12 medium-6 left">
-        <h2><%= t "admin.stats.show.visits_title" %></h2>
+        <h2><%= t "admin.stats.show.combined_title" %></h2>
         <%= events_chart_tag @event_types.keys, id: 'combined' %>
       </div>
 

From 87f42e578dce05a596f462a808b25440a21133af Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Wed, 30 Sep 2015 16:58:59 +0200
Subject: [PATCH 02/37] Updates custom icons font

---
 app/assets/fonts/icons.eot        | Bin 9296 -> 9892 bytes
 app/assets/fonts/icons.svg        |  68 +++++++++++++++---------------
 app/assets/fonts/icons.ttf        | Bin 9140 -> 9736 bytes
 app/assets/fonts/icons.woff       | Bin 6984 -> 7532 bytes
 app/assets/stylesheets/icons.scss |   7 +++
 5 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot
index 8515de027f04e76d7db898b6c3b8eff35d8f1ac1..de807c03aff000dbe35e2b5847f4682afd6088f3 100644
GIT binary patch
delta 1117
zcmYjQPiP!v6n}62&up^0P4-Wl-Ay*x&88Z)$tJt0#KzTaV<?&+5h+@b$?Uh2F|#w<
znOU1eap_SCp<yn9AUy;Wyoes`K~&I#LZr1`#GVAP7f(UK_F#OQc<8`y-uu1p_x^nI
zeRF4N?<Hxk1fZ05rK<3tvtQY*wTznwae(nZ0U-Or`3sA%3KH>s;`x=;Gv$?gm%j$U
zOT=F_T6+8E`mKimoItS;P2F!F9s*DL?`T~y?XBkZl^+%X_`d*#e_v;ML%eq5To}h}
zSABwimy$ju;VZUl=+|~OQzYCYzTDC`+tB8AX#FhlyrZ{Ry!zfR0AmDn+O8k`^YF9#
z0L3NZZv&EwP}%Q1cq8`A-w@#_0C0EuqnnRf4vyjqneY>Q3QOUy_-%I@hDbzHA0c~G
z4B&lYy|P&l;2p9W^wN6yOK=gkX`j94Ir8;m|L`91UWP(Q5OOdKBQOSe7=;29sh$8L
zeNCAZDhyJ^2=qaJ80FvOi!dI(%%{R#{^M{?s0*=p%=>&>_#)TkVH#%eHvR}{sy0C_
zW+$;i7|UUSkeJ8HXmX}pnJ83d=dqmRDN;U%1-z}+wF9lLs&$m=YV)r8jrx=Nm3jwX
zR2@xo)GxJ_743trs{R{l8l45ud_!;w|G@k37?fciY5?8A1)M3TOL7#`sboTm;Y6u2
zJ6ENy1?rkkji5YHJ>qg{5~XA!mBy4T$qO`O3{&N~*<9=S)%w7|NimzxMx#|u6#1d+
zBCl~L5|dLL&x`n4q_1ya`B@xM`ZG%l7k`@{p338uYHgm^rlL;|CeCWLOy*X<ponrZ
zsd1C_#`jT9N*1D}%A%LS^P{IP?Pac9sO{X4<?zhd0Y3v%VX<(Uo0$ri3x1a_Ih_oL
z9P%ijh!V=Epo$tsun+q&iZP7i2^_#dOkfgI@H(dPB%Z<{%wQICIE*8h$59-^f~GsB
z&7N$ySDpV|n>B;Tan!TS^*}lHJ8i{qTP@~v178lVT0y`(#n5f$G;~jHur)nkzSMDS
zYl8{BmuRdrV?$sKD-irZ_k@m589oaF%Q1bCLV>TgJ(sS(Zu|YNXX=i%tp}Ft_*Bnk
z0c-GqZt`r42~Ar!`y4m0n$~6GNFyIl6Nnyb+gnOgH`to%ZbVGi?QN)ScYMXB(L1`y
xB%kS?v97R98rsoq@hz*tT&3X}9okSJwmr)Ugf-hW!$@%$$HT{qnaCr5+kbu({5b#s

delta 491
zcmYk3ze`(D6vsdJy=Mq0Dy56~qDkLtnmSYztO^|(@Mo+|)K*PZ<PohuF!5m&v_l0q
zmw>$v9STBlC<-Dp(5)R@6^e_{Qs|%1#i@gygbrRf_nhxNKfdSOb2$8CAdqsQ<m?5W
zTE)&tZ0~tCvsH5+oR5Ir-_zU22m!&Hg2TzN*7oGD>F=N>1&?R4p06)X1RDa?{(_hH
zZ*DLp-j|2q!phd$t8a$XGyg!Sv^ek0Ri%&Ox?b7a!GGqQB%MlNYGpO!t=UULWbO-2
zWW7zFoKX;em*8;D%g)z!@BW5}_*Kqd&97VM)+Zsd#J`M^TO=0gEY8+FyQaF_5L|{z
z#k<<5G)hpEK2}eZtADDqw6IE0S?o$7C<rQ-w6Rzd9jv5?K|k+g!t#mZ{kJOA@=N#R
zHAEB5JRnR2M_cBO_RI!-V1CwvR{TrB`Wn(3&R?^Q4!!8cjJ6K_!ObUR3BqU4Loa>8
zF~A@RUNFo{lB8q@qrBoZLyR-QBx9s`!xYoZ;PQ|tF&^`X7W8biNjds`w6Xfm?6><-
BVyFNB

diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg
index 492cc8d0b..f2dc2b69c 100644
--- a/app/assets/fonts/icons.svg
+++ b/app/assets/fonts/icons.svg
@@ -7,37 +7,39 @@
 <font-face font-family="icons" units-per-em="512" ascent="480" descent="-32"/>
 <missing-glyph horiz-adv-x="512" />
 
-<glyph unicode="&#97;" d="M399 302c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3-2 0-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l15 15c1 1 4 2 6 2 3 0 5-1 7-2l112-113 112 113c2 1 4 2 7 2 2 0 5-1 6-2l15-15c2-2 3-4 3-6z"/>
-<glyph unicode="&#98;" d="M344 357c0-3-1-5-3-7l-112-112 112-113c2-1 3-4 3-6 0-3-1-5-3-7l-14-14c-2-2-5-3-7-3-2 0-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3 2 0 5-1 7-3l14-14c2-2 3-4 3-6z"/>
-<glyph unicode="&#99;" d="M335 238c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3-2 0-5 1-7 3l-14 14c-2 2-3 4-3 7 0 2 1 5 3 6l112 113-112 112c-2 2-3 4-3 7 0 2 1 4 3 6l14 14c2 2 5 3 7 3 2 0 5-1 7-3l133-133c2-2 3-4 3-6z"/>
-<glyph unicode="&#100;" d="M399 174c0-3-1-5-3-7l-15-14c-1-2-4-3-6-3-3 0-5 1-7 3l-112 112-112-112c-2-2-4-3-7-3-2 0-5 1-6 3l-15 14c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3 2 0 5-1 7-3l133-133c2-2 3-4 3-6z"/>
-<glyph unicode="&#101;" d="M201 402c-29 0-56-5-82-15-25-9-45-23-60-40-15-17-22-35-22-54 0-16 5-31 15-46 10-14 24-27 42-37l28-16-10-24c6 4 12 7 18 11l12 9 15-3c15-3 30-4 44-4 29 0 57 5 82 15 25 10 45 23 60 40 15 17 23 35 23 55 0 19-8 37-23 54-15 17-35 31-60 40-25 10-53 15-82 15z m0 37c37 0 70-7 101-20 31-13 56-31 73-53 18-22 27-47 27-73 0-27-9-51-27-74-17-22-42-40-73-53-31-13-64-20-101-20-16 0-33 2-50 5-24-17-50-29-80-37-6-1-15-3-24-4l-1 0c-2 0-4 0-6 2-2 2-3 4-3 6 0 1 0 1 0 2 0 1 0 1 0 2 0 0 0 1 0 1l1 2c0 0 0 0 1 1 1 1 1 2 1 2 0 0 1 0 1 1 1 1 2 2 2 2 1 1 3 3 6 7 4 3 6 6 8 8 1 2 3 5 6 8 3 4 5 8 7 11 2 4 4 8 6 13-24 14-42 31-56 51-13 20-20 41-20 64 0 26 9 51 27 73 18 22 42 40 73 53 31 13 65 20 101 20z m235-334c2-5 4-9 6-13 2-4 4-7 7-11 3-3 5-6 6-8 2-2 4-5 8-8 3-4 5-6 6-8 1 0 1 0 2-1 0-1 1-1 1-1 0-1 1-1 1-2 0 0 1-1 1-1l1-2c0 0 0 0 0-1 1-2 1-2 0-2 0 0 0-1 0-2 0-3-2-5-4-6-1-2-4-3-6-2-9 1-18 2-24 4-30 8-56 20-80 37-17-3-34-5-50-5-52 0-97 13-135 38 11-1 19-1 25-1 31 0 60 4 88 13 29 8 54 20 76 36 24 18 42 38 55 61 12 23 19 47 19 73 0 14-2 29-7 43 25-14 44-30 59-51 14-20 21-42 21-66 0-22-7-44-20-64-14-20-32-36-56-50z"/>
-<glyph unicode="&#102;" d="M481 395c-13-18-28-34-46-47 0-3 0-7 0-12 0-25-3-50-11-74-7-25-18-49-33-71-14-23-32-43-52-61-21-17-45-31-74-41-29-11-60-16-92-16-52 0-99 14-142 42 7-1 14-2 22-2 43 0 81 14 115 40-20 0-38 6-54 18-16 12-27 27-33 46 7-1 13-2 18-2 8 0 16 1 24 4-21 4-39 15-53 31-14 17-21 37-21 59l0 1c13-7 27-11 42-11-13 8-23 19-30 32-8 14-11 29-11 44 0 17 4 33 12 47 23-28 51-51 84-68 33-17 69-27 107-29-2 8-3 15-3 22 0 25 9 47 27 65 18 18 40 27 66 27 26 0 49-10 67-29 21 4 40 11 59 22-7-22-21-39-41-51 18 2 35 7 53 14z"/>
-<glyph unicode="&#103;" d="M55 37l402 0 0 292-402 0z m110 347l0 82c0 3-1 5-3 7-2 2-4 2-7 2l-18 0c-3 0-5 0-6-2-2-2-3-4-3-7l0-82c0-3 1-5 3-7 1-1 3-2 6-2l18 0c3 0 5 1 7 2 2 2 3 4 3 7z m219 0l0 82c0 3-1 5-3 7-1 2-3 2-6 2l-18 0c-3 0-5 0-7-2-2-2-3-4-3-7l0-82c0-3 1-5 3-7 2-1 4-2 7-2l18 0c3 0 5 1 6 2 2 2 3 4 3 7z m110 18l0-365c0-10-4-19-11-26-7-7-16-11-26-11l-402 0c-10 0-19 4-26 11-7 7-11 16-11 26l0 365c0 10 4 19 11 26 7 7 16 11 26 11l36 0 0 27c0 13 5 24 14 33 9 9 20 13 32 13l18 0c13 0 24-4 33-13 9-9 13-20 13-33l0-27 110 0 0 27c0 13 4 24 13 33 9 9 20 13 33 13l18 0c12 0 23-4 32-13 9-9 14-20 14-33l0-27 36 0c10 0 19-4 26-11 7-7 11-16 11-26z"/>
-<glyph unicode="&#105;" d="M453 425c-1 9-8 16-17 16l-360 0 0 0c-9 0-16-7-17-16l0 0 0-288 0 0c2-8 9-14 17-14l0 0 59 0 0-35c0-9 8-17 17-17 6 0 11 3 14 8l45 44 225 0c8 0 15 6 17 14l0 0 0 288z m-308-172c-15 0-29 12-29 34 0 25 13 47 34 61l0 0c1 1 1 1 2 1 1 0 1 0 2-1l0 0 14-9 0 0c1 0 1-1 1-3 0-1 0-2-2-3l0 0c0 0 0 0 0 0 0 0 0 0 0 0-10-6-22-19-25-31 2 1 4 1 7 1 13 0 23-10 23-24 0-14-12-26-27-26z m68 0c-15 0-29 12-29 34 0 25 13 47 34 61l0 0c0 1 1 1 2 1 0 0 1 0 2-1l0 0 14-9 0 0c1 0 1-1 1-3 0-1-1-2-2-3l0 0c0 0 0 0 0 0 0 0 0 0 0 0-11-6-22-19-25-31 1 1 4 1 7 1 12 0 22-10 22-24 0-14-12-26-26-26z m81-37l0 0c0 0-1-1-2-1 0 0-1 1-2 1l0 0-14 9 0 0c-1 1-1 2-1 3 0 1 1 3 2 3l0 0c0 0 0 0 0 0 0 0 0 0 0 0 11 6 22 20 25 31-1 0-4-1-7-1-12 0-22 10-22 24 0 15 12 27 26 27 15 0 29-13 29-34 0-25-13-48-34-62z m68 0l0 0c-1 0-1-1-2-1-1 0-1 1-2 1l0 0-14 9 0 0c-1 1-1 2-1 3 0 1 0 3 2 3l0 0c0 0 0 0 0 0 0 0 0 0 0 0 10 6 22 20 25 31-2 0-4-1-7-1-13 0-23 10-23 24 0 15 12 27 27 27 15 0 29-13 29-34 0-25-13-48-34-62z"/>
-<glyph unicode="&#106;" d="M91 347c0-5-1-9-5-12-4-4-8-6-13-6-5 0-9 2-13 6-3 3-5 7-5 12 0 6 2 10 5 13 4 4 8 6 13 6 5 0 9-2 13-6 4-3 5-7 5-13z m46-146l0 183c0 5-2 9-5 13-4 3-8 5-13 5l-82 0c-5 0-10-2-13-5-4-4-6-8-6-13l0-183c0-5 2-9 6-13 3-3 8-5 13-5l82 0c5 0 9 2 13 5 3 4 5 8 5 13z m323 43c10-12 15-26 15-43 0-15-5-28-16-38-11-11-24-17-38-17l-80 0c1-2 2-5 3-7 0-1 2-4 3-6 1-2 2-4 3-5 3-7 6-12 7-16 2-4 4-10 6-17 2-7 3-15 3-22 0-4 0-8 0-11-1-3-1-7-2-13-1-6-2-10-3-14-2-4-4-8-7-13-3-5-7-9-12-12-4-3-10-5-17-7-7-2-15-3-23-3-5 0-10 2-13 5-4 4-7 9-10 15-3 5-4 10-5 15-1 4-3 10-4 17-2 8-3 14-4 17-1 4-2 8-5 14-2 6-5 10-9 14-6 6-16 18-29 34-9 12-19 24-28 35-10 11-18 16-22 17-5 0-9 2-12 5-4 4-6 8-6 13l0 183c0 5 2 9 6 13 3 3 8 5 13 5 6 0 21 5 45 13 15 5 26 9 34 11 9 3 20 5 35 8 15 3 29 5 41 5l37 0c25-1 44-8 56-22 11-14 16-31 14-52 8-7 13-16 16-27 3-12 3-23 0-33 8-12 13-25 12-40 0-6-1-13-4-21z"/>
-<glyph unicode="&#107;" d="M91 128c0 5-1 9-5 13-4 3-8 5-13 5-5 0-9-2-13-5-3-4-5-8-5-13 0-5 2-9 5-13 4-4 8-5 13-5 5 0 9 1 13 5 4 4 5 8 5 13z m46 146l0-183c0-5-2-9-5-12-4-4-8-6-13-6l-82 0c-5 0-10 2-13 6-4 3-6 7-6 12l0 183c0 5 2 10 6 13 3 4 8 6 13 6l82 0c5 0 9-2 13-6 3-3 5-8 5-13z m338 0c0-16-5-30-15-42 3-9 4-16 4-22 1-14-4-28-12-39 3-11 3-22 0-34-3-10-8-19-16-26 2-22-3-39-14-52-12-15-31-22-56-22l-37 0c-12 0-26 1-41 4-15 3-26 6-35 8-8 3-19 7-34 12-24 8-39 12-45 12-5 0-10 2-13 6-4 3-6 7-6 12l0 184c0 4 2 8 6 12 3 4 7 5 12 6 4 0 12 6 22 17 9 11 19 22 28 34 13 17 23 28 29 35 4 3 7 8 9 13 3 6 4 11 5 14 1 4 2 9 4 17 1 8 3 14 4 18 1 4 2 9 5 15 3 5 6 10 10 14 3 4 8 5 13 5 8 0 16-1 23-3 7-2 13-4 17-7 5-3 9-7 12-12 3-4 5-9 7-12 1-4 2-9 3-15 1-5 1-10 2-13 0-2 0-6 0-11 0-7-1-14-3-21-2-8-4-13-5-18-2-4-5-9-8-16-1-1-2-2-3-5-1-2-3-4-3-6-1-2-2-4-3-7l80 0c14 0 27-5 38-16 11-11 16-24 16-39z"/>
-<glyph unicode="&#108;" d="M477 350c0-7-2-14-8-19l-206-207-39-39c-6-5-12-8-20-8-7 0-14 3-19 8l-142 142c-6 6-8 12-8 20 0 7 2 14 8 19l38 39c6 5 12 8 20 8 7 0 14-3 19-8l84-84 188 188c5 5 12 8 19 8 8 0 14-3 20-8l38-39c6-6 8-12 8-20z"/>
-<glyph unicode="&#109;" d="M140 73l26 26-67 67-26-26 0-30 37 0 0-37z m150 265c0 4-2 7-7 7-1 0-3-1-4-2l-155-155c-2-2-2-3-2-5 0-4 2-6 6-6 2 0 4 0 5 2l155 154c1 2 2 3 2 5z m-16 55l119-119-238-237-118 0 0 118z m195-27c0-10-3-19-10-26l-48-47-118 118 47 48c7 7 15 10 26 10 10 0 18-3 26-10l67-67c7-8 10-16 10-26z"/>
-<glyph unicode="&#110;" d="M494 327c0-4-3-9-8-14l-103-101 24-143c0-1 0-3 0-5 0-4-1-8-3-10-2-3-4-5-8-5-4 0-8 2-12 4l-128 67-128-67c-4-2-8-4-12-4-4 0-7 2-9 5-2 2-3 6-3 10 0 1 0 3 1 5l24 143-104 101c-4 6-7 10-7 14 0 7 6 12 16 13l144 21 64 130c4 8 8 12 14 12 6 0 10-4 14-12l64-130 144-21c10-1 16-6 16-13z"/>
-<glyph unicode="&#111;" d="M410 203l-80 38-34 16c15 9 27 24 35 41 6 14 10 29 10 46 0 9-1 18-4 27-10 41-42 72-81 72-38 0-70-30-81-70-2-9-4-19-4-29 0-18 4-34 11-49 8-16 20-30 35-39l-32-15-83-38c-7-4-12-12-12-21l0-91c0-12 8-22 19-22l294 0c11 0 19 10 19 22l0 91c0 9-4 17-12 21z"/>
-<glyph unicode="&#113;" d="M329 256c0 20-7 37-21 52-15 14-32 21-52 21-20 0-37-7-52-21-14-15-21-32-21-52 0-20 7-37 21-52 15-14 32-21 52-21 20 0 37 7 52 21 14 15 21 32 21 52z m146 31l0-63c0-3 0-5-2-7-1-2-3-3-6-4l-52-8c-4-10-8-19-12-26 7-9 17-22 31-39 2-2 3-5 3-7 0-3-1-5-3-7-5-7-14-17-28-31-14-13-23-20-27-20-2 0-5 1-7 3l-40 31c-8-5-17-8-26-11-3-26-6-44-8-53-1-6-5-8-10-8l-64 0c-2 0-5 0-7 2-2 2-3 4-3 6l-8 53c-9 3-18 6-26 10l-40-30c-2-2-4-3-7-3-3 0-5 1-7 3-24 22-40 38-47 48-2 2-2 4-2 7 0 2 0 4 2 6 3 4 8 11 14 19 7 9 12 16 16 21-5 9-9 19-12 28l-52 8c-3 0-5 1-6 3-2 2-2 4-2 7l0 63c0 3 0 5 2 7 1 2 3 3 5 4l53 8c3 8 7 17 12 26-8 11-18 24-31 39-2 3-3 5-3 7 0 2 1 4 3 7 5 7 14 17 28 30 14 14 23 21 27 21 2 0 5-1 7-3l40-31c8 5 17 8 26 11 3 26 6 44 8 53 1 6 5 8 10 8l64 0c2 0 5 0 7-2 2-2 3-4 3-6l8-53c9-3 18-6 26-10l40 30c2 2 4 3 7 3 3 0 5-1 7-3 25-23 41-39 47-49 2-1 2-3 2-6 0-2 0-4-2-6-3-4-8-11-14-19-7-9-12-16-16-21 5-9 9-18 12-28l52-8c3 0 5-1 6-3 2-2 2-4 2-7z"/>
-<glyph unicode="&#114;" d="M17 222c-14 4-20 13-16 29 3 14 12 20 27 16 0 0 50-12 50-12 0 0-26-41-26-41 0 0-35 8-35 8m455-6c4 4 10 6 16 6 7-1 12-3 16-8 11-11 11-22-1-33 0 0-128-115-128-115-5-4-10-6-16-6-5 0-9 2-14 5 0 0-146 112-146 112 0 0-28 8-28 8 0 0 26 40 26 40 0 0 18-4 18-4 4-1 7-2 8-4 0 0 135-104 135-104 0 0 114 103 114 103m-251 112c0 0-178-280-178-280-4-8-11-12-20-12-4 0-8 2-12 5-5 3-9 8-10 14-1 7 0 12 3 17 0 0 191 300 191 300 3 6 7 9 14 11 6 2 12 1 19-3 0 0 125-80 125-80 0 0 115 166 115 166 4 6 9 9 15 10 6 1 12-1 17-5 13-8 15-18 6-31 0 0-128-185-128-185-9-12-19-14-32-6 0 0-125 79-125 79"/>
-<glyph unicode="&#104;" d="M411 415l0 0 0 0c3 3 3 8 0 11l-10 10c-3 3-8 3-11 0l0 0-45-45c-3-3-3-7 0-10l11-11 0 0c2-3 7-3 10 0z m-162-2l0 0 14 0 0 0c4 0 8 3 8 7l0 0 0 64c0 5-3 8-8 8l0 0-14 0 0 0c-5 0-8-3-8-8l0-64 0 0c0-4 4-7 8-7z m220-106c0 4-3 7-7 8l0 0-64 0c-4 0-8-4-8-8l0-15c0-4 4-7 8-7l64 0 0 0c4 0 7 3 7 7z m-213 81c-60 0-109-49-109-109 0-23 8-45 20-63l0 0c17-25 27-59 27-96 2-2 4-4 7-4 0 0 0 0 1 0l0 0 108 0 0 0c0 0 1 0 1 0 3 0 5 2 7 5 0 38 12 73 29 99 11 17 18 37 18 59 0 60-49 109-109 109z m55-336c0 0-1 0-1 0l0 0-108 0 0 0c-1 0-1 0-1 0-4 0-8-3-8-7l0-17c0-5 4-8 8-8 0 0 0 0 1 0l0 0 108 0 0 0c0 0 1 0 1 0 4 0 7 3 7 8l0 17c0 4-3 7-7 7z m0 49c0 0-1 0-1 0l0 0-108 0 0 0c-1 0-1 0-1 0-4 0-7-4-8-8 0 0 0 0 0 0l0-17c0-4 4-8 8-8 0 0 0 0 1 1l0-1 108 0 0 1c0-1 1-1 1-1 4 0 7 4 7 8l0 17c0 4-3 8-7 8z m-197 208l0 0-64 0c-4 0-7-3-7-8l0-14c0-5 3-8 7-8l64 0 0 0c4 0 8 4 8 8l0 14c0 4-4 8-8 8z m-11 109l46-46 0 0c3-2 7-2 10 1l0 0 11 10c2 3 2 8 0 10l0 0-46 46c-2 3-7 3-10 0l-11-11c-2-3-2-7 0-10z"/>
-<glyph unicode="&#115;" d="M492 217l-83 40c20 12 33 36 33 63 0 40-28 72-62 72-12 0-23-4-32-11 6-14 9-29 9-46 0-24-7-48-20-67 4-5 9-9 15-12l0 0 53-25c15-8 25-24 25-41l0-70 57 0c7 0 14 7 14 16l0 66c0 7-4 13-9 15z m-330 40c4 3 8 6 12 10-13 19-21 43-21 68 0 17 4 33 10 47-10 6-20 10-31 10-34 0-62-32-62-72 0-28 14-52 34-64l-84-39c-5-2-9-8-9-15l0-66c0-9 7-16 14-16l55 0 0 70c0 17 10 34 26 41z m232-49l-72 34-31 15c14 8 25 21 32 37 5 12 9 26 9 41 0 9-2 17-4 24-9 38-38 65-73 65-34 0-63-26-73-63-2-8-3-17-3-26 0-16 3-31 10-44 7-14 18-27 31-35l-29-13-75-35c-6-3-10-10-10-18l0-82c0-11 7-20 17-20l264 0c10 0 18 9 18 20l0 82c0 8-5 15-11 18z"/>
-<glyph unicode="&#116;" d="M256 448c-106 0-192-86-192-192 0-106 86-192 192-192 106 0 192 86 192 192 0 106-86 192-192 192z m0-333c-78 0-141 63-141 141 0 34 12 66 33 90l198-198c-24-21-56-33-90-33z m108 51l-198 198c24 21 56 33 90 33 78 0 141-63 141-141 0-34-12-66-33-90z"/>
-<glyph unicode="&#117;" d="M165 384c0 10-4 19-11 26-7 7-16 11-26 11-10 0-19-4-26-11-7-7-11-16-11-26 0-10 4-19 11-26 7-7 16-11 26-11 10 0 19 4 26 11 7 7 11 16 11 26z m304-165c0-10-3-18-10-25l-140-141c-8-7-17-10-26-10-11 0-19 3-26 10l-204 205c-8 7-14 16-19 29-5 12-7 23-7 33l0 119c0 10 3 18 10 26 8 7 16 10 26 10l119 0c10 0 21-2 33-7 13-5 22-11 30-19l204-204c7-7 10-16 10-26z"/>
-<glyph unicode="&#112;" d="M475 238c-29 45-65 78-108 101 11-20 17-42 17-65 0-35-13-65-38-90-25-25-55-38-90-38-35 0-65 13-90 38-25 25-38 55-38 90 0 23 6 45 17 65-43-23-79-56-108-101 25-39 57-70 95-94 38-23 79-34 124-34 45 0 86 11 124 34 38 24 70 55 95 94z m-205 109c0 4-2 7-4 10-3 3-6 4-10 4-24 0-44-8-61-25-17-17-26-38-26-62 0-4 1-7 4-9 3-3 6-4 10-4 4 0 7 1 10 4 2 2 4 5 4 9 0 17 5 31 17 42 12 12 26 18 42 18 4 0 7 1 10 4 2 2 4 6 4 9z m242-109c0-7-2-13-6-20-26-44-62-79-107-105-45-27-93-40-143-40-50 0-98 13-143 40-45 26-81 61-107 105-4 7-6 13-6 20 0 6 2 13 6 19 26 44 62 79 107 106 45 26 93 39 143 39 50 0 98-13 143-39 45-27 81-62 107-106 4-6 6-13 6-19z"/>
-<glyph unicode="&#118;" d="M426 134c0-7-3-14-8-19l-39-39c-5-5-12-8-20-8-7 0-14 3-19 8l-84 84-84-84c-5-5-12-8-19-8-8 0-15 3-20 8l-39 39c-5 5-8 12-8 19 0 8 3 14 8 20l84 84-84 84c-5 5-8 12-8 19 0 8 3 14 8 20l39 38c5 6 12 8 20 8 7 0 14-2 19-8l84-84 84 84c5 6 12 8 19 8 8 0 15-2 20-8l39-38c5-6 8-12 8-20 0-7-3-14-8-19l-84-84 84-84c5-6 8-12 8-20z"/>
-<glyph unicode="&#119;" d="M434 389c-1 0-2 0-3 0l0 0c-17-9-37-14-58-14-38 0-73 17-95 45-21 19-49 31-80 31-29 0-56-11-77-29-4 9-13 15-24 15-15 0-27-12-27-27l0-322c0-15 12-27 27-27 15 0 27 12 27 27l0 145c17 9 36 13 56 13 39 0 73-17 96-45 21-19 49-31 79-31 33 0 63 14 84 36 2 2 3 4 3 6l0 169c0 5-4 8-8 8z"/>
-<glyph unicode="&#120;" d="M261 27c0 3-2 5-5 5-11 0-21 4-29 12-8 8-12 18-12 29 0 3-2 5-5 5-3 0-4-2-4-5 0-14 5-26 14-35 10-10 22-15 36-15 3 0 5 1 5 4z m-190 83l370 0c-31 34-54 73-70 117-16 44-24 90-24 139 0 48-30 73-91 73-61 0-91-25-91-73 0-49-8-95-24-139-16-44-39-83-70-117z m423 0c0-10-4-19-11-26-7-7-16-11-26-11l-128 0c0-20-7-37-21-52-15-14-32-21-52-21-20 0-37 7-52 21-14 15-21 32-21 52l-128 0c-10 0-19 4-26 11-7 7-11 16-11 26 36 30 64 68 82 113 19 45 28 93 28 143 0 31 9 56 27 75 19 18 44 29 76 33-2 3-2 7-2 11 0 7 2 14 8 19 5 5 11 8 19 8 8 0 14-3 19-8 6-5 8-12 8-19 0-4 0-8-2-11 32-4 57-15 76-33 18-19 27-44 27-75 0-50 9-98 28-143 18-45 46-83 82-113z"/>
-<glyph unicode="&#121;" d="M256 402c-39 0-75-6-109-20-34-13-61-31-81-53-19-23-29-47-29-73 0-21 6-42 20-61 14-19 33-36 58-50l24-14-7-28c-5-17-12-34-20-49 29 12 55 28 78 49l13 11 16-2c13-2 25-2 37-2 39 0 75 6 109 20 34 13 61 31 81 53 19 23 29 47 29 73 0 26-10 50-29 73-20 22-47 40-81 53-34 14-70 20-109 20z m256-146c0-33-11-64-34-92-23-28-54-50-93-66-40-17-83-25-129-25-13 0-27 1-41 2-38-33-82-56-132-69-9-2-20-4-32-6l-2 0c-3 0-5 1-8 3-2 2-3 5-4 8l0 0c-1 1-1 2 0 4 0 1 0 2 0 2 0 1 1 2 2 3l1 3c0 0 1 1 2 2 2 2 2 3 3 3 1 1 4 5 8 10 5 5 8 8 10 10 2 3 5 6 9 12 4 5 7 10 9 14 3 5 5 10 8 17 3 7 5 14 8 22-30 17-54 38-71 63-17 25-26 51-26 80 0 33 11 64 34 92 23 28 54 50 93 66 40 17 83 25 129 25 46 0 89-8 129-25 39-16 70-38 93-66 23-28 34-59 34-92z"/>
-<glyph unicode="&#122;" d="M183 203l0-20c0-8-4-14-11-17-3-1-5-1-7-1-6 0-10 1-13 5l-147 146c-3 4-5 8-5 13 0 5 2 9 5 13l147 146c5 6 12 8 20 4 7-3 11-9 11-17l0-19-114-114c-3-4-5-8-5-13 0-5 2-9 5-13z m329-11c0-11-2-24-5-38-3-15-7-28-11-40-4-11-9-23-14-35-5-12-8-21-11-26l-6-12c-1-3-4-4-8-4-1 0-2 0-2 0-5 1-7 5-7 10 8 76-2 130-30 161-12 14-29 24-49 32-20 7-46 12-76 15l0-72c0-8-4-14-12-17-2-1-4-1-7-1-5 0-9 1-13 5l-146 146c-3 4-5 8-5 13 0 5 2 9 5 13l146 146c6 6 13 8 20 4 8-3 12-9 12-17l0-74c78-6 135-27 171-64 32-33 48-81 48-145z"/>
-<glyph unicode="&#65;" d="M292 353l74 0-9-81-65 0 0-235-97 0 0 235-49 0 0 81 49 0 0 49c0 35 8 61 24 79 17 18 44 26 81 26l65 0 0-81-40 0c-8 0-14 0-18-2-5-1-8-3-10-6-2-4-3-7-4-10 0-3-1-8-1-14z"/>
-<glyph unicode="&#66;" d="M269 93c0 4-1 8-2 12-1 4-1 7-2 10-1 3-3 7-5 10-3 4-5 6-6 9-2 2-5 5-8 8-3 4-6 6-8 8-2 1-5 4-9 7-4 3-7 5-9 6-1 2-5 4-9 7-5 3-8 5-9 6-3 0-8 1-14 1-11 0-21-1-31-2-9-2-20-4-30-8-11-3-20-7-28-13-8-5-15-12-20-21-5-9-8-19-8-31 0-13 4-24 10-34 7-11 16-19 27-24 11-6 22-11 34-13 12-3 24-5 37-5 11 0 22 1 32 4 10 2 19 6 28 11 9 5 16 12 22 21 5 9 8 19 8 31z m-35 247c0 11-1 23-4 36-4 13-8 25-14 37-6 12-14 22-24 30-10 8-21 12-34 12-18 0-31-7-41-20-10-13-15-29-15-47 0-9 1-18 4-28 2-10 5-20 10-30 4-10 10-19 16-27 6-8 13-14 22-19 9-5 18-7 28-7 18 0 32 5 40 17 8 11 12 27 12 46z m-37 135l125 0-39-22-38 0c13-9 24-21 31-36 7-16 11-32 11-48 0-15-2-27-6-38-5-11-10-20-16-26-7-7-13-13-19-19-7-5-12-11-16-17-5-6-7-13-7-20 0-5 2-9 5-14 3-5 7-9 12-14 5-4 11-9 17-14 6-4 12-10 18-15 6-6 12-13 17-19 5-7 9-15 12-25 3-9 5-19 5-30 0-30-13-57-40-81-29-25-69-37-120-37-11 0-23 1-34 3-12 2-23 5-35 9-12 5-22 10-31 17-9 7-16 15-22 25-6 11-9 22-9 35 0 12 4 25 11 39 6 12 15 22 27 31 12 9 26 16 42 21 15 4 30 8 44 10 14 2 28 3 43 4-12 16-18 30-18 42 0 3 0 5 0 7 1 2 1 4 2 6 0 1 1 3 2 6 1 2 1 4 2 6-8-1-14-2-20-2-29 0-53 10-73 28-20 19-31 43-31 71 0 26 9 50 28 71 18 21 40 35 66 41 18 4 36 5 54 5z m297-73l0-36-73 0 0-73-37 0 0 73-73 0 0 36 73 0 0 73 37 0 0-73z"/>
-<glyph unicode="&#67;" d="M256 475c40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110 0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29z m78-148c0-1-1-2-2-3-2-2-3-3-4-3 0 0 1 1 1 2 0 1 1 2 1 3 1 1 1 2 1 2 2 1 4 2 7 4 2 1 7 2 15 3 6 2 11 1 14-3 0 1 1 2 3 4 2 2 3 3 4 3 1 1 2 1 4 2 3 0 4 1 5 2l0 6c-2 0-4 1-5 2-1 2-2 4-2 6 0 0 0-1-1-2 0 1-1 2-2 2-1 0-2 0-3 0-1-1-2-1-3 0-1 0-3 1-4 2-1 1-2 2-2 4-1 3-1 4-1 5-1 1-2 2-3 3-1 1-2 2-3 3 0 0 0 1 0 1-1 1-1 2-1 2-1 1-1 1-1 2-1 0-1 0-2 0-1 0-1 0-2-1-1-1-1-2-2-3-1-1-1-1-1-1-1 0-2 0-2 0-1 0-1 0-1 0-1 0-1-1-2-1 0 0-1-1-1-1-1 0-2-1-3-1-1 0-1 0-2 0 3 1 3 2 0 3-2 0-4 1-5 1 2 0 3 1 2 3 0 2-1 3-2 4l1 0c0 1-1 2-2 2-2 1-3 2-5 3-2 1-3 1-4 2-1 1-5 1-10 2-5 1-8 1-9 0-1-1-1-2-1-3 0 0 0-2 1-4 1-1 1-3 1-3 0-1 0-3-2-4-1-1-2-2-2-3 0-2 2-3 4-5 3-1 4-3 3-6 0-1-2-3-4-4-3-2-4-3-5-4-1-1-1-3 0-5 0-2 1-4 3-5 0 0 0-1 0-1 0 0 0-1-1-1 0-1-1-1-1-1-1-1-2-1-2-1l-1-1c-2-1-4 0-6 2-2 2-3 4-4 7-1 5-3 8-4 9-5 1-8 1-9-1-1 3-5 5-11 8-5 2-11 2-17 1 1 0 1 2 0 4-1 3-3 4-5 4 0 1 1 3 1 5 0 2 0 3 0 4 1 2 2 4 3 6 1 0 1 1 2 3 2 1 2 2 3 3 1 2 1 2 0 2 7-1 12 0 15 3 1 1 2 3 3 5 1 2 2 4 3 5 2 1 3 2 4 2 1-1 2-1 4-2 2-1 3-1 4-1 3-1 4 0 5 3 0 2-1 4-3 5 3 0 3 2 1 5-1 2-1 2-2 3-2 1-5 0-8-2-1 0-1-1 1-2 0 0-1-1-3-3-1-2-3-4-5-5-1-1-3-1-4 2 0 0-1 1-2 3-1 3-1 4-2 4-2 0-3-1-5-4 1 2 0 3-3 4-3 2-5 2-7 3 4 2 3 4-2 7-2 1-4 2-6 2-3 0-5 0-6-1-1-2-1-3-1-4 0-1 0-1 1-2 1-1 2-1 3-2 1 0 2 0 3-1 2 0 2 0 3-1 3-1 3-3 2-4 0 0-1 0-2-1-2 0-3 0-4-1-1 0-1-1-1-1-1-1-1-2 0-4 0-2 0-3-1-4-1 1-2 3-2 5-1 2-2 4-2 5 1-2-1-3-8-2l-2 0c-1 0-3 0-5 0-2-1-4-1-6-1-1 1-3 1-4 3 0 1 0 3 0 5 0 1 1 1 1 1 0 1-1 1-3 3-1 1-2 2-3 2-8-3-17-7-26-12 1 0 2 0 3 1 1 0 2 1 4 2 1 0 2 1 3 1 6 3 10 3 12 2l1 2c3-3 5-6 6-8-2 1-4 1-9 1-4-1-6-3-6-4 1-2 2-4 1-5 0 1-2 2-3 3-1 1-3 2-4 3-1 1-3 1-4 2-3 0-6-1-7-1-28-15-50-36-67-63 1-1 3-2 4-2 0-1 1-1 1-3 0-2 0-3 1-3 0-1 1 0 3 1 2-2 2-4 1-6 0 0 4-2 12-7 4-4 6-6 6-6 1-3 0-4-2-6-1 1-1 2-3 3-2 1-2 2-3 1 0-1 0-3 1-5 0-3 1-4 3-4-2 0-3-1-3-4-1-3-1-7-1-10 0-4 0-6 0-7l0 0c0-3 0-6 2-10 2-5 4-6 6-6-2 0 0-5 6-12 1-2 2-3 2-3 1 0 2-1 4-2 1-1 3-2 4-3 1-1 2-2 3-3 0-1 1-3 3-6 1-3 2-6 4-7-1-1 0-3 2-6 2-2 3-4 3-6 0 0 0 0 0 0-1-1-1-1-1-1 0-1 2-2 4-4 3-1 4-2 5-3 0-1 0-2 0-3 0-2 1-3 1-3 1-1 1-1 2-1 1 4-1 10-6 18-3 4-5 7-5 8-1 1-1 2-2 4 0 2-1 4-1 5 0 0 1-1 2-1 0 0 1 0 2-1 1 0 2-1 2-1 1 0 1-1 1-1-1-1-1-3 0-5 1-2 2-4 4-5 1-2 3-3 5-6 1-2 3-3 3-3 1-1 2-3 4-6 2-2 2-4 0-4 2 0 4-1 6-3 2-1 3-3 5-5 1-2 1-4 2-8 0-3 1-5 1-7 1-1 1-2 3-3 1-2 2-3 3-3l5-2c0 0 1-1 4-2 1-1 2-2 5-3 2-2 4-3 6-4 2 0 3-1 5-1 1 0 2 0 4 1 1 0 3 1 4 1 2 0 5-1 8-4 3-4 5-6 6-6 7-4 12-5 16-4-1 0-1 0 0-2 0-1 1-2 2-4 1-2 2-3 3-4 0-1 1-2 1-3 1-1 3-2 5-4 3-2 4-3 5-4 2 0 2 1 2 2 0-1 1-3 2-5 2-3 4-4 6-3 2 0 4 3 4 9-6-3-11-1-14 5 0 0-1 1-1 2-1 0-1 1-1 2-1 1-1 2-1 2 0 1 0 2 0 3 0 0 1 0 1 0 2 0 3 1 3 1 0 1 0 2 0 4-1 2-1 3-1 4-1 1-2 3-4 5-1 3-3 4-3 5-1-2-2-3-5-3-2 1-3 1-4 3 0 0 0-1-1-2 0 0 0-1 0-1-2 0-4 0-4 0 0 0 0 2 0 5 1 3 1 5 1 6 1 1 1 2 2 4 1 1 2 3 2 4 1 1 1 2 1 3 0 2 0 2-1 3-1 1-3 1-5 1-4 0-6-2-7-6-1 0-1-1-1-3-1-1-1-2-2-3 0-1-1-2-2-2-2-1-4-1-7-1-3 0-6 1-7 2-2 1-5 4-6 8-2 4-3 8-3 11 0 1 0 4 1 7 0 3 0 6 0 7 1 2 0 4-1 7 0 1 1 2 2 3 2 1 3 2 3 3 1 0 1 0 2 0 0 1 0 1 1 0 0 0 1 0 1 1 0 0 1 1 1 2 0 0-1 0-1 0-1 1-1 1-1 1 1 0 4 0 8 1 4 1 6 0 8-1 2-2 5-2 6 1 0 0 0 1-1 3 0 1 0 2 0 3 1-5 4-6 8-2 1-1 2-1 5-2 2 0 4 0 5-1 0 0 1-1 2-2 0 0 1-1 1-1 1 0 1 0 2 0 0 1 1 1 2 2 2-3 3-5 4-7 2-7 3-12 5-12 1-1 2-1 3-1 1 0 1 1 1 3 1 1 1 3 0 4 0 1 0 2 0 3l0 3 0 5-1 2c-2 1-4 2-5 4-1 1 0 3 1 5 1 2 2 3 4 5 0 0 1 1 2 1 1 1 3 1 5 2 1 1 2 2 3 2 4 4 6 7 4 10 2 0 3 1 4 3-1 0-1 0-2 1-1 0-1 1-2 1-1 1-1 1-1 1 1 1 2 2 0 4 1 1 2 2 2 3 1 2 2 3 3 3 1-2 3-2 6 0 1 1 1 3 0 4 1 2 3 3 6 3 3 1 4 2 5 3 1 0 2 0 2 1 0 0 1 1 1 3 0 2 0 3 0 3 1 1 3 2 5 3 2 1 3 1 3 1l5 4c1 0 1 1 0 1 4-1 7 0 9 3 2 2 1 4-2 6 1 1 1 2 0 2-2 1-3 1-5 2 1 0 2 0 4 0 1 0 2 0 3 0 2 2 2 4-2 5-4 1-8 0-13-3z m-46-251c39 7 72 25 100 54-1 1-2 1-4 1-1 1-3 1-3 1-4 2-6 2-7 3 0 1 0 2-1 3 0 1-1 2-2 3-1 0-2 1-4 2-1 1-2 2-3 2 0 1-1 1-2 2-1 1-1 1-2 1 0 1-1 1-2 2-1 0-2 0-2 0-1 0-2 0-3 0l-1 0c-1 0-1-1-2-1 0 0-1-1-1-1-1 0-1 0-1-1 0 0 0 0 0 0-4 3-8 5-11 6-1 0-2 1-3 1-1 1-2 2-3 2-1 1-2 1-3 1-1 0-2-1-3-2-1-1-1-3-2-4 0-2 0-4 0-4-1 1-1 2 0 5 1 2 1 4 0 5 0 1-1 2-3 1-1 0-2 0-3-1-1 0-2-1-3-2-2-1-2-2-3-2 0 0-1-1-2-2-2-1-2-1-3-2 0-1-1-2-1-3-1-2-1-3-2-3 0 0-1 1-3 1-2 1-3 1-3 2 1-2 1-5 1-10 1-5 1-8 2-11 1-6 0-10-4-14-5-4-8-8-8-11-1-4 0-7 3-7 0-2 0-4-2-6-1-3-2-5-2-6 0-2 0-3 1-5z"/>
-<glyph unicode="&#69;" d="M347 274c0 36-12 66-37 91-25 25-55 37-91 37-35 0-65-12-90-37-25-25-38-55-38-91 0-35 13-65 38-90 25-25 55-38 90-38 36 0 66 13 91 38 25 25 37 55 37 90z m147-237c0-10-4-19-11-26-7-7-16-11-26-11-10 0-19 4-26 11l-98 98c-34-24-72-36-114-36-27 0-53 5-78 16-25 11-46 25-64 43-18 18-32 39-43 64-10 25-16 51-16 78 0 28 6 54 16 78 11 25 25 47 43 65 18 18 39 32 64 43 25 10 51 15 78 15 28 0 54-5 79-15 24-11 46-25 64-43 18-18 32-40 43-65 10-24 16-50 16-78 0-42-12-80-36-114l98-98c7-7 11-15 11-25z"/>
-<glyph unicode="&#70;" d="M402 247l0-92c0-22-8-42-24-58-16-16-35-24-58-24l-238 0c-22 0-42 8-58 24-16 16-24 36-24 58l0 238c0 23 8 42 24 58 16 16 36 24 58 24l201 0c3 0 5 0 7-2 2-2 3-4 3-7l0-18c0-3-1-5-3-7-2-1-4-2-7-2l-201 0c-12 0-23-5-32-14-9-9-13-19-13-32l0-238c0-12 4-23 13-32 9-9 20-13 32-13l238 0c13 0 23 4 32 13 9 9 14 20 14 32l0 92c0 3 1 5 2 6 2 2 4 3 7 3l18 0c3 0 5-1 7-3 1-1 2-3 2-6z m110 247l0-147c0-5-2-9-5-12-4-4-8-6-13-6-5 0-10 2-13 6l-50 50-187-186c-2-2-4-3-6-3-3 0-5 1-7 3l-32 32c-2 2-3 4-3 7 0 2 1 4 3 6l186 187-50 50c-4 3-6 8-6 13 0 5 2 9 6 13 3 3 7 5 12 5l147 0c5 0 9-2 13-5 3-4 5-8 5-13z"/>
-<glyph unicode="&#68;" d="M438 99c14 0 25 11 25 26l0 262c0 15-11 26-25 26l-364 0c-14 0-25-11-25-26l0-262c0-15 11-26 25-26z m-26 51l-312 0 0 212 312 0z m-80 105l-61-36-62-35 0 141 62-35z"/>
-<glyph unicode="&#71;" d="M411 448l0 0 0 21c0 4-4 8-9 8l-168 0-133-132 0-302c0-4 4-8 9-8l292 0c5 0 9 4 9 8l0 13 0 0z m-259-362l0 241 91 0c5 0 9 4 9 9l0 90 108 0 0-340z"/>
+<glyph glyph-name="angle-down" unicode="&#97;" d="M399 302c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3-2 0-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l15 15c1 1 4 2 6 2 3 0 5-1 7-2l112-113 112 113c2 1 4 2 7 2 2 0 5-1 6-2l15-15c2-2 3-4 3-6z"/>
+<glyph glyph-name="angle-left" unicode="&#98;" d="M344 357c0-3-1-5-3-7l-112-112 112-113c2-1 3-4 3-6 0-3-1-5-3-7l-14-14c-2-2-5-3-7-3-2 0-5 1-7 3l-133 133c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3 2 0 5-1 7-3l14-14c2-2 3-4 3-6z"/>
+<glyph glyph-name="angle-right" unicode="&#99;" d="M335 238c0-3-1-5-3-7l-133-133c-2-2-5-3-7-3-2 0-5 1-7 3l-14 14c-2 2-3 4-3 7 0 2 1 5 3 6l112 113-112 112c-2 2-3 4-3 7 0 2 1 4 3 6l14 14c2 2 5 3 7 3 2 0 5-1 7-3l133-133c2-2 3-4 3-6z"/>
+<glyph glyph-name="angle-up" unicode="&#100;" d="M399 174c0-3-1-5-3-7l-15-14c-1-2-4-3-6-3-3 0-5 1-7 3l-112 112-112-112c-2-2-4-3-7-3-2 0-5 1-6 3l-15 14c-2 2-3 4-3 7 0 2 1 4 3 6l133 133c2 2 5 3 7 3 2 0 5-1 7-3l133-133c2-2 3-4 3-6z"/>
+<glyph glyph-name="comments" unicode="&#101;" d="M201 402c-29 0-56-5-82-15-25-9-45-23-60-40-15-17-22-35-22-54 0-16 5-31 15-46 10-14 24-27 42-37l28-16-10-24c6 4 12 7 18 11l12 9 15-3c15-3 30-4 44-4 29 0 57 5 82 15 25 10 45 23 60 40 15 17 23 35 23 55 0 19-8 37-23 54-15 17-35 31-60 40-25 10-53 15-82 15z m0 37c37 0 70-7 101-20 31-13 56-31 73-53 18-22 27-47 27-73 0-27-9-51-27-74-17-22-42-40-73-53-31-13-64-20-101-20-16 0-33 2-50 5-24-17-50-29-80-37-6-1-15-3-24-4l-1 0c-2 0-4 0-6 2-2 2-3 4-3 6 0 1 0 1 0 2 0 1 0 1 0 2 0 0 0 1 0 1l1 2c0 0 0 0 1 1 1 1 1 2 1 2 0 0 1 0 1 1 1 1 2 2 2 2 1 1 3 3 6 7 4 3 6 6 8 8 1 2 3 5 6 8 3 4 5 8 7 11 2 4 4 8 6 13-24 14-42 31-56 51-13 20-20 41-20 64 0 26 9 51 27 73 18 22 42 40 73 53 31 13 65 20 101 20z m235-334c2-5 4-9 6-13 2-4 4-7 7-11 3-3 5-6 6-8 2-2 4-5 8-8 3-4 5-6 6-8 1 0 1 0 2-1 0-1 1-1 1-1 0-1 1-1 1-2 0 0 1-1 1-1l1-2c0 0 0 0 0-1 1-2 1-2 0-2 0 0 0-1 0-2 0-3-2-5-4-6-1-2-4-3-6-2-9 1-18 2-24 4-30 8-56 20-80 37-17-3-34-5-50-5-52 0-97 13-135 38 11-1 19-1 25-1 31 0 60 4 88 13 29 8 54 20 76 36 24 18 42 38 55 61 12 23 19 47 19 73 0 14-2 29-7 43 25-14 44-30 59-51 14-20 21-42 21-66 0-22-7-44-20-64-14-20-32-36-56-50z"/>
+<glyph glyph-name="twitter" unicode="&#102;" d="M481 395c-13-18-28-34-46-47 0-3 0-7 0-12 0-25-3-50-11-74-7-25-18-49-33-71-14-23-32-43-52-61-21-17-45-31-74-41-29-11-60-16-92-16-52 0-99 14-142 42 7-1 14-2 22-2 43 0 81 14 115 40-20 0-38 6-54 18-16 12-27 27-33 46 7-1 13-2 18-2 8 0 16 1 24 4-21 4-39 15-53 31-14 17-21 37-21 59l0 1c13-7 27-11 42-11-13 8-23 19-30 32-8 14-11 29-11 44 0 17 4 33 12 47 23-28 51-51 84-68 33-17 69-27 107-29-2 8-3 15-3 22 0 25 9 47 27 65 18 18 40 27 66 27 26 0 49-10 67-29 21 4 40 11 59 22-7-22-21-39-41-51 18 2 35 7 53 14z"/>
+<glyph glyph-name="calendar" unicode="&#103;" d="M55 37l402 0 0 292-402 0z m110 347l0 82c0 3-1 5-3 7-2 2-4 2-7 2l-18 0c-3 0-5 0-6-2-2-2-3-4-3-7l0-82c0-3 1-5 3-7 1-1 3-2 6-2l18 0c3 0 5 1 7 2 2 2 3 4 3 7z m219 0l0 82c0 3-1 5-3 7-1 2-3 2-6 2l-18 0c-3 0-5 0-7-2-2-2-3-4-3-7l0-82c0-3 1-5 3-7 2-1 4-2 7-2l18 0c3 0 5 1 6 2 2 2 3 4 3 7z m110 18l0-365c0-10-4-19-11-26-7-7-16-11-26-11l-402 0c-10 0-19 4-26 11-7 7-11 16-11 26l0 365c0 10 4 19 11 26 7 7 16 11 26 11l36 0 0 27c0 13 5 24 14 33 9 9 20 13 32 13l18 0c13 0 24-4 33-13 9-9 13-20 13-33l0-27 110 0 0 27c0 13 4 24 13 33 9 9 20 13 33 13l18 0c12 0 23-4 32-13 9-9 14-20 14-33l0-27 36 0c10 0 19-4 26-11 7-7 11-16 11-26z"/>
+<glyph glyph-name="debates" unicode="&#105;" d="M453 425c-1 9-8 16-17 16l-360 0 0 0c-9 0-16-7-17-16l0 0 0-288 0 0c2-8 9-14 17-14l0 0 59 0 0-35c0-9 8-17 17-17 6 0 11 3 14 8l45 44 225 0c8 0 15 6 17 14l0 0 0 288z m-308-172c-15 0-29 12-29 34 0 25 13 47 34 61l0 0c1 1 1 1 2 1 1 0 1 0 2-1l0 0 14-9 0 0c1 0 1-1 1-3 0-1 0-2-2-3l0 0c0 0 0 0 0 0 0 0 0 0 0 0-10-6-22-19-25-31 2 1 4 1 7 1 13 0 23-10 23-24 0-14-12-26-27-26z m68 0c-15 0-29 12-29 34 0 25 13 47 34 61l0 0c0 1 1 1 2 1 0 0 1 0 2-1l0 0 14-9 0 0c1 0 1-1 1-3 0-1-1-2-2-3l0 0c0 0 0 0 0 0 0 0 0 0 0 0-11-6-22-19-25-31 1 1 4 1 7 1 12 0 22-10 22-24 0-14-12-26-26-26z m81-37l0 0c0 0-1-1-2-1 0 0-1 1-2 1l0 0-14 9 0 0c-1 1-1 2-1 3 0 1 1 3 2 3l0 0c0 0 0 0 0 0 0 0 0 0 0 0 11 6 22 20 25 31-1 0-4-1-7-1-12 0-22 10-22 24 0 15 12 27 26 27 15 0 29-13 29-34 0-25-13-48-34-62z m68 0l0 0c-1 0-1-1-2-1-1 0-1 1-2 1l0 0-14 9 0 0c-1 1-1 2-1 3 0 1 0 3 2 3l0 0c0 0 0 0 0 0 0 0 0 0 0 0 10 6 22 20 25 31-2 0-4-1-7-1-13 0-23 10-23 24 0 15 12 27 27 27 15 0 29-13 29-34 0-25-13-48-34-62z"/>
+<glyph glyph-name="unlike" unicode="&#106;" d="M91 347c0-5-1-9-5-12-4-4-8-6-13-6-5 0-9 2-13 6-3 3-5 7-5 12 0 6 2 10 5 13 4 4 8 6 13 6 5 0 9-2 13-6 4-3 5-7 5-13z m46-146l0 183c0 5-2 9-5 13-4 3-8 5-13 5l-82 0c-5 0-10-2-13-5-4-4-6-8-6-13l0-183c0-5 2-9 6-13 3-3 8-5 13-5l82 0c5 0 9 2 13 5 3 4 5 8 5 13z m323 43c10-12 15-26 15-43 0-15-5-28-16-38-11-11-24-17-38-17l-80 0c1-2 2-5 3-7 0-1 2-4 3-6 1-2 2-4 3-5 3-7 6-12 7-16 2-4 4-10 6-17 2-7 3-15 3-22 0-4 0-8 0-11-1-3-1-7-2-13-1-6-2-10-3-14-2-4-4-8-7-13-3-5-7-9-12-12-4-3-10-5-17-7-7-2-15-3-23-3-5 0-10 2-13 5-4 4-7 9-10 15-3 5-4 10-5 15-1 4-3 10-4 17-2 8-3 14-4 17-1 4-2 8-5 14-2 6-5 10-9 14-6 6-16 18-29 34-9 12-19 24-28 35-10 11-18 16-22 17-5 0-9 2-12 5-4 4-6 8-6 13l0 183c0 5 2 9 6 13 3 3 8 5 13 5 6 0 21 5 45 13 15 5 26 9 34 11 9 3 20 5 35 8 15 3 29 5 41 5l37 0c25-1 44-8 56-22 11-14 16-31 14-52 8-7 13-16 16-27 3-12 3-23 0-33 8-12 13-25 12-40 0-6-1-13-4-21z"/>
+<glyph glyph-name="like" unicode="&#107;" d="M91 128c0 5-1 9-5 13-4 3-8 5-13 5-5 0-9-2-13-5-3-4-5-8-5-13 0-5 2-9 5-13 4-4 8-5 13-5 5 0 9 1 13 5 4 4 5 8 5 13z m46 146l0-183c0-5-2-9-5-12-4-4-8-6-13-6l-82 0c-5 0-10 2-13 6-4 3-6 7-6 12l0 183c0 5 2 10 6 13 3 4 8 6 13 6l82 0c5 0 9-2 13-6 3-3 5-8 5-13z m338 0c0-16-5-30-15-42 3-9 4-16 4-22 1-14-4-28-12-39 3-11 3-22 0-34-3-10-8-19-16-26 2-22-3-39-14-52-12-15-31-22-56-22l-37 0c-12 0-26 1-41 4-15 3-26 6-35 8-8 3-19 7-34 12-24 8-39 12-45 12-5 0-10 2-13 6-4 3-6 7-6 12l0 184c0 4 2 8 6 12 3 4 7 5 12 6 4 0 12 6 22 17 9 11 19 22 28 34 13 17 23 28 29 35 4 3 7 8 9 13 3 6 4 11 5 14 1 4 2 9 4 17 1 8 3 14 4 18 1 4 2 9 5 15 3 5 6 10 10 14 3 4 8 5 13 5 8 0 16-1 23-3 7-2 13-4 17-7 5-3 9-7 12-12 3-4 5-9 7-12 1-4 2-9 3-15 1-5 1-10 2-13 0-2 0-6 0-11 0-7-1-14-3-21-2-8-4-13-5-18-2-4-5-9-8-16-1-1-2-2-3-5-1-2-3-4-3-6-1-2-2-4-3-7l80 0c14 0 27-5 38-16 11-11 16-24 16-39z"/>
+<glyph glyph-name="check" unicode="&#108;" d="M477 350c0-7-2-14-8-19l-206-207-39-39c-6-5-12-8-20-8-7 0-14 3-19 8l-142 142c-6 6-8 12-8 20 0 7 2 14 8 19l38 39c6 5 12 8 20 8 7 0 14-3 19-8l84-84 188 188c5 5 12 8 19 8 8 0 14-3 20-8l38-39c6-6 8-12 8-20z"/>
+<glyph glyph-name="edit" unicode="&#109;" d="M140 73l26 26-67 67-26-26 0-30 37 0 0-37z m150 265c0 4-2 7-7 7-1 0-3-1-4-2l-155-155c-2-2-2-3-2-5 0-4 2-6 6-6 2 0 4 0 5 2l155 154c1 2 2 3 2 5z m-16 55l119-119-238-237-118 0 0 118z m195-27c0-10-3-19-10-26l-48-47-118 118 47 48c7 7 15 10 26 10 10 0 18-3 26-10l67-67c7-8 10-16 10-26z"/>
+<glyph glyph-name="star" unicode="&#110;" d="M494 327c0-4-3-9-8-14l-103-101 24-143c0-1 0-3 0-5 0-4-1-8-3-10-2-3-4-5-8-5-4 0-8 2-12 4l-128 67-128-67c-4-2-8-4-12-4-4 0-7 2-9 5-2 2-3 6-3 10 0 1 0 3 1 5l24 143-104 101c-4 6-7 10-7 14 0 7 6 12 16 13l144 21 64 130c4 8 8 12 14 12 6 0 10-4 14-12l64-130 144-21c10-1 16-6 16-13z"/>
+<glyph glyph-name="user" unicode="&#111;" d="M410 203l-80 38-34 16c15 9 27 24 35 41 6 14 10 29 10 46 0 9-1 18-4 27-10 41-42 72-81 72-38 0-70-30-81-70-2-9-4-19-4-29 0-18 4-34 11-49 8-16 20-30 35-39l-32-15-83-38c-7-4-12-12-12-21l0-91c0-12 8-22 19-22l294 0c11 0 19 10 19 22l0 91c0 9-4 17-12 21z"/>
+<glyph glyph-name="settings" unicode="&#113;" d="M329 256c0 20-7 37-21 52-15 14-32 21-52 21-20 0-37-7-52-21-14-15-21-32-21-52 0-20 7-37 21-52 15-14 32-21 52-21 20 0 37 7 52 21 14 15 21 32 21 52z m146 31l0-63c0-3 0-5-2-7-1-2-3-3-6-4l-52-8c-4-10-8-19-12-26 7-9 17-22 31-39 2-2 3-5 3-7 0-3-1-5-3-7-5-7-14-17-28-31-14-13-23-20-27-20-2 0-5 1-7 3l-40 31c-8-5-17-8-26-11-3-26-6-44-8-53-1-6-5-8-10-8l-64 0c-2 0-5 0-7 2-2 2-3 4-3 6l-8 53c-9 3-18 6-26 10l-40-30c-2-2-4-3-7-3-3 0-5 1-7 3-24 22-40 38-47 48-2 2-2 4-2 7 0 2 0 4 2 6 3 4 8 11 14 19 7 9 12 16 16 21-5 9-9 19-12 28l-52 8c-3 0-5 1-6 3-2 2-2 4-2 7l0 63c0 3 0 5 2 7 1 2 3 3 5 4l53 8c3 8 7 17 12 26-8 11-18 24-31 39-2 3-3 5-3 7 0 2 1 4 3 7 5 7 14 17 28 30 14 14 23 21 27 21 2 0 5-1 7-3l40-31c8 5 17 8 26 11 3 26 6 44 8 53 1 6 5 8 10 8l64 0c2 0 5 0 7-2 2-2 3-4 3-6l8-53c9-3 18-6 26-10l40 30c2 2 4 3 7 3 3 0 5-1 7-3 25-23 41-39 47-49 2-1 2-3 2-6 0-2 0-4-2-6-3-4-8-11-14-19-7-9-12-16-16-21 5-9 9-18 12-28l52-8c3 0 5-1 6-3 2-2 2-4 2-7z"/>
+<glyph glyph-name="stats" unicode="&#114;" d="M17 222c-14 4-20 13-16 29 3 14 12 20 27 16 0 0 50-12 50-12 0 0-26-41-26-41 0 0-35 8-35 8m455-6c4 4 10 6 16 6 7-1 12-3 16-8 11-11 11-22-1-33 0 0-128-115-128-115-5-4-10-6-16-6-5 0-9 2-14 5 0 0-146 112-146 112 0 0-28 8-28 8 0 0 26 40 26 40 0 0 18-4 18-4 4-1 7-2 8-4 0 0 135-104 135-104 0 0 114 103 114 103m-251 112c0 0-178-280-178-280-4-8-11-12-20-12-4 0-8 2-12 5-5 3-9 8-10 14-1 7 0 12 3 17 0 0 191 300 191 300 3 6 7 9 14 11 6 2 12 1 19-3 0 0 125-80 125-80 0 0 115 166 115 166 4 6 9 9 15 10 6 1 12-1 17-5 13-8 15-18 6-31 0 0-128-185-128-185-9-12-19-14-32-6 0 0-125 79-125 79"/>
+<glyph glyph-name="proposals" unicode="&#104;" d="M411 415l0 0 0 0c3 3 3 8 0 11l-10 10c-3 3-8 3-11 0l0 0-45-45c-3-3-3-7 0-10l11-11 0 0c2-3 7-3 10 0z m-162-2l0 0 14 0 0 0c4 0 8 3 8 7l0 0 0 64c0 5-3 8-8 8l0 0-14 0 0 0c-5 0-8-3-8-8l0-64 0 0c0-4 4-7 8-7z m220-106c0 4-3 7-7 8l0 0-64 0c-4 0-8-4-8-8l0-15c0-4 4-7 8-7l64 0 0 0c4 0 7 3 7 7z m-213 81c-60 0-109-49-109-109 0-23 8-45 20-63l0 0c17-25 27-59 27-96 2-2 4-4 7-4 0 0 0 0 1 0l0 0 108 0 0 0c0 0 1 0 1 0 3 0 5 2 7 5 0 38 12 73 29 99 11 17 18 37 18 59 0 60-49 109-109 109z m55-336c0 0-1 0-1 0l0 0-108 0 0 0c-1 0-1 0-1 0-4 0-8-3-8-7l0-17c0-5 4-8 8-8 0 0 0 0 1 0l0 0 108 0 0 0c0 0 1 0 1 0 4 0 7 3 7 8l0 17c0 4-3 7-7 7z m0 49c0 0-1 0-1 0l0 0-108 0 0 0c-1 0-1 0-1 0-4 0-7-4-8-8 0 0 0 0 0 0l0-17c0-4 4-8 8-8 0 0 0 0 1 1l0-1 108 0 0 1c0-1 1-1 1-1 4 0 7 4 7 8l0 17c0 4-3 8-7 8z m-197 208l0 0-64 0c-4 0-7-3-7-8l0-14c0-5 3-8 7-8l64 0 0 0c4 0 8 4 8 8l0 14c0 4-4 8-8 8z m-11 109l46-46 0 0c3-2 7-2 10 1l0 0 11 10c2 3 2 8 0 10l0 0-46 46c-2 3-7 3-10 0l-11-11c-2-3-2-7 0-10z"/>
+<glyph glyph-name="organizations" unicode="&#115;" d="M492 217l-83 40c20 12 33 36 33 63 0 40-28 72-62 72-12 0-23-4-32-11 6-14 9-29 9-46 0-24-7-48-20-67 4-5 9-9 15-12l0 0 53-25c15-8 25-24 25-41l0-70 57 0c7 0 14 7 14 16l0 66c0 7-4 13-9 15z m-330 40c4 3 8 6 12 10-13 19-21 43-21 68 0 17 4 33 10 47-10 6-20 10-31 10-34 0-62-32-62-72 0-28 14-52 34-64l-84-39c-5-2-9-8-9-15l0-66c0-9 7-16 14-16l55 0 0 70c0 17 10 34 26 41z m232-49l-72 34-31 15c14 8 25 21 32 37 5 12 9 26 9 41 0 9-2 17-4 24-9 38-38 65-73 65-34 0-63-26-73-63-2-8-3-17-3-26 0-16 3-31 10-44 7-14 18-27 31-35l-29-13-75-35c-6-3-10-10-10-18l0-82c0-11 7-20 17-20l264 0c10 0 18 9 18 20l0 82c0 8-5 15-11 18z"/>
+<glyph glyph-name="deleted" unicode="&#116;" d="M256 448c-106 0-192-86-192-192 0-106 86-192 192-192 106 0 192 86 192 192 0 106-86 192-192 192z m0-333c-78 0-141 63-141 141 0 34 12 66 33 90l198-198c-24-21-56-33-90-33z m108 51l-198 198c24 21 56 33 90 33 78 0 141-63 141-141 0-34-12-66-33-90z"/>
+<glyph glyph-name="tag" unicode="&#117;" d="M165 384c0 10-4 19-11 26-7 7-16 11-26 11-10 0-19-4-26-11-7-7-11-16-11-26 0-10 4-19 11-26 7-7 16-11 26-11 10 0 19 4 26 11 7 7 11 16 11 26z m304-165c0-10-3-18-10-25l-140-141c-8-7-17-10-26-10-11 0-19 3-26 10l-204 205c-8 7-14 16-19 29-5 12-7 23-7 33l0 119c0 10 3 18 10 26 8 7 16 10 26 10l119 0c10 0 21-2 33-7 13-5 22-11 30-19l204-204c7-7 10-16 10-26z"/>
+<glyph glyph-name="eye" unicode="&#112;" d="M475 238c-29 45-65 78-108 101 11-20 17-42 17-65 0-35-13-65-38-90-25-25-55-38-90-38-35 0-65 13-90 38-25 25-38 55-38 90 0 23 6 45 17 65-43-23-79-56-108-101 25-39 57-70 95-94 38-23 79-34 124-34 45 0 86 11 124 34 38 24 70 55 95 94z m-205 109c0 4-2 7-4 10-3 3-6 4-10 4-24 0-44-8-61-25-17-17-26-38-26-62 0-4 1-7 4-9 3-3 6-4 10-4 4 0 7 1 10 4 2 2 4 5 4 9 0 17 5 31 17 42 12 12 26 18 42 18 4 0 7 1 10 4 2 2 4 6 4 9z m242-109c0-7-2-13-6-20-26-44-62-79-107-105-45-27-93-40-143-40-50 0-98 13-143 40-45 26-81 61-107 105-4 7-6 13-6 20 0 6 2 13 6 19 26 44 62 79 107 106 45 26 93 39 143 39 50 0 98-13 143-39 45-27 81-62 107-106 4-6 6-13 6-19z"/>
+<glyph glyph-name="x" unicode="&#118;" d="M426 134c0-7-3-14-8-19l-39-39c-5-5-12-8-20-8-7 0-14 3-19 8l-84 84-84-84c-5-5-12-8-19-8-8 0-15 3-20 8l-39 39c-5 5-8 12-8 19 0 8 3 14 8 20l84 84-84 84c-5 5-8 12-8 19 0 8 3 14 8 20l39 38c5 6 12 8 20 8 7 0 14-2 19-8l84-84 84 84c5 6 12 8 19 8 8 0 15-2 20-8l39-38c5-6 8-12 8-20 0-7-3-14-8-19l-84-84 84-84c5-6 8-12 8-20z"/>
+<glyph glyph-name="flag" unicode="&#119;" d="M434 389c-1 0-2 0-3 0l0 0c-17-9-37-14-58-14-38 0-73 17-95 45-21 19-49 31-80 31-29 0-56-11-77-29-4 9-13 15-24 15-15 0-27-12-27-27l0-322c0-15 12-27 27-27 15 0 27 12 27 27l0 145c17 9 36 13 56 13 39 0 73-17 96-45 21-19 49-31 79-31 33 0 63 14 84 36 2 2 3 4 3 6l0 169c0 5-4 8-8 8z"/>
+<glyph glyph-name="notification" unicode="&#120;" d="M261 27c0 3-2 5-5 5-11 0-21 4-29 12-8 8-12 18-12 29 0 3-2 5-5 5-3 0-4-2-4-5 0-14 5-26 14-35 10-10 22-15 36-15 3 0 5 1 5 4z m-190 83l370 0c-31 34-54 73-70 117-16 44-24 90-24 139 0 48-30 73-91 73-61 0-91-25-91-73 0-49-8-95-24-139-16-44-39-83-70-117z m423 0c0-10-4-19-11-26-7-7-16-11-26-11l-128 0c0-20-7-37-21-52-15-14-32-21-52-21-20 0-37 7-52 21-14 15-21 32-21 52l-128 0c-10 0-19 4-26 11-7 7-11 16-11 26 36 30 64 68 82 113 19 45 28 93 28 143 0 31 9 56 27 75 19 18 44 29 76 33-2 3-2 7-2 11 0 7 2 14 8 19 5 5 11 8 19 8 8 0 14-3 19-8 6-5 8-12 8-19 0-4 0-8-2-11 32-4 57-15 76-33 18-19 27-44 27-75 0-50 9-98 28-143 18-45 46-83 82-113z"/>
+<glyph glyph-name="comment" unicode="&#121;" d="M256 402c-39 0-75-6-109-20-34-13-61-31-81-53-19-23-29-47-29-73 0-21 6-42 20-61 14-19 33-36 58-50l24-14-7-28c-5-17-12-34-20-49 29 12 55 28 78 49l13 11 16-2c13-2 25-2 37-2 39 0 75 6 109 20 34 13 61 31 81 53 19 23 29 47 29 73 0 26-10 50-29 73-20 22-47 40-81 53-34 14-70 20-109 20z m256-146c0-33-11-64-34-92-23-28-54-50-93-66-40-17-83-25-129-25-13 0-27 1-41 2-38-33-82-56-132-69-9-2-20-4-32-6l-2 0c-3 0-5 1-8 3-2 2-3 5-4 8l0 0c-1 1-1 2 0 4 0 1 0 2 0 2 0 1 1 2 2 3l1 3c0 0 1 1 2 2 2 2 2 3 3 3 1 1 4 5 8 10 5 5 8 8 10 10 2 3 5 6 9 12 4 5 7 10 9 14 3 5 5 10 8 17 3 7 5 14 8 22-30 17-54 38-71 63-17 25-26 51-26 80 0 33 11 64 34 92 23 28 54 50 93 66 40 17 83 25 129 25 46 0 89-8 129-25 39-16 70-38 93-66 23-28 34-59 34-92z"/>
+<glyph glyph-name="reply" unicode="&#122;" d="M183 203l0-20c0-8-4-14-11-17-3-1-5-1-7-1-6 0-10 1-13 5l-147 146c-3 4-5 8-5 13 0 5 2 9 5 13l147 146c5 6 12 8 20 4 7-3 11-9 11-17l0-19-114-114c-3-4-5-8-5-13 0-5 2-9 5-13z m329-11c0-11-2-24-5-38-3-15-7-28-11-40-4-11-9-23-14-35-5-12-8-21-11-26l-6-12c-1-3-4-4-8-4-1 0-2 0-2 0-5 1-7 5-7 10 8 76-2 130-30 161-12 14-29 24-49 32-20 7-46 12-76 15l0-72c0-8-4-14-12-17-2-1-4-1-7-1-5 0-9 1-13 5l-146 146c-3 4-5 8-5 13 0 5 2 9 5 13l146 146c6 6 13 8 20 4 8-3 12-9 12-17l0-74c78-6 135-27 171-64 32-33 48-81 48-145z"/>
+<glyph glyph-name="facebook" unicode="&#65;" d="M292 353l74 0-9-81-65 0 0-235-97 0 0 235-49 0 0 81 49 0 0 49c0 35 8 61 24 79 17 18 44 26 81 26l65 0 0-81-40 0c-8 0-14 0-18-2-5-1-8-3-10-6-2-4-3-7-4-10 0-3-1-8-1-14z"/>
+<glyph glyph-name="google-plus" unicode="&#66;" d="M269 93c0 4-1 8-2 12-1 4-1 7-2 10-1 3-3 7-5 10-3 4-5 6-6 9-2 2-5 5-8 8-3 4-6 6-8 8-2 1-5 4-9 7-4 3-7 5-9 6-1 2-5 4-9 7-5 3-8 5-9 6-3 0-8 1-14 1-11 0-21-1-31-2-9-2-20-4-30-8-11-3-20-7-28-13-8-5-15-12-20-21-5-9-8-19-8-31 0-13 4-24 10-34 7-11 16-19 27-24 11-6 22-11 34-13 12-3 24-5 37-5 11 0 22 1 32 4 10 2 19 6 28 11 9 5 16 12 22 21 5 9 8 19 8 31z m-35 247c0 11-1 23-4 36-4 13-8 25-14 37-6 12-14 22-24 30-10 8-21 12-34 12-18 0-31-7-41-20-10-13-15-29-15-47 0-9 1-18 4-28 2-10 5-20 10-30 4-10 10-19 16-27 6-8 13-14 22-19 9-5 18-7 28-7 18 0 32 5 40 17 8 11 12 27 12 46z m-37 135l125 0-39-22-38 0c13-9 24-21 31-36 7-16 11-32 11-48 0-15-2-27-6-38-5-11-10-20-16-26-7-7-13-13-19-19-7-5-12-11-16-17-5-6-7-13-7-20 0-5 2-9 5-14 3-5 7-9 12-14 5-4 11-9 17-14 6-4 12-10 18-15 6-6 12-13 17-19 5-7 9-15 12-25 3-9 5-19 5-30 0-30-13-57-40-81-29-25-69-37-120-37-11 0-23 1-34 3-12 2-23 5-35 9-12 5-22 10-31 17-9 7-16 15-22 25-6 11-9 22-9 35 0 12 4 25 11 39 6 12 15 22 27 31 12 9 26 16 42 21 15 4 30 8 44 10 14 2 28 3 43 4-12 16-18 30-18 42 0 3 0 5 0 7 1 2 1 4 2 6 0 1 1 3 2 6 1 2 1 4 2 6-8-1-14-2-20-2-29 0-53 10-73 28-20 19-31 43-31 71 0 26 9 50 28 71 18 21 40 35 66 41 18 4 36 5 54 5z m297-73l0-36-73 0 0-73-37 0 0 73-73 0 0 36 73 0 0 73 37 0 0-73z"/>
+<glyph glyph-name="language" unicode="&#67;" d="M256 475c40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110 0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29z m78-148c0-1-1-2-2-3-2-2-3-3-4-3 0 0 1 1 1 2 0 1 1 2 1 3 1 1 1 2 1 2 2 1 4 2 7 4 2 1 7 2 15 3 6 2 11 1 14-3 0 1 1 2 3 4 2 2 3 3 4 3 1 1 2 1 4 2 3 0 4 1 5 2l0 6c-2 0-4 1-5 2-1 2-2 4-2 6 0 0 0-1-1-2 0 1-1 2-2 2-1 0-2 0-3 0-1-1-2-1-3 0-1 0-3 1-4 2-1 1-2 2-2 4-1 3-1 4-1 5-1 1-2 2-3 3-1 1-2 2-3 3 0 0 0 1 0 1-1 1-1 2-1 2-1 1-1 1-1 2-1 0-1 0-2 0-1 0-1 0-2-1-1-1-1-2-2-3-1-1-1-1-1-1-1 0-2 0-2 0-1 0-1 0-1 0-1 0-1-1-2-1 0 0-1-1-1-1-1 0-2-1-3-1-1 0-1 0-2 0 3 1 3 2 0 3-2 0-4 1-5 1 2 0 3 1 2 3 0 2-1 3-2 4l1 0c0 1-1 2-2 2-2 1-3 2-5 3-2 1-3 1-4 2-1 1-5 1-10 2-5 1-8 1-9 0-1-1-1-2-1-3 0 0 0-2 1-4 1-1 1-3 1-3 0-1 0-3-2-4-1-1-2-2-2-3 0-2 2-3 4-5 3-1 4-3 3-6 0-1-2-3-4-4-3-2-4-3-5-4-1-1-1-3 0-5 0-2 1-4 3-5 0 0 0-1 0-1 0 0 0-1-1-1 0-1-1-1-1-1-1-1-2-1-2-1l-1-1c-2-1-4 0-6 2-2 2-3 4-4 7-1 5-3 8-4 9-5 1-8 1-9-1-1 3-5 5-11 8-5 2-11 2-17 1 1 0 1 2 0 4-1 3-3 4-5 4 0 1 1 3 1 5 0 2 0 3 0 4 1 2 2 4 3 6 1 0 1 1 2 3 2 1 2 2 3 3 1 2 1 2 0 2 7-1 12 0 15 3 1 1 2 3 3 5 1 2 2 4 3 5 2 1 3 2 4 2 1-1 2-1 4-2 2-1 3-1 4-1 3-1 4 0 5 3 0 2-1 4-3 5 3 0 3 2 1 5-1 2-1 2-2 3-2 1-5 0-8-2-1 0-1-1 1-2 0 0-1-1-3-3-1-2-3-4-5-5-1-1-3-1-4 2 0 0-1 1-2 3-1 3-1 4-2 4-2 0-3-1-5-4 1 2 0 3-3 4-3 2-5 2-7 3 4 2 3 4-2 7-2 1-4 2-6 2-3 0-5 0-6-1-1-2-1-3-1-4 0-1 0-1 1-2 1-1 2-1 3-2 1 0 2 0 3-1 2 0 2 0 3-1 3-1 3-3 2-4 0 0-1 0-2-1-2 0-3 0-4-1-1 0-1-1-1-1-1-1-1-2 0-4 0-2 0-3-1-4-1 1-2 3-2 5-1 2-2 4-2 5 1-2-1-3-8-2l-2 0c-1 0-3 0-5 0-2-1-4-1-6-1-1 1-3 1-4 3 0 1 0 3 0 5 0 1 1 1 1 1 0 1-1 1-3 3-1 1-2 2-3 2-8-3-17-7-26-12 1 0 2 0 3 1 1 0 2 1 4 2 1 0 2 1 3 1 6 3 10 3 12 2l1 2c3-3 5-6 6-8-2 1-4 1-9 1-4-1-6-3-6-4 1-2 2-4 1-5 0 1-2 2-3 3-1 1-3 2-4 3-1 1-3 1-4 2-3 0-6-1-7-1-28-15-50-36-67-63 1-1 3-2 4-2 0-1 1-1 1-3 0-2 0-3 1-3 0-1 1 0 3 1 2-2 2-4 1-6 0 0 4-2 12-7 4-4 6-6 6-6 1-3 0-4-2-6-1 1-1 2-3 3-2 1-2 2-3 1 0-1 0-3 1-5 0-3 1-4 3-4-2 0-3-1-3-4-1-3-1-7-1-10 0-4 0-6 0-7l0 0c0-3 0-6 2-10 2-5 4-6 6-6-2 0 0-5 6-12 1-2 2-3 2-3 1 0 2-1 4-2 1-1 3-2 4-3 1-1 2-2 3-3 0-1 1-3 3-6 1-3 2-6 4-7-1-1 0-3 2-6 2-2 3-4 3-6 0 0 0 0 0 0-1-1-1-1-1-1 0-1 2-2 4-4 3-1 4-2 5-3 0-1 0-2 0-3 0-2 1-3 1-3 1-1 1-1 2-1 1 4-1 10-6 18-3 4-5 7-5 8-1 1-1 2-2 4 0 2-1 4-1 5 0 0 1-1 2-1 0 0 1 0 2-1 1 0 2-1 2-1 1 0 1-1 1-1-1-1-1-3 0-5 1-2 2-4 4-5 1-2 3-3 5-6 1-2 3-3 3-3 1-1 2-3 4-6 2-2 2-4 0-4 2 0 4-1 6-3 2-1 3-3 5-5 1-2 1-4 2-8 0-3 1-5 1-7 1-1 1-2 3-3 1-2 2-3 3-3l5-2c0 0 1-1 4-2 1-1 2-2 5-3 2-2 4-3 6-4 2 0 3-1 5-1 1 0 2 0 4 1 1 0 3 1 4 1 2 0 5-1 8-4 3-4 5-6 6-6 7-4 12-5 16-4-1 0-1 0 0-2 0-1 1-2 2-4 1-2 2-3 3-4 0-1 1-2 1-3 1-1 3-2 5-4 3-2 4-3 5-4 2 0 2 1 2 2 0-1 1-3 2-5 2-3 4-4 6-3 2 0 4 3 4 9-6-3-11-1-14 5 0 0-1 1-1 2-1 0-1 1-1 2-1 1-1 2-1 2 0 1 0 2 0 3 0 0 1 0 1 0 2 0 3 1 3 1 0 1 0 2 0 4-1 2-1 3-1 4-1 1-2 3-4 5-1 3-3 4-3 5-1-2-2-3-5-3-2 1-3 1-4 3 0 0 0-1-1-2 0 0 0-1 0-1-2 0-4 0-4 0 0 0 0 2 0 5 1 3 1 5 1 6 1 1 1 2 2 4 1 1 2 3 2 4 1 1 1 2 1 3 0 2 0 2-1 3-1 1-3 1-5 1-4 0-6-2-7-6-1 0-1-1-1-3-1-1-1-2-2-3 0-1-1-2-2-2-2-1-4-1-7-1-3 0-6 1-7 2-2 1-5 4-6 8-2 4-3 8-3 11 0 1 0 4 1 7 0 3 0 6 0 7 1 2 0 4-1 7 0 1 1 2 2 3 2 1 3 2 3 3 1 0 1 0 2 0 0 1 0 1 1 0 0 0 1 0 1 1 0 0 1 1 1 2 0 0-1 0-1 0-1 1-1 1-1 1 1 0 4 0 8 1 4 1 6 0 8-1 2-2 5-2 6 1 0 0 0 1-1 3 0 1 0 2 0 3 1-5 4-6 8-2 1-1 2-1 5-2 2 0 4 0 5-1 0 0 1-1 2-2 0 0 1-1 1-1 1 0 1 0 2 0 0 1 1 1 2 2 2-3 3-5 4-7 2-7 3-12 5-12 1-1 2-1 3-1 1 0 1 1 1 3 1 1 1 3 0 4 0 1 0 2 0 3l0 3 0 5-1 2c-2 1-4 2-5 4-1 1 0 3 1 5 1 2 2 3 4 5 0 0 1 1 2 1 1 1 3 1 5 2 1 1 2 2 3 2 4 4 6 7 4 10 2 0 3 1 4 3-1 0-1 0-2 1-1 0-1 1-2 1-1 1-1 1-1 1 1 1 2 2 0 4 1 1 2 2 2 3 1 2 2 3 3 3 1-2 3-2 6 0 1 1 1 3 0 4 1 2 3 3 6 3 3 1 4 2 5 3 1 0 2 0 2 1 0 0 1 1 1 3 0 2 0 3 0 3 1 1 3 2 5 3 2 1 3 1 3 1l5 4c1 0 1 1 0 1 4-1 7 0 9 3 2 2 1 4-2 6 1 1 1 2 0 2-2 1-3 1-5 2 1 0 2 0 4 0 1 0 2 0 3 0 2 2 2 4-2 5-4 1-8 0-13-3z m-46-251c39 7 72 25 100 54-1 1-2 1-4 1-1 1-3 1-3 1-4 2-6 2-7 3 0 1 0 2-1 3 0 1-1 2-2 3-1 0-2 1-4 2-1 1-2 2-3 2 0 1-1 1-2 2-1 1-1 1-2 1 0 1-1 1-2 2-1 0-2 0-2 0-1 0-2 0-3 0l-1 0c-1 0-1-1-2-1 0 0-1-1-1-1-1 0-1 0-1-1 0 0 0 0 0 0-4 3-8 5-11 6-1 0-2 1-3 1-1 1-2 2-3 2-1 1-2 1-3 1-1 0-2-1-3-2-1-1-1-3-2-4 0-2 0-4 0-4-1 1-1 2 0 5 1 2 1 4 0 5 0 1-1 2-3 1-1 0-2 0-3-1-1 0-2-1-3-2-2-1-2-2-3-2 0 0-1-1-2-2-2-1-2-1-3-2 0-1-1-2-1-3-1-2-1-3-2-3 0 0-1 1-3 1-2 1-3 1-3 2 1-2 1-5 1-10 1-5 1-8 2-11 1-6 0-10-4-14-5-4-8-8-8-11-1-4 0-7 3-7 0-2 0-4-2-6-1-3-2-5-2-6 0-2 0-3 1-5z"/>
+<glyph glyph-name="search" unicode="&#69;" d="M347 274c0 36-12 66-37 91-25 25-55 37-91 37-35 0-65-12-90-37-25-25-38-55-38-91 0-35 13-65 38-90 25-25 55-38 90-38 36 0 66 13 91 38 25 25 37 55 37 90z m147-237c0-10-4-19-11-26-7-7-16-11-26-11-10 0-19 4-26 11l-98 98c-34-24-72-36-114-36-27 0-53 5-78 16-25 11-46 25-64 43-18 18-32 39-43 64-10 25-16 51-16 78 0 28 6 54 16 78 11 25 25 47 43 65 18 18 39 32 64 43 25 10 51 15 78 15 28 0 54-5 79-15 24-11 46-25 64-43 18-18 32-40 43-65 10-24 16-50 16-78 0-42-12-80-36-114l98-98c7-7 11-15 11-25z"/>
+<glyph glyph-name="external" unicode="&#70;" d="M402 247l0-92c0-22-8-42-24-58-16-16-35-24-58-24l-238 0c-22 0-42 8-58 24-16 16-24 36-24 58l0 238c0 23 8 42 24 58 16 16 36 24 58 24l201 0c3 0 5 0 7-2 2-2 3-4 3-7l0-18c0-3-1-5-3-7-2-1-4-2-7-2l-201 0c-12 0-23-5-32-14-9-9-13-19-13-32l0-238c0-12 4-23 13-32 9-9 20-13 32-13l238 0c13 0 23 4 32 13 9 9 14 20 14 32l0 92c0 3 1 5 2 6 2 2 4 3 7 3l18 0c3 0 5-1 7-3 1-1 2-3 2-6z m110 247l0-147c0-5-2-9-5-12-4-4-8-6-13-6-5 0-10 2-13 6l-50 50-187-186c-2-2-4-3-6-3-3 0-5 1-7 3l-32 32c-2 2-3 4-3 7 0 2 1 4 3 6l186 187-50 50c-4 3-6 8-6 13 0 5 2 9 6 13 3 3 7 5 12 5l147 0c5 0 9-2 13-5 3-4 5-8 5-13z"/>
+<glyph glyph-name="video" unicode="&#68;" d="M438 99c14 0 25 11 25 26l0 262c0 15-11 26-25 26l-364 0c-14 0-25-11-25-26l0-262c0-15 11-26 25-26z m-26 51l-312 0 0 212 312 0z m-80 105l-61-36-62-35 0 141 62-35z"/>
+<glyph glyph-name="document" unicode="&#71;" d="M411 448l0 0 0 21c0 4-4 8-9 8l-168 0-133-132 0-302c0-4 4-8 9-8l292 0c5 0 9 4 9 8l0 13 0 0z m-259-362l0 241 91 0c5 0 9 4 9 9l0 90 108 0 0-340z"/>
+<glyph glyph-name="print" unicode="&#72;" d="M463 332c0 5-4 9-9 9l-67 0 0 110c0 5-5 10-10 10l-242 0c-5 0-10-5-10-10l0-110-67 0c0 0 0 0 0 0-5 0-9-4-9-9l0 0 0-188c0-5 4-10 9-10l67 0 0 79 262 0 0-79 67 0c5 0 9 5 9 10l0 188z m-102-33l-210 0 0 127c0 5 4 9 9 9l192 0c5 0 9-4 9-9l0-127z m-209-238c0-5 4-10 9-10l190 0c5 0 9 5 9 10l0 126-208 0z"/>
+<glyph glyph-name="blog" unicode="&#74;" d="M52 369c38 71 115 118 204 118 58 0 110-24 150-59-11 2-24 0-36-7-30-17-40-66-1-90 24-15 32-53 32-76-1-23-56-128-56-128l-54 184c0 0-2 13-2 17 0 4 2 10 5 13 2 3 5 7 8 7l26 0 0 21-139 0 0-21 5 0c4 0 9-6 13-10 5-6 11-25 19-45l20-67-43-100-48 200c0 0 2 14 5 16 1 2 4 6 8 6l1 0 0 21z m27-35c0 0-11 14-23 14l-12 0c-12-25-18-60-18-91 0-95 58-176 141-211z m375 36c5-20 4-46-5-73-22-72-77-202-99-252 81 36 136 116 136 209 0 43-11 82-32 116z m-193-194l-59-144c17-4 35-7 54-7 19 0 38 3 56 7z"/>
 </font></defs></svg>
diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf
index 5f40432b1f444138b926a8c04bf8e257814f22bd..358e0068a123976bdae9bf24017f0853a3e44a91 100644
GIT binary patch
delta 1101
zcmX|AU1%It6h3Euc78V5&CmX{*-f(9O*WM%O*YwWB_>9<O+%@TkRqiP<YxEo?2y@+
z>CCK6s<_stN+A^IMJPxf3iVN{U>`&UeNd=W>x)nk1hFqZ1q<2-<Jm-<;mkeXcji0y
ze3zL|PF*|G0R(_vcpF4`d3pKVOYY8YAHc*P#AZ*OIJpdK5FvbzaBg+&XleD~#V-Kx
zJmFVrE$04Mz54_}kcj)hV7|MzN1b5eYpSb;wbi)3`t34+_$R=~Z%xkX^3@v)RQs8t
z(roe$la2~9i4#POH(SA`_O$pG;g1NPvz!{cy1kjA2Db>GZLv)kTw$B)#|h_b*5ZAY
zcYgxNQ=siSe(=|mJCCT<3gI{Q&5^<Kz4qU)#h-f&QGsLt4`y!f9IV3ao%e77i{T=E
zWz4`3u{8dEWcSqo?-S}CQWhk5lU5y65a<S2fzxn>40o>=C}#)x-b2D&g-X%&H4Gy#
z3VF!E7!+VUydb<Ij>AOQFQ&rB!iV8au`0#;;@-!<h@TF3M3{kDypP{OnpBh2YHkY4
z6!~E+P$cHDJeHg-l_v}3xp^!lMPf<|Sit*QRo~UCnpVX~Rck!ZzSMruKG(j-Gn%dI
zw)UC6x~kvoXxcxauG1j{IU0h)_&Yv=r=SG$umsQ<T*TQ@x~Rl3ok}Jmahxoc=Z;lq
z*8=UDPK}~6S=q-*aS9{JL@JFbC88|Ska0|vj?E3XUR<jV3>=cPxoj*}5oB2$x-N^l
z(4Ux^7DQ3T3(=mQfwRx!sM?!ZSv>vg{K#|;FIAT2MSVK<>|o-!zLd$_?UhtnNhWn+
zs#^ahCPb2jSh2k9W$?t<k@L4QmrgEi-%yk=9NQIVVLH5)KO)Rdhj;RRr%2uq1Qbw2
z31y6+f+}jLV-$O^7h@R5KJ3Q<9K-}BF$J$;8V})N9KsA{aTrH%6mvL+c`WG6HZ1;3
z-MMW4ms-3LL=RZcG@5~Wkhfj6=CoSe?gYLPTsDJ%duokY+^#cEsq=Lfa6i(vEpvlQ
z-G^Lj^4f;P>t-PN0rRA`PYRz0foU7QOjO`&uIJEq%`Csy@eF30S6E;=wom;m9`L#t
zFhk^9TxwX%=&_x^Y?v2o`|l_R(*&}|U298iuo_=?oQ<gAI9)@o)%I13MsG8NM|{q_
vT2tklG_=hu`E|3-9kuS%+GHq@UC*=wY29*+&?$`IM7UkZMF0PdZtwgHf$#pT

delta 547
zcmYL`O=}ZT6o#Lfo0foDMO-K(nslN@H>E=T04oIAL~CoJt+mmL3~lTvO*%APq;4Xv
zbkl{?g$q}+5<w9haHojdh~P#<1%HAFx^Yq8Nd)iZemv*QIrlwh?oURgHWsjhyBI3P
z;>?u4zI_ikk7P}i#>R_Wq+i?;XUfw<$I4&k-+(nIo?WQBe(?Ue*cMuwOK#KO+EOMQ
zUxwt;^7_qBuWjWs-yt1&HFvSE`m`Y5SFPioS8Kb8A-hk(`iPuYUuz}*m__jmab<aB
z!Cg(=k^r+Qo~XMmpN735|4DJC;nr&dryhKRto&BPUumu-I*G>;kdXg&w>TA;&z=Zx
z>^%L8ZLv`Jn2y5UX-DBhYt+gGXRLQsJtJ$pQr$?{5XB8jkziG4QnQz$#2u9yj{@$$
zn<R+)*{wazehx55hAd9t+4q9C_P)TFC&4pQc=^-3N(Y|@f0$uLf{v57hev|nPP3g;
zq@@?e7^g^yvz%jsNv60!nTmeKC1$wHd1kr79Me>}$~ES>PL6{dBF_;Hb5wbhNxJN=
frUB93t}SMRqdo3Wua;Ofozd{auK4o5IZ^l*wsvTx

diff --git a/app/assets/fonts/icons.woff b/app/assets/fonts/icons.woff
index e22db04bd60d8a3fcd205570ef0ec96ea30420dd..3d7db421ebee62ee89ddc1bfe9a135296534984b 100644
GIT binary patch
delta 7424
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

delta 6870
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
QU}iuDj0|W10052v1^7}FEdT%j

diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss
index f7cc2303a..8c1f77f7e 100644
--- a/app/assets/stylesheets/icons.scss
+++ b/app/assets/stylesheets/icons.scss
@@ -136,3 +136,10 @@
 .icon-document:before {
   content: "G";
 }
+.icon-print:before {
+  content: "H";
+}
+
+.icon-blog:before {
+  content: "J";
+}
\ No newline at end of file

From a39df80112c055cf0926a62ec3f49eddfa015061 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Wed, 30 Sep 2015 16:59:42 +0200
Subject: [PATCH 03/37] Adds social networks links on footer

---
 app/assets/stylesheets/participacion.scss | 23 +++++++++++++++++++++++
 app/views/layouts/_footer.html.erb        | 14 +++++++++++++-
 config/locales/en.yml                     |  3 +++
 config/locales/es.yml                     |  3 +++
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss
index 3449da54e..0bf78f963 100644
--- a/app/assets/stylesheets/participacion.scss
+++ b/app/assets/stylesheets/participacion.scss
@@ -764,6 +764,29 @@ footer {
   margin-top: rem-calc(24);
   padding-top: rem-calc(12);
 
+  .social {
+    margin-top: rem-calc(24);
+    text-align: center;
+
+    @media (min-width: $small-breakpoint) {
+      margin-top: 0;
+      text-align: right;
+    }
+
+    a {
+      font-size: rem-calc(24);
+      margin: 0 rem-calc(12);
+      text-decoration: none;
+
+      @media (min-width: $small-breakpoint) {
+        font-size: rem-calc(18);
+      }
+
+      &:last-child {
+        margin-right: 0;
+      }
+    }
+  }
 }
 
 // 06. Tags
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 000b3f7d3..06e204216 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -42,13 +42,25 @@
     </div>
 
     <div class="subfooter row">
-      <div class="small-12 column">
+      <div class="small-12 medium-10 column">
         <%= t("layouts.footer.copyright", year: Time.now.year) %>&nbsp;|&nbsp;
         <%= link_to t("layouts.footer.more_info"), "/more_information" %>&nbsp;|&nbsp;
         <%= link_to t("layouts.footer.privacy"), "/privacy" %>&nbsp;|&nbsp;
         <%= link_to t("layouts.footer.conditions"), "/conditions" %>&nbsp;|&nbsp;
         <%= link_to t("layouts.footer.accessibility"), "/accessibility" %>
       </div>
+
+      <div class="small-12 medium-2 column social">
+        <%= link_to "https://twitter.com/abriendomadrid", target: "_blank", title: t("layouts.footer.twitter") do %>
+          <i class="icon-twitter"></i>
+        <% end %>
+        <%= link_to "https://www.facebook.com/Abriendo-Madrid-1475577616080350/", target: "_blank", title: t("layouts.footer.facebook") do %>
+          <i class="icon-facebook"></i>
+        <% end %>
+        <%= link_to "http://diario.madrid.es/blog/category/gobiernoabierto/", target: "_blank", title: t("layouts.footer.blog") do %>
+          <i class="icon-blog"></i>
+        <% end %>
+      </div>
     </div>
   </div>
 </footer>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 67a805059..7cb5a66c8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -49,6 +49,9 @@ en:
       conditions: "Terms of use"
       more_info: "More information"
       accessibility: "Accessibility"
+      twitter: "Twitter"
+      facebook: "Facebook"
+      blog: "Blog"
     application:
       ie_title: "This site is not optimized for your browser"
       ie:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index ae1e57b0a..b9aa4ae73 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -49,6 +49,9 @@ es:
       conditions: "Condiciones de uso"
       more_info: "Más información"
       accessibility: "Accesibilidad"
+      twitter: "Twitter"
+      facebook: "Facebook"
+      blog: "Blog"
     application:
       ie_title: "Esta web no está optimizada para tu navegador"
       ie:

From 355079f205eafcccc396470836118a9f4fd7ebe3 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Thu, 1 Oct 2015 12:56:50 +0200
Subject: [PATCH 04/37] Adds social icons on header

---
 app/assets/stylesheets/participacion.scss | 55 +++++++++++++----------
 app/views/layouts/_footer.html.erb        |  6 +--
 app/views/layouts/_header.html.erb        | 12 +++++
 config/locales/en.yml                     |  7 +--
 config/locales/es.yml                     |  7 +--
 5 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss
index 0bf78f963..6e518080f 100644
--- a/app/assets/stylesheets/participacion.scss
+++ b/app/assets/stylesheets/participacion.scss
@@ -763,30 +763,6 @@ footer {
   opacity: .75;
   margin-top: rem-calc(24);
   padding-top: rem-calc(12);
-
-  .social {
-    margin-top: rem-calc(24);
-    text-align: center;
-
-    @media (min-width: $small-breakpoint) {
-      margin-top: 0;
-      text-align: right;
-    }
-
-    a {
-      font-size: rem-calc(24);
-      margin: 0 rem-calc(12);
-      text-decoration: none;
-
-      @media (min-width: $small-breakpoint) {
-        font-size: rem-calc(18);
-      }
-
-      &:last-child {
-        margin-right: 0;
-      }
-    }
-  }
 }
 
 // 06. Tags
@@ -1423,6 +1399,37 @@ table {
   }
 }
 
+.social {
+  margin-top: rem-calc(24);
+  text-align: center;
+
+  @media (min-width: $small-breakpoint) {
+    margin-top: 0;
+    text-align: right;
+  }
+
+  a {
+    font-size: rem-calc(24);
+    line-height: rem-calc(24);
+    margin: 0 rem-calc(12);
+    text-decoration: none;
+    vertical-align: middle;
+
+    &:hover {
+      opacity: .5;
+      text-decoration: none;
+    }
+
+    @media (min-width: $small-breakpoint) {
+      font-size: rem-calc(18);
+    }
+
+    &:last-child {
+      margin-right: 0;
+    }
+  }
+}
+
 .share-supported {
 
   .social-share-button {
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 06e204216..8718c781d 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -51,13 +51,13 @@
       </div>
 
       <div class="small-12 medium-2 column social">
-        <%= link_to "https://twitter.com/abriendomadrid", target: "_blank", title: t("layouts.footer.twitter") do %>
+        <%= link_to "https://twitter.com/abriendomadrid", target: "_blank", title: t("social.twitter") do %>
           <i class="icon-twitter"></i>
         <% end %>
-        <%= link_to "https://www.facebook.com/Abriendo-Madrid-1475577616080350/", target: "_blank", title: t("layouts.footer.facebook") do %>
+        <%= link_to "https://www.facebook.com/Abriendo-Madrid-1475577616080350/", target: "_blank", title: t("social.facebook") do %>
           <i class="icon-facebook"></i>
         <% end %>
-        <%= link_to "http://diario.madrid.es/blog/category/gobiernoabierto/", target: "_blank", title: t("layouts.footer.blog") do %>
+        <%= link_to "http://diario.madrid.es/blog/category/gobiernoabierto/", target: "_blank", title: t("social.blog") do %>
           <i class="icon-blog"></i>
         <% end %>
       </div>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 1d1c091c7..636e3323e 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -6,6 +6,18 @@
         <%= link_to t("layouts.header.participation"), root_path, class: ("selected" unless current_page?("/transparency") || current_page?("/opendata")) %>&nbsp;|
         <%= link_to t("layouts.header.external_link_transparency"), "/transparency", class: ("selected" if current_page?("/transparency")) %>&nbsp;|
         <%= link_to t("layouts.header.external_link_opendata"), "/opendata", class: ("selected" if current_page?("/opendata")) %>
+          &nbsp;|&nbsp;
+          <div class="social inline-block">
+            <%= link_to "https://twitter.com/abriendomadrid", target: "_blank", title: t("social.twitter") do %>
+              <i class="icon-twitter"></i>
+            <% end %>
+            <%= link_to "https://www.facebook.com/Abriendo-Madrid-1475577616080350/", target: "_blank", title: t("social.facebook") do %>
+              <i class="icon-facebook"></i>
+            <% end %>
+            <%= link_to "http://diario.madrid.es/blog/category/gobiernoabierto/", target: "_blank", title: t("social.blog") do %>
+              <i class="icon-blog"></i>
+            <% end %>
+          </div>
       </div>
     </div>
   </section>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7cb5a66c8..0f5bbcc10 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -49,9 +49,6 @@ en:
       conditions: "Terms of use"
       more_info: "More information"
       accessibility: "Accessibility"
-      twitter: "Twitter"
-      facebook: "Facebook"
-      blog: "Blog"
     application:
       ie_title: "This site is not optimized for your browser"
       ie:
@@ -59,6 +56,10 @@ en:
         For a better experience we recommend use %{chrome} or %{firefox}."
       chrome: "Google Chrome"
       firefox: "Firefox"
+  social:
+    twitter: "Twitter"
+    facebook: "Facebook"
+    blog: "Blog"
   form:
       error: error
       errors: errors
diff --git a/config/locales/es.yml b/config/locales/es.yml
index b9aa4ae73..a79c93097 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -49,9 +49,6 @@ es:
       conditions: "Condiciones de uso"
       more_info: "Más información"
       accessibility: "Accesibilidad"
-      twitter: "Twitter"
-      facebook: "Facebook"
-      blog: "Blog"
     application:
       ie_title: "Esta web no está optimizada para tu navegador"
       ie:
@@ -59,6 +56,10 @@ es:
         Para una mejor experiencia te recomendamos utilizar %{chrome} o %{firefox}."
       chrome: "Google Chrome"
       firefox: "Firefox"
+  social:
+    twitter: "Twitter"
+    facebook: "Facebook"
+    blog: "Blog"
   form:
       error: error
       errors: errores

From 4a25cdc282e8a8ae26e7604f00f71d84bcc22791 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Thu, 1 Oct 2015 14:16:28 +0200
Subject: [PATCH 05/37] Fixes sticky footer on devise layout

---
 app/views/layouts/devise.html.erb | 64 ++++++++++++++++---------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb
index a4a62f070..a2a79796f 100644
--- a/app/views/layouts/devise.html.erb
+++ b/app/views/layouts/devise.html.erb
@@ -13,39 +13,41 @@
   </head>
 
   <body class="auth-page">
-
-    <div class="row">
-      <div class="small-12 medium-8 large-5 column small-centered">
-        <h1>
-          <%= link_to root_path do %>
-            <%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up left', size: '96x96') %>
-            <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %>
-          <% end %>
-        </h1>
-      </div>
-    </div>
-
-    <div class="row auth">
-      <div class="small-12 medium-8 large-5 column small-centered">
-        <div class="panel">
-          <% if notice %>
-            <div data-alert class="alert-box radius success">
-              <a href="#" class="close" title="<%= t("application.close") %>">&times;</a>
-                <%= notice %>
-            </div>
-          <% end %>
-
-          <% if alert %>
-            <div data-alert class="alert-box radius warning">
-              <a href="#" class="close" title="<%= t("application.close") %>">&times;</a>
-                <%= alert %>
-            </div>
-          <% end %>
-
-          <%= yield %>
-
+    <div class="wrapper">
+      <div class="row">
+        <div class="small-12 medium-8 large-5 column small-centered">
+          <h1>
+            <%= link_to root_path do %>
+              <%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up left', size: '96x96') %>
+              <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %>
+            <% end %>
+          </h1>
         </div>
       </div>
+
+      <div class="row auth">
+        <div class="small-12 medium-8 large-5 column small-centered">
+          <div class="panel">
+            <% if notice %>
+              <div data-alert class="alert-box radius success">
+                <a href="#" class="close" title="<%= t("application.close") %>">&times;</a>
+                  <%= notice %>
+              </div>
+            <% end %>
+
+            <% if alert %>
+              <div data-alert class="alert-box radius warning">
+                <a href="#" class="close" title="<%= t("application.close") %>">&times;</a>
+                  <%= alert %>
+              </div>
+            <% end %>
+
+            <%= yield %>
+
+          </div>
+        </div>
+      </div>
+      <div class="push"></div>
     </div>
 
     <div class="footer">

From e55a44936f903b08a91bbd116f08ae408afb61f8 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Thu, 1 Oct 2015 14:19:23 +0200
Subject: [PATCH 06/37] Fixes vertical align on comments votes

---
 app/assets/stylesheets/debates.scss   | 3 ++-
 app/assets/stylesheets/proposals.scss | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss
index 6e0f142bd..560c16664 100644
--- a/app/assets/stylesheets/debates.scss
+++ b/app/assets/stylesheets/debates.scss
@@ -646,7 +646,8 @@
     .comment-votes {
       color: $text-medium;
       font-weight: lighter;
-      margin: rem-calc(8) rem-calc(12) rem-calc(6) 0;
+      line-height: rem-calc(24);
+      margin: rem-calc(10) rem-calc(12) rem-calc(6) 0;
 
       a {
         color: $text-light;
diff --git a/app/assets/stylesheets/proposals.scss b/app/assets/stylesheets/proposals.scss
index d82d57013..7689e93dd 100644
--- a/app/assets/stylesheets/proposals.scss
+++ b/app/assets/stylesheets/proposals.scss
@@ -636,7 +636,8 @@
     .comment-votes {
       color: $text-medium;
       font-weight: lighter;
-      margin: rem-calc(8) rem-calc(12) rem-calc(6) 0;
+      line-height: rem-calc(24);
+      margin: rem-calc(10) rem-calc(12) rem-calc(6) 0;
 
       a {
         color: $text-light;

From 74cfc3da52373de770d347b8ccf46433358af62c Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Fri, 2 Oct 2015 15:13:23 +0200
Subject: [PATCH 07/37] Updates icons custom font

---
 app/assets/fonts/icons.eot        | Bin 9892 -> 10060 bytes
 app/assets/fonts/icons.svg        |   1 +
 app/assets/fonts/icons.ttf        | Bin 9736 -> 9904 bytes
 app/assets/fonts/icons.woff       | Bin 7532 -> 7640 bytes
 app/assets/stylesheets/icons.scss |   6 ++++--
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot
index de807c03aff000dbe35e2b5847f4682afd6088f3..8d0dc8ece8bf374d58d55fab7cd1e3a0fd017f30 100644
GIT binary patch
delta 642
zcmYjOOK1~O6g_V~ZzhQ~CQVbp{4<$QG}y*8BdA5e55{UmMMQ)$#u}0QO1g-OjRnzF
ziuHBn#!XxZE((Q$D?t}-y6Q?SE(M`bK@?m_>YcQpGrV`_oO|B6bMNb%U%jA?r-7vf
z)lx)zXk+1crTFSg1TYr?gwC8ibsAT|3C|FYO<X>homju|4q(>^UoBSb`r7K-yMUw<
z_o8Gs>RVfoNnfVCUMk<a{qWE06+r$8L?7RovTvzR9-I?<ShzJN&(fJC$ERE?+H><y
zKas9O_+rIw)-f&3Q~ogFSk<mfdGqZLK(a|(wO(t?9Qb|x5ny~HJO@T9S{p-cG3h<}
z3m%CGU@aG>?*2syJzjT$c*8O*Ek3i4Ex)62{<^n9JvU&HkmDPI0;&p~-fi0g?o*e}
za{~6xSFb)zYA>;2L=Z&+F~pIC0TU_mQlL^^BNrF?;f4ph(1+ddikMuI%#^U@pm-^N
zm%Q(npDAA>Eg62K*d|+tkBmmCLN0CYX9<lD1O|ggSk}s0z5q|g6XvKdmp>HG2CadB
z<`8M~7|U4>H5g<TSG9ts@}1Ce>)opEcI)i9?(XNR-Yw{qR9tMurEunVfU0Xes;Ydf
zyV+CvX>Xp@I8oYmpaC|LKeQ||7{Rb88-|k2j0}rKW16PQQ{xgdmM^9H7?*F>XnbPQ
Oj4)Hon)^KeUCLi@E_O@+

delta 494
zcmY*VODIHP6#njG%y`a}$7+nhTs9`-O;O~TFbk4}(rqvnGhCs(B1<XJzp+A^*jR{-
zosE*ZrPzoq*(ef)&G@d_@YmNl-#Ono=Re2niFMmzMSx?|R-=B+m{psN(a`Rj3(%ec
zxZ7J=+t7<7a+BN}>@6)1-VdGu(g1mXD5@Jb&8OdhtTMJ8)~Aek918X4%sax7xzV-Y
zWgDQp1D=Pm5q;RUve6)1Qtonzvc#Gr>iQxRA$?_iHix<xc~4ZIHDJi=%-528$Mxul
zt9tboC?KS9V`6Ih^ZWP-@O6+cK%$DMGH1Sqob?|_l^Fo8%MNz`S{c7_hh@Z}<d=%X
zopiCxu~b=b|8@el$gG}js92;;fmLG_cc2sV+|hbX^!0=vzbCgU97Gn83lH*8059@U
z2p{{Yu<??1Dw2`Oj;TmPIx^rCUL`C;6S|Tkc9a)RIoVJjJtEupYOg>5e$<IH&8Job
n{B@#Io8+(ewXTzQEnO1!Vo$Ng!90Irx5NTw!`>Am{|@j2Vcuwj

diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg
index f2dc2b69c..b01dfc6b6 100644
--- a/app/assets/fonts/icons.svg
+++ b/app/assets/fonts/icons.svg
@@ -42,4 +42,5 @@
 <glyph glyph-name="document" unicode="&#71;" d="M411 448l0 0 0 21c0 4-4 8-9 8l-168 0-133-132 0-302c0-4 4-8 9-8l292 0c5 0 9 4 9 8l0 13 0 0z m-259-362l0 241 91 0c5 0 9 4 9 9l0 90 108 0 0-340z"/>
 <glyph glyph-name="print" unicode="&#72;" d="M463 332c0 5-4 9-9 9l-67 0 0 110c0 5-5 10-10 10l-242 0c-5 0-10-5-10-10l0-110-67 0c0 0 0 0 0 0-5 0-9-4-9-9l0 0 0-188c0-5 4-10 9-10l67 0 0 79 262 0 0-79 67 0c5 0 9 5 9 10l0 188z m-102-33l-210 0 0 127c0 5 4 9 9 9l192 0c5 0 9-4 9-9l0-127z m-209-238c0-5 4-10 9-10l190 0c5 0 9 5 9 10l0 126-208 0z"/>
 <glyph glyph-name="blog" unicode="&#74;" d="M52 369c38 71 115 118 204 118 58 0 110-24 150-59-11 2-24 0-36-7-30-17-40-66-1-90 24-15 32-53 32-76-1-23-56-128-56-128l-54 184c0 0-2 13-2 17 0 4 2 10 5 13 2 3 5 7 8 7l26 0 0 21-139 0 0-21 5 0c4 0 9-6 13-10 5-6 11-25 19-45l20-67-43-100-48 200c0 0 2 14 5 16 1 2 4 6 8 6l1 0 0 21z m27-35c0 0-11 14-23 14l-12 0c-12-25-18-60-18-91 0-95 58-176 141-211z m375 36c5-20 4-46-5-73-22-72-77-202-99-252 81 36 136 116 136 209 0 43-11 82-32 116z m-193-194l-59-144c17-4 35-7 54-7 19 0 38 3 56 7z"/>
+<glyph glyph-name="box" unicode="&#73;" d="M311 274c0 5-2 10-6 13-3 4-7 6-12 6l-74 0c-5 0-9-2-12-6-4-3-6-8-6-13 0-5 2-9 6-13 3-3 7-5 12-5l74 0c5 0 9 2 12 5 4 4 6 8 6 13z m164 55l0-274c0-5-1-9-5-13-4-4-8-5-13-5l-402 0c-5 0-9 1-13 5-4 4-5 8-5 13l0 274c0 5 1 9 5 13 4 4 8 5 13 5l402 0c5 0 9-1 13-5 4-4 5-8 5-13z m19 128l0-73c0-5-2-9-6-13-3-3-8-5-13-5l-438 0c-5 0-10 2-13 5-4 4-6 8-6 13l0 73c0 5 2 9 6 13 3 4 8 5 13 5l438 0c5 0 10-1 13-5 4-4 6-8 6-13z"/>
 </font></defs></svg>
diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf
index 358e0068a123976bdae9bf24017f0853a3e44a91..841a221f8b76f46675e299976e9621b5115111ec 100644
GIT binary patch
delta 670
zcmYL{O=uHQ5Xb-TZT2J48jNWaOwxR8b`dRYV@y1lfS?i6mKIuyh#+f>4JBWtIYdR%
zqNtbl&@CQ3iPVF)LLuNu)Pt9Tr6-|!5yXN}FBN)_)Y(nIS@zBTX5P%(`R_g(SsQJF
z0qDUz1dM01lcTlQ--3X)LQ(&fOP8~lghX5?4vkF=#K*R8yaU)Z;;DSusBLY$odLK)
zu@}?ET<ze1IzcN@UYRc4z4PGjn-(DK0ez2)1>?5(<o+<_zS5m677I<oF~CJC_EJDC
zmg@~?MtDfPMm$xj=8c7=r(dYSD)D&PXw)#vmneUpI8-sp1$T1sBM@y+tWvAa)z9o-
zpQlzk#0&OtG~lmOi{?%Dg+DmNsSMak1oV#Q0ezXJnQms-r@Y5b((79zz;9OrD@2w^
zemFp<K%uMCCWm`8u4NZtbf4&0VhJZ`4Iqd<L=Zw4QK--mGmHEY*J9>-?lT49H+O$n
z-xGcWPYUoL#&+2@j?(6H)Fq*7r&&andd-)zw|O=k_oaHhvJ?$RbS=#isU(Gt`&dd6
z<(w=^UAO8|+7-p+QrNQMIwpxqJEu_6;bbkRLt-8aL`9ZFQOdM;?TsE<8&~a++;P@K
zz+pV^D!^d=jC_~l=*JKS&CRIli1!Z-n)}gNQf@{a;Y?j`sXc61xK*_zB4eZnx9g7(
eS!&Q<LM)I9jFhy<GD|INq+flu{QvI~(EkCRY<gP&

delta 453
zcmX|-O(;ZB6vzMXzQG`wg=~y5cyCrFgG>}k7!pR2ER<ejc*XEE)cD9pHa<#nH&&X3
znyuK_Nhv8SHi{+LC=!Lu_&>_MozD54)BoIa?qT<O*D@3Ud02sp-cYE&+e*H<0R5R+
zcYAAF2z|&TUy;4xzRK$G-OwqZ43Y;TF~hoPIr#>JgSq`NBW|VB>;(Osb?4Z`+~`*L
zG6bmafak%C8Y3C2JB_T}(}JcMT{aw*B7@=rCNwiPlgO@6m&k|Y{)wrGvAUfoWP<~8
zPs~VIu*5d&b!6|P5sSKl8@E6iO_{W&;xnJ$M^9|kL0<S>jtkaa&3+B%H+&#hPzGFA
zrILSMq>{TzqvDfI%0-0FFl(FpR|)Kq><@CofkpZpI3aj}4s>Fk%i5=zvGEtD@5r{o
zNwaq<h6g1mgBPVJhbB$2CZNkRQ7BdQg`JMy)klw<D}T+ZK>&W#OH0!nH35IU+|#Bx
aS&rUyJgDa>a@^-pbh+s(%KaZdmHYv#c4n3U

diff --git a/app/assets/fonts/icons.woff b/app/assets/fonts/icons.woff
index 3d7db421ebee62ee89ddc1bfe9a135296534984b..0e89bddd1090f890d931b4f9a1aba617bb05ce0b 100644
GIT binary patch
delta 7515
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

delta 7424
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

diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss
index 8c1f77f7e..d71ab1884 100644
--- a/app/assets/stylesheets/icons.scss
+++ b/app/assets/stylesheets/icons.scss
@@ -139,7 +139,9 @@
 .icon-print:before {
   content: "H";
 }
-
 .icon-blog:before {
   content: "J";
-}
\ No newline at end of file
+}
+.icon-box:before {
+  content: "I";
+}

From ebcb1009aeb2cf34ec2291aa8d7f77e9a3bffc5e Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Fri, 2 Oct 2015 15:15:05 +0200
Subject: [PATCH 08/37] Changes texts and styles for verification process

---
 app/assets/stylesheets/participacion.scss     | 61 ++++++++++++++
 app/views/account/show.html.erb               | 79 +++++++++++++------
 app/views/verification/letter/edit.html.erb   | 13 +--
 app/views/verification/letter/new.html.erb    | 36 +++++++--
 app/views/verification/residence/new.html.erb | 14 +++-
 app/views/verification/sms/new.html.erb       |  1 +
 app/views/welcome/welcome.html.erb            | 38 ++++++---
 config/locales/en.yml                         | 35 ++++----
 config/locales/es.yml                         | 33 ++++----
 config/locales/verification.en.yml            | 33 ++++----
 config/locales/verification.es.yml            | 36 +++++----
 11 files changed, 263 insertions(+), 116 deletions(-)

diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss
index 6e518080f..520a836aa 100644
--- a/app/assets/stylesheets/participacion.scss
+++ b/app/assets/stylesheets/participacion.scss
@@ -277,6 +277,10 @@ h6 {
   margin: rem-calc(24) 0;
 }
 
+.text-medium {
+  font-size: rem-calc(16) !important;
+}
+
 // 04. Header
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -1074,6 +1078,10 @@ label.error, label.error a {
     margin-bottom: $line-height;
   }
 
+  h1.avatar {
+    margin-left: rem-calc(12);
+  }
+
   h3 {
     clear: both;
     font-size: rem-calc(20);
@@ -1108,6 +1116,25 @@ label.error, label.error a {
   .verify-account {
     padding-right: rem-calc(12);
   }
+
+  .final-votes-info {
+    background: $warning-bg;
+    border: 1px solid $warning-border;
+    color: $warning-color;
+    margin-top: rem-calc(24);
+    padding: rem-calc(12);
+
+    ul li {
+      margin: rem-calc(12) 0;
+    }
+
+    .icon-box {
+      color: #D4A26D;
+      font-size: rem-calc(120);
+      line-height: rem-calc(120);
+      vertical-align: top;
+    }
+  }
 }
 
 img.avatar, img.admin-avatar, img.moderator-avatar {
@@ -1133,6 +1160,40 @@ img.initialjs-avatar {
   top: -9px;
 }
 
+.user-permissions {
+
+  p {
+    span {
+      color: $text-medium;
+      font-size: rem-calc(12);
+    }
+  }
+
+  ul {
+    list-style-type: none;
+    margin-bottom: 0;
+    margin-left: 0;
+
+    li {
+      font-size: rem-calc(14);
+      margin-bottom: rem-calc(12);
+
+      span {
+        color: $text-medium;
+        font-size: rem-calc(12);
+      }
+
+      .icon-check {
+        color: $check;
+      }
+
+      .icon-x {
+        color: $delete;
+      }
+    }
+  }
+}
+
 // 11. Filters & search
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb
index ce8732845..c52219955 100644
--- a/app/views/account/show.html.erb
+++ b/app/views/account/show.html.erb
@@ -1,35 +1,20 @@
 <div class="row account">
   <div class="small-12 column">
     <%= link_to t("account.show.change_credentials_link"), edit_user_registration_path, class: "button radius small secondary right" %>
-    <% unless @account.organization? %>
-      <div>
-        <span class="right verify-account">
-          <% if current_user.level_three_verified? %>
-            <p class="already-verified">
-              <i class="icon-check"></i>
-              <%= t("account.show.verified_account") %>
-            </p>
-          <% elsif current_user.level_two_verified? %>
-            <%= link_to t("account.show.finish_verification"), verification_path, class: "button radius small success right" %>
-          <% else %>
-            <%= link_to t("account.show.verify_my_account"), verification_path, class: "button radius small success right" %>
-          <% end %>
-        </span>
-      </div>
-    <% end %>
-    <h1 class="inline-block"><%= t("account.show.title") %></h1>
+
+    <%= avatar_image(@account, seed: @account.id, size: 60) %>
+
+    <h1 class="inline-block avatar"><%= t("account.show.title") %></h1>
 
     <%= form_for @account, as: :account, url: account_path do |f| %>
       <%= render "shared/errors", resource: @account %>
 
       <div class="row">
-        <div class="small-12 column">
-          <h2><%= t("account.show.avatar")%></h2>
-          <%= avatar_image(@account, seed: @account.id, size: 60) %>
+        <div class="small-12 medium-6 column">
 
           <h2><%= t("account.show.personal")%></h2>
 
-          <div class="small-12 medium-4">
+          <div class="small-12 medium-10">
             <% if @account.organization? %>
               <%= f.fields_for :organization do |fo| %>
                 <%= fo.text_field :name, autofocus: true, maxlength: Organization.name_max_length, placeholder: t("account.show.organization_name_label") %>
@@ -57,10 +42,58 @@
               <span class="checkbox"><%= t("account.show.email_on_comment_reply_label") %></span>
             <% end %>
           </div>
+
+          <%= f.submit t("account.show.save_changes_submit"), class: "button radius" %>
         </div>
 
-        <div class="small-12 column">
-          <%= f.submit t("account.show.save_changes_submit"), class: "button radius" %>
+        <div class="user-permissions small-12 medium-6 column">
+          <h2><%= t("account.show.user_permission_title") %></h2>
+
+          <p><%= t("account.show.user_permission_info") %></p>
+
+          <ul>
+            <li><i class="icon-check"></i>&nbsp;<%= t("account.show.user_permission_debates") %></li>
+            <li><i class="icon-check"></i>&nbsp;<%= t("account.show.user_permission_proposal") %></li>
+            <li>
+              <% if current_user.level_two_verified? || current_user.level_three_verified? %>
+                <i class="icon-check"></i>
+              <% else %>
+                <i class="icon-x"></i>
+              <% end %>
+              <%= t("account.show.user_permission_support_proposal") %>
+            </li>
+            <li>
+              <% if current_user.level_three_verified? %>
+                <i class="icon-check"></i>
+              <% else %>
+                <i class="icon-x"></i>
+              <% end %>
+              <%= t("account.show.user_permission_votes") %>
+            </li>
+          </ul>
+
+          <p>
+            <span><%= t("account.show.user_permission_verify_info") %></span>
+            <br>
+            <%= t("account.show.user_permission_verify") %>
+          </p>
+
+          <% unless @account.organization? %>
+            <div>
+              <span class="verify-account">
+                <% if current_user.level_three_verified? %>
+                  <p class="already-verified">
+                    <i class="icon-check"></i>
+                    <%= t("account.show.verified_account") %>
+                  </p>
+                <% elsif current_user.level_two_verified? %>
+                  <%= link_to t("account.show.finish_verification"), verification_path, class: "button radius small success" %>
+                <% else %>
+                  <%= link_to t("account.show.verify_my_account"), verification_path, class: "button radius small success" %>
+                <% end %>
+              </span>
+            </div>
+          <% end %>
         </div>
       </div>
     <% end %>
diff --git a/app/views/verification/letter/edit.html.erb b/app/views/verification/letter/edit.html.erb
index 1c366ff22..1ed2cff3d 100644
--- a/app/views/verification/letter/edit.html.erb
+++ b/app/views/verification/letter/edit.html.erb
@@ -9,8 +9,6 @@
 
     <h1><%= t("verification.letter.edit.title") %></h1>
 
-    <%= t("verification.letter.edit.explanation_html") %>
-
     <div class="alert-box success radius clear margin-top">
       <%= t("verification.letter.create.flash.success_html",
           offices: link_to(t("verification.letter.create.flash.offices"),
@@ -19,15 +17,6 @@
       %>
     </div>
 
-    <%= form_for @letter, as: "letter", url: letter_path, method: :put do |f| %>
-      <div class="small-12 medium-6 inline-block">
-        <%= f.text_field :verification_code,
-            label: t("verification.letter.edit.confirmation_code"),
-            placeholder: t("verification.letter.edit.confirmation_code") %>
-      </div>
-      <%= f.submit t("verification.letter.new.send_code"), class: "button radius success" %>
-    <% end %>
-
-    <%= link_to t("verification.letter.edit.see_all"), highlights_path, class: "button warning radius" %>
+    <%= link_to t("verification.letter.edit.see_all"), highlights_path, class: "button success radius" %>
   </div>
 </div>
diff --git a/app/views/verification/letter/new.html.erb b/app/views/verification/letter/new.html.erb
index addddc610..f302492a3 100644
--- a/app/views/verification/letter/new.html.erb
+++ b/app/views/verification/letter/new.html.erb
@@ -17,7 +17,7 @@
       </div>
     </div>
 
-    <div class="small-12 medium-12 column">
+    <div class="small-12 medium-4 column">
 
       <%= link_to account_path, class: "left back clear" do %>
         <i class="icon-angle-left left"></i>
@@ -26,16 +26,36 @@
 
       <h1><%= t("verification.letter.new.title") %></h1>
 
-      <%= t("verification.letter.new.explanation_html") %>
+      <div class="user-permissions">
 
-      <%= link_to t("verification.letter.new.offices"), t("verification.letter.new.offices_url"),
-          target: "_blank", class: "button radius inline-block"
-      %>
+        <p class="text-medium"><%= t("verification.letter.new.user_permission_info") %></p>
 
-      <%= form_for @letter, as: "letter", url: letter_path do |f| %>
-        <%= f.submit t("verification.letter.new.send_letter"), class: "button radius secondary inline-block" %>
-      <% end %>
+        <ul>
+          <li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_debates") %></li>
+          <li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_proposal") %></li>
+          <li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_support_proposal") %></li>
+          <li><i class="icon-x"></i>&nbsp;<%= t("verification.user_permission_votes") %></li>
+        </ul>
+      </div>
 
+      <%= link_to t("verification.letter.new.go_to_index"), root_path, class: "button radius success" %>
+    </div>
+    <div class="small-12 medium-8 column final-votes-info">
+
+      <i class="icon-box"></i>
+
+      <p class="text-medium"><strong><%= t("verification.letter.new.explanation") %></strong></p>
+
+      <ul>
+        <li>
+          <%= t("verification.letter.new.office",
+          office: link_to(t("verification.letter.new.offices"), t("verification.letter.new.offices_url"),
+          target: "blank")).html_safe %>
+        </li>
+        <li>
+          <%= link_to t("verification.letter.new.send_letter"), letter_path, method: :post %>
+        </li>
+      </ul>
     </div>
   </div>
 </div>
diff --git a/app/views/verification/residence/new.html.erb b/app/views/verification/residence/new.html.erb
index 96afaeafd..26b7f2cc8 100644
--- a/app/views/verification/residence/new.html.erb
+++ b/app/views/verification/residence/new.html.erb
@@ -24,6 +24,17 @@
 
     <h1><%= t("verification.residence.new.title") %></h1>
 
+    <div class="user-permissions small-12">
+      <p><%= t("verification.user_permission_info") %></p>
+
+      <ul>
+        <li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_debates") %></li>
+        <li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_proposal") %></li>
+        <li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_support_proposal") %></li>
+        <li><i class="icon-x"></i>&nbsp;<%= t("verification.user_permission_votes") %></li>
+      </ul>
+    </div>
+
     <%= form_for @residence, as: "residence", url: residence_path do |f| %>
       <%= render "errors" %>
 
@@ -46,8 +57,9 @@
                         label: false %>
       </div>
 
-      <div class="small-12 medium-4 clear">
+      <div class="small-12 medium-5 clear">
         <%= f.label t("verification.residence.new.postal_code") %>
+        <p class="note"><%= t("verification.residence.new.postal_code_note") %></p>
         <%= f.text_field :postal_code, label: false %>
       </div>
 
diff --git a/app/views/verification/sms/new.html.erb b/app/views/verification/sms/new.html.erb
index b2fb6d1e1..1bc047105 100644
--- a/app/views/verification/sms/new.html.erb
+++ b/app/views/verification/sms/new.html.erb
@@ -29,6 +29,7 @@
 
       <div class="small-12 medium-6">
         <%= f.label t("verification.sms.new.phone") %>
+        <p class="note"><%= t("verification.sms.new.phone_note") %></p>
         <%= f.text_field :phone, label: false %>
       </div>
 
diff --git a/app/views/welcome/welcome.html.erb b/app/views/welcome/welcome.html.erb
index 181e9703b..34cc2b875 100644
--- a/app/views/welcome/welcome.html.erb
+++ b/app/views/welcome/welcome.html.erb
@@ -1,13 +1,27 @@
 <h2><%= t("welcome.welcome.title") %></h2>
-<p><%= t("welcome.welcome.instructions_1_html") %></p>
-<p><%= t("welcome.welcome.instructions_2_html") %></p>
-<p><%= t("welcome.welcome.instructions_3_html") %></p>
-<p>
-  <%= link_to t("welcome.welcome.verify_account"),
-      verification_path, class: "button success radius margin-top expand" %>
-</p>
-<p class="text-center">
-  <%= link_to t("welcome.welcome.go_to_index"),
-      root_path, class: "small margin-top expand" %>
-</p>
-<p><%= t("welcome.welcome.instructions_4_html") %></p>
+
+<div class="user-permissions">
+
+  <p><%= t("welcome.welcome.user_permission_info") %></p>
+
+  <ul>
+    <li><i class="icon-check"></i>&nbsp;<%= t("welcome.welcome.user_permission_debates") %></li>
+    <li><i class="icon-check"></i>&nbsp;<%= t("welcome.welcome.user_permission_proposal") %></li>
+    <li><i class="icon-x"></i>&nbsp;<%= t("welcome.welcome.user_permission_support_proposal") %></li>
+    <li><i class="icon-x"></i>&nbsp;<%= t("welcome.welcome.user_permission_votes") %></li>
+  </ul>
+
+  <p>
+    <span><%= t("welcome.welcome.user_permission_verify_info") %></span>
+  </p>
+
+  <p class="text-medium">
+    <%= t("welcome.welcome.user_permission_verify",
+    verify: link_to(t("welcome.welcome.user_permission_verify_url"), verification_path)).html_safe %>
+  </p>
+
+  <p class="text-center">
+    <%= link_to t("welcome.welcome.go_to_index"),
+        verification_path, class: "button success radius" %>
+  </p>
+</div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0f5bbcc10..a070b7e3f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -15,13 +15,6 @@ en:
       open_city_slogan_html:
         "Start listening to Madrid.
         For that we open this digital Puerta del Sol, where all the locals can meet to discuss and share everything we want."
-      #   "Existen ciudades gobernadas directamente por sus habitantes, que <b>debaten</b> sobre temas que les preocupan, <b>proponen</b> ideas para mejorar
-      # sus vidas y <b>deciden</b> entre todas y todos las que se llevan a cabo. Madrid ya es una de ellas."
-      # open_city_text:
-      #   "Here every voice has its place and are citizens, and no one in their name, they decide to vote debates what issues are
-      #   most important of every time. Government officials have individual users with whom you may participate in the debates, and evaluated,
-      #   the same level as everyone else. Because the Madrid City Council works for its citizens, and must respond to them."
-      # open_city_soon: "And soon... we'll open the section for citizen proposals."
       see_all: See debates and proposals
       my_account_link: My account
       locale: "Language:"
@@ -279,10 +272,9 @@ en:
     show:
       title: "My account"
       save_changes_submit: "Save changes"
+      change_credentials_link: "Change my credentials"
       email_on_comment_label: "Receive email when someone comments on my debates or proposals"
       email_on_comment_reply_label: "Receive email when someone replies to my comments"
-      change_credentials_link: "Change my credentials"
-      avatar: "Avatar"
       personal: "Personal data"
       username_label: "Username"
       phone_number_label: "Phone number"
@@ -292,6 +284,14 @@ en:
       finish_verification: "Finish verification"
       verified_account: Verified account
       verify_my_account: Verify my account
+      user_permission_title: "Participation"
+      user_permission_info: "With your account you can..."
+      user_permission_debates: "Participate on debates"
+      user_permission_proposal: "Create new proposals"
+      user_permission_support_proposal: "Support proposals"
+      user_permission_votes: "Participate on final voting"
+      user_permission_verify: "To perform all the actions verify your account."
+      user_permission_verify_info: "* Only for users on Madrid City Census."
   simple_captcha:
     placeholder: "Enter the image value"
     label: "Enter the image value in the next form"
@@ -328,13 +328,16 @@ en:
       title: "It does"
       description: "If the proposal is accepted mostly, the City Council makes his own and done."
     welcome:
-      title: Account verification
-      instructions_1_html: "Welcome to the public participation website."
-      instructions_2_html: "We have detected that <b>your email is confirmed but we were not able to verify your citizen data</b>."
-      instructions_3_html: "Without verifying them, <b>you have only partial access to the website</b>. You need to be verified, for example, in order to participate in public proposals."
-      verify_account: "Verify my account now"
-      go_to_index: "I prefer to continue as a non-verified user with limited access"
-      instructions_4_html: "If you want to verify your account later on, you can do so in <i>My account -> Verify my account</i>."
+      title: "Participate"
+      go_to_index: "See proposals and debates"
+      user_permission_info: "With your account you can..."
+      user_permission_debates: "Participate on debates"
+      user_permission_proposal: "Create new proposals"
+      user_permission_support_proposal: "Support proposals*"
+      user_permission_votes: "Participate on final voting*"
+      user_permission_verify: "To perform all the actions %{verify}."
+      user_permission_verify_url: "verify your account"
+      user_permission_verify_info: "* Only for users on Madrid City Census."
   omniauth:
     finish_signup:
       title: Add Email
diff --git a/config/locales/es.yml b/config/locales/es.yml
index a79c93097..85285e010 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -15,13 +15,6 @@ es:
       open_city_slogan_html:
         "Existen ciudades gobernadas directamente por sus habitantes, que <b>debaten</b> sobre temas que les preocupan, <b>proponen</b> ideas para mejorar
         sus vidas y <b>deciden</b> entre todas y todos las que se llevan a cabo. Madrid ya es una de ellas."
-      #"Empecemos escuchando qué tiene que decir Madrid.
-      #Para ello abrimos esta Puerta del Sol digital, donde toda la gente de Madrid podemos encontrarnos para debatir y compartir todo lo que queramos."
-      # open_city_text:
-      #   "Aquí cualquier voz tiene su espacio y son los ciudadanos y ciudadanas, y nadie en su nombre, quienes deciden votando los debates cuáles son los temas
-      #    más importantes de cada momento. Los responsables del gobierno tienen cuentas de usuario propias con las que podrán participar en los debates, y ser evaluados
-      #    al mismo nivel que todos los demás."
-      # open_city_soon: "Muy pronto abriremos la sección de propuestas ciudadanas, donde cualquiera podrá presentar propuestas y, si reciben apoyo, serán puestas en marcha por el Ayuntamiento."
       see_all: Ver debates y propuestas
       my_account_link: Mi cuenta
       locale: "Idioma:"
@@ -282,7 +275,6 @@ es:
       change_credentials_link: "Cambiar mis datos de acceso"
       email_on_comment_label: "Recibir un email cuando alguien comenta en mis propuestas o debates"
       email_on_comment_reply_label: "Recibir un email cuando alguien contesta a mis comentarios"
-      avatar: "Avatar"
       personal: "Datos personales"
       username_label: "Nombre de usuario"
       phone_number_label: "Teléfono"
@@ -292,6 +284,14 @@ es:
       finish_verification: "Finalizar verificación"
       verified_account: Cuenta verificada
       verify_my_account: Verificar mi cuenta
+      user_permission_title: "Participación"
+      user_permission_info: "Con tu cuenta ya puedes..."
+      user_permission_debates: "Participar en debates"
+      user_permission_proposal: "Crear nuevas propuestas"
+      user_permission_support_proposal: "Apoyar propuestas*"
+      user_permission_votes: "Participar en las votaciones finales*"
+      user_permission_verify: "Para poder realizar todas las acciones verifica tu cuenta."
+      user_permission_verify_info: "* Sólo usuarios empadronados en el municipio de Madrid."
   simple_captcha:
     placeholder: "Introduce el texto de la imagen"
     label: "Introduce el texto de la imagen en la siguiente caja"
@@ -328,13 +328,16 @@ es:
       title: "Se hace"
       description: "Si la propuesta es aceptada mayoritariamente, el Ayuntamiento la asume como propia y se hace."
     welcome:
-      title: Verificación de cuenta
-      instructions_1_html: "Bienvenido a la página de participación ciudadana"
-      instructions_2_html: "Hemos detectado que <b>tu dirección de email está confirmada pero no hemos verificado tus datos todavía</b>."
-      instructions_3_html: "Sin verificar tus datos <b>el acceso que tienes es limitado</b>. Verificarlos ahora te permitirá, por ejemplo, apoyar propuestas ciudadanas."
-      verify_account: "Verificar mi cuenta"
-      go_to_index: "Quiero entrar como un usuario no verificado (acceso limitado)"
-      instructions_4_html: "Si quieres verificarte más tarde, puedes hacerlo en <i>Mi cuenta > Verificar mi cuenta</i>."
+      title: "Empieza a participar"
+      go_to_index: "Ver propuestas y debates"
+      user_permission_info: "Con tu cuenta ya puedes..."
+      user_permission_debates: "Participar en debates"
+      user_permission_proposal: "Crear nuevas propuestas"
+      user_permission_support_proposal: "Apoyar propuestas*"
+      user_permission_votes: "Participar en las votaciones finales*"
+      user_permission_verify: "Para poder realizar todas las acciones %{verify}."
+      user_permission_verify_url: "verifica tu cuenta"
+      user_permission_verify_info: "* Sólo usuarios empadronados en el municipio de Madrid."
   omniauth:
     finish_signup:
       title: Añade tu email
diff --git a/config/locales/verification.en.yml b/config/locales/verification.en.yml
index 845f7a5e7..729381932 100644
--- a/config/locales/verification.en.yml
+++ b/config/locales/verification.en.yml
@@ -2,10 +2,15 @@ en:
   verification:
     back: "Back to my account"
     step_1: "Residence"
-    step_2: "Confirmation code"
+    step_2: "SMS confirmation"
     step_3: "Final verification"
     alert:
       lock: "You have reached the maximum number of verification tries. Please try again later."
+    user_permission_info: "Verifing your information you'll be able to..."
+    user_permission_debates: "Participar en debates"
+    user_permission_proposal: "Crear nuevas propuestas"
+    user_permission_support_proposal: "Apoyar propuestas*"
+    user_permission_votes: "Participar en las votaciones finales*"
     residence:
       new:
         title: "Verify residence"
@@ -17,6 +22,7 @@ en:
         document_number: "Document number"
         date_of_birth: "Date of birth"
         postal_code: "Postal code"
+        postal_code_note: "To verify your account you must be on Madrid city Census"
         accept_terms_text: "I accept %{terms_url} to access the city Census"
         terms: "the terms"
         verify_residence: "Verify residence"
@@ -33,15 +39,16 @@ en:
       new:
         title: "Phone verification"
         phone: "Enter your phone for recive the code"
+        phone_note: "We only user your phone for send to you a code, we never contact to you."
         submit_button: "Send"
       create:
         flash:
           success: "Enter the confirmation code we have sent your phone"
       edit:
-        title: "Security code confirmation"
+        title: "Phone confirmation"
         confirmation_code: "Code confirmation"
         resend_sms_text: "You have not received the confirmation code in your phone?"
-        resend_sms_link: "Click here to send the confirmation code again"
+        resend_sms_link: "Request a new code"
         submit_button: "Send"
       update:
         error: "Incorrect confirmation code"
@@ -64,22 +71,20 @@ en:
     letter:
       new:
         title: "Final Verification"
-        explanation_html:
-          "<p>Congratulations! You can now participate in discussions or support proposals of others.</p><p>To finish we need to verify your account completely provide you with a <b>maximum security code</b>, we ensure that no one is using your data on your behalf.</p><p>This requirement is essential to participate in final votes on motions. This can approach any <b>Office of Citizen</b> where you will verify in person, or in case you is impossible, we can send you a letter home with the code.</p>"
-        offices: "See Office of Citizen"
+        user_permission_info: "With your account you can..."
+        explanation: "For participate on final voting you can:"
+        office: "Verify in any %{office}"
+        offices: "Office of Citizen"
         offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
-        send_letter: "Send me a letter with the code"
-        send_code: "Send"
+        send_letter: "request a letter"
+        go_to_index: "See proposals and debates"
       create:
         flash:
-          success_html: "Thank you for requesting a maximum security code in a few days we will send it to the address on your census data."
-          offices: "Oficinas de Atención al Ciudadano"
+          success_html: "Before voting you'll receive a letter whith the instructions for verify your account.<br> Remember you can verify your information in any %{offices}."
+          offices: "Office of Citizen"
           offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
       edit:
-        title: "Empieza a participar"
-        confirmation_code: "Introduce aquí el código de máxima seguridad cuando recibas tu carta"
-        explanation_html:
-          "<p><b>¡Felicidades! Ya puedes participar en debates o apoyar propuestas de otras personas.</p>"
+        title: "Letter requested"
         see_all: "Ver debates y propuestas"
       update:
         flash:
diff --git a/config/locales/verification.es.yml b/config/locales/verification.es.yml
index a90fc9fe2..e3883a454 100644
--- a/config/locales/verification.es.yml
+++ b/config/locales/verification.es.yml
@@ -2,10 +2,16 @@ es:
   verification:
     back: "Volver a mi cuenta"
     step_1: "Residencia"
-    step_2: "Código de confirmación"
+    step_2: "SMS de confirmación"
     step_3: "Verificación final"
     alert:
       lock: "Has llegado al máximo número de intentos. Por favor intentalo de nuevo más tarde."
+    user_permission_info: "Al verificar tus datos podrás..."
+    user_permission_debates: "Participar en debates"
+    user_permission_proposal: "Crear nuevas propuestas"
+    user_permission_support_proposal: "Apoyar propuestas"
+    user_permission_votes: "Participar en las votaciones finales"
+    user_permission_verify_info: ""
     residence:
       new:
         title: "Verificar residencia"
@@ -17,6 +23,7 @@ es:
         document_number: "Número de documento"
         date_of_birth: "Fecha de nacimiento"
         postal_code: "Código postal"
+        postal_code_note: "Para verificar tus datos debes estar empadronado en el municipio de Madrid"
         accept_terms_text: "Acepto %{terms_url} al Padrón"
         terms: "los términos de acceso"
         verify_residence: "Verificar residencia"
@@ -31,17 +38,18 @@ es:
         unconfirmed_residency: "Aún no has verificado tu residencia"
     sms:
       new:
-        title: "Recibir código de confirmación"
+        title: "SMS de confirmación"
         phone: "Introduce tu teléfono móvil para recibir el código"
+        phone_note: "Sólo usaremos tu teléfono para enviarte un código, nunca te contactaremos."
         submit_button: "Enviar"
       create:
         flash:
           success: "Introduce el código de confirmación que te hemos enviado por mensaje de texto"
       edit:
-        title: "Confirmación de código de seguridad"
+        title: "SMS de confirmación"
         confirmation_code: "Introduce el código que has recibido en tu móvil"
         resend_sms_text: "¿No has recibido un mensaje de texto con tu código de confirmación?"
-        resend_sms_link: "Haz click aquí para volver a enviártelo"
+        resend_sms_link: "Solicitar un nuevo código"
         submit_button: "Enviar"
       update:
         error: "Código de confirmación incorrecto"
@@ -63,23 +71,21 @@ es:
           failure: "Hubo un problema enviándote un email a tu cuenta"
     letter:
       new:
-        title: "Verificación Final"
-        explanation_html:
-          "<p>¡Felicidades! Ya puedes participar en debates o apoyar propuestas de otras personas.</p><p>Para terminar de verificar tu cuenta completamente necesitamos proporcionarte un <b>código de máxima seguridad</b>, que nos asegure que nadie está utilizando tus datos en tu nombre.</p><p>Este requerimiento es esencial para participar en las votaciones finales de las propuestas. Para ello puedes acercarte a cualquier <b>Oficina de Atención al Ciudadano</b> donde te verificarán presencialmente, o en caso de que te sea imposible, podemos mandarte una carta a casa con el código.</p>"
-        offices: "Ver Oficinas de Atención al Ciudadano"
+        title: "¡Felicidades!"
+        user_permission_info: "Con tu cuenta ya puedes..."
+        explanation: "Para participar en las votaciones finales puedes:"
+        office: "Verificarte presencialmente en cualquier %{office}"
+        offices: "Oficina de Atención al Ciudadano"
         offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
-        send_letter: "Enviarme una carta con el código"
-        send_code: "Enviar"
+        send_letter: "Solicitar una carta por correo postal"
+        go_to_index: "Ver propuestas y debates"
       create:
         flash:
-          success_html: "Gracias por solicitar tu <b>código de máxima seguridad (solo necesario para las votaciones finales)</b>, en unos días te lo enviaremos a la dirección que figura en tus datos del padrón. Recuerda que puedes ahorrar el envío recogiendo tu código en cualquiera de las %{offices}."
+          success_html: "Antes de las votaciones recibirás una carta con las instrucciones para verificar tu cuenta.<br> Recuerda que puedes ahorrar el envío verificándote presencialmente en cualquiera de las %{offices}."
           offices: "Oficinas de Atención al Ciudadano"
           offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
       edit:
-        title: "Empieza a participar"
-        confirmation_code: "Introduce aquí el código de máxima seguridad cuando recibas tu carta"
-        explanation_html:
-          "<p><b>¡Felicidades! Ya puedes participar en debates o apoyar propuestas de otras personas.</p>"
+        title: "Carta solicitada"
         see_all: "Ver debates y propuestas"
       update:
         flash:

From 818887924ae7633782c44c9266c524e53e8f09c3 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Fri, 2 Oct 2015 17:13:34 +0200
Subject: [PATCH 09/37] Updates test for verification

---
 config/locales/verification.en.yml            |  4 +-
 config/locales/verification.es.yml            |  1 -
 spec/features/verification/letter_spec.rb     | 41 +++----------------
 .../level_three_verification_spec.rb          | 14 ++-----
 .../level_two_verification_spec.rb            |  2 +-
 spec/features/verification/sms_spec.rb        |  6 +--
 spec/support/common_actions.rb                |  2 +-
 7 files changed, 16 insertions(+), 54 deletions(-)

diff --git a/config/locales/verification.en.yml b/config/locales/verification.en.yml
index 729381932..1feb43860 100644
--- a/config/locales/verification.en.yml
+++ b/config/locales/verification.en.yml
@@ -76,7 +76,7 @@ en:
         office: "Verify in any %{office}"
         offices: "Office of Citizen"
         offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
-        send_letter: "request a letter"
+        send_letter: "Request a letter"
         go_to_index: "See proposals and debates"
       create:
         flash:
@@ -85,7 +85,7 @@ en:
           offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
       edit:
         title: "Letter requested"
-        see_all: "Ver debates y propuestas"
+        see_all: "See proposals and debates"
       update:
         flash:
           success: "Correct code. Your account is verified"
diff --git a/config/locales/verification.es.yml b/config/locales/verification.es.yml
index e3883a454..bf0102ad1 100644
--- a/config/locales/verification.es.yml
+++ b/config/locales/verification.es.yml
@@ -11,7 +11,6 @@ es:
     user_permission_proposal: "Crear nuevas propuestas"
     user_permission_support_proposal: "Apoyar propuestas"
     user_permission_votes: "Participar en las votaciones finales"
-    user_permission_verify_info: ""
     residence:
       new:
         title: "Verificar residencia"
diff --git a/spec/features/verification/letter_spec.rb b/spec/features/verification/letter_spec.rb
index 8c9282800..d4b7eeb30 100644
--- a/spec/features/verification/letter_spec.rb
+++ b/spec/features/verification/letter_spec.rb
@@ -10,15 +10,9 @@ feature 'Verify Letter' do
     login_as(user)
     visit new_letter_path
 
-    click_button "Send me a letter with the code"
+    click_link "Request a letter"
 
-    expect(page).to have_content "Thank you for requesting a maximum security code in a few days we will send it to the address on your census data."
-
-    user.reload
-    fill_in "letter_verification_code", with: user.letter_verification_code
-    click_button "Send"
-
-    expect(page).to have_content "Correct code. Your account is verified"
+    expect(page).to have_content "Before voting you'll receive a letter whith the instructions for verify your account."
   end
 
   scenario 'Go to office instead of send letter' do
@@ -29,7 +23,7 @@ feature 'Verify Letter' do
     login_as(user)
     visit new_letter_path
 
-    expect(page).to have_link "See Office of Citizen", href: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
+    expect(page).to have_link "Office of Citizen", href: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
   end
 
   scenario 'Errors on verification code' do
@@ -40,13 +34,9 @@ feature 'Verify Letter' do
     login_as(user)
     visit new_letter_path
 
-    click_button "Send me a letter with the code"
-    expect(page).to have_content "Thank you for requesting a maximum security code in a few days we will send it to the address on your census data."
+    click_link "Request a letter"
+    expect(page).to have_content "Before voting you'll receive a letter whith the instructions for verify your account."
 
-    fill_in "letter_verification_code", with: "1"
-    click_button "Send"
-
-    expect(page).to have_content "Incorrect confirmation code"
   end
 
   scenario "Deny access unless verified residence" do
@@ -68,25 +58,4 @@ feature 'Verify Letter' do
     expect(page).to have_content 'You have not yet enter the confirmation code'
     expect(current_path).to eq(new_sms_path)
   end
-
-  scenario '6 tries allowed' do
-    user = create(:user, residence_verified_at: Time.now, confirmed_phone: "611111111")
-    login_as(user)
-
-    visit new_letter_path
-    click_button 'Send me a letter with the code'
-
-    6.times do
-      fill_in 'letter_verification_code', with: "999999"
-      click_button 'Send'
-    end
-
-    expect(page).to have_content "You have reached the maximum number of verification tries. Please try again later."
-    expect(current_path).to eq(account_path)
-
-    visit new_letter_path
-    expect(page).to have_content "You have reached the maximum number of verification tries. Please try again later."
-    expect(current_path).to eq(account_path)
-  end
-
 end
diff --git a/spec/features/verification/level_three_verification_spec.rb b/spec/features/verification/level_three_verification_spec.rb
index 86368ff6b..b03741f42 100644
--- a/spec/features/verification/level_three_verification_spec.rb
+++ b/spec/features/verification/level_three_verification_spec.rb
@@ -20,7 +20,7 @@ feature 'Level three verification' do
       click_button "Send code"
     end
 
-    expect(page).to have_content 'Security code confirmation'
+    expect(page).to have_content 'Phone confirmation'
 
     user = user.reload
     fill_in 'sms_confirmation_code', with: user.sms_confirmation_code
@@ -75,7 +75,7 @@ feature 'Level three verification' do
     fill_in 'sms_phone', with: "611111111"
     click_button 'Send'
 
-    expect(page).to have_content 'Security code confirmation'
+    expect(page).to have_content 'Phone confirmation'
 
     user = user.reload
     fill_in 'sms_confirmation_code', with: user.sms_confirmation_code
@@ -83,14 +83,8 @@ feature 'Level three verification' do
 
     expect(page).to have_content 'Correct code'
 
-    click_button "Send me a letter with the code"
+    click_link "Request a letter"
 
-    expect(page).to have_content "Thank you for requesting a maximum security code in a few days we will send it to the address on your census data."
-
-    user.reload
-    fill_in "letter_verification_code", with: user.letter_verification_code
-    click_button "Send"
-
-    expect(page).to have_content "We have not sent you the letter with the code yet"
+    expect(page).to have_content "Before voting you'll receive a letter whith the instructions for verify your account."
   end
 end
\ No newline at end of file
diff --git a/spec/features/verification/level_two_verification_spec.rb b/spec/features/verification/level_two_verification_spec.rb
index dfb1e29c2..ac0bf1a2f 100644
--- a/spec/features/verification/level_two_verification_spec.rb
+++ b/spec/features/verification/level_two_verification_spec.rb
@@ -14,7 +14,7 @@ feature 'Level two verification' do
     fill_in 'sms_phone', with: "611111111"
     click_button 'Send'
 
-    expect(page).to have_content 'Security code confirmation'
+    expect(page).to have_content 'Phone confirmation'
 
     user = user.reload
     fill_in 'sms_confirmation_code', with: user.sms_confirmation_code
diff --git a/spec/features/verification/sms_spec.rb b/spec/features/verification/sms_spec.rb
index 3afe33a43..1d8026b81 100644
--- a/spec/features/verification/sms_spec.rb
+++ b/spec/features/verification/sms_spec.rb
@@ -11,7 +11,7 @@ feature 'SMS Verification' do
     fill_in 'sms_phone', with: "611111111"
     click_button 'Send'
 
-    expect(page).to have_content 'Security code confirmation'
+    expect(page).to have_content 'Phone confirmation'
 
     user = user.reload
     fill_in 'sms_confirmation_code', with: user.sms_confirmation_code
@@ -40,7 +40,7 @@ feature 'SMS Verification' do
     fill_in 'sms_phone', with: "611111111"
     click_button 'Send'
 
-    expect(page).to have_content 'Security code confirmation'
+    expect(page).to have_content 'Phone confirmation'
 
     click_button 'Send'
 
@@ -66,7 +66,7 @@ feature 'SMS Verification' do
     5.times do
       fill_in 'sms_phone', with: "611111111"
       click_button 'Send'
-      click_link 'Click here to send the confirmation code again'
+      click_link 'Request a new code'
     end
 
     expect(page).to have_content "You have reached the maximum number of verification tries. Please try again later."
diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb
index d1a6bcdf6..b07c93a89 100644
--- a/spec/support/common_actions.rb
+++ b/spec/support/common_actions.rb
@@ -127,7 +127,7 @@ module CommonActions
     fill_in 'sms_phone', with: "611111111"
     click_button 'Send'
 
-    expect(page).to have_content 'Security code confirmation'
+    expect(page).to have_content 'Phone confirmation'
 
     user = User.last.reload
     fill_in 'sms_confirmation_code', with: user.sms_confirmation_code

From b9275f1ddd423c53be270bd16fd07cda4463c15c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Sat, 3 Oct 2015 13:12:15 +0200
Subject: [PATCH 10/37] fixes build

---
 db/seeds.rb                 | 2 +-
 spec/features/stats_spec.rb | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/db/seeds.rb b/db/seeds.rb
index cef67b0f6..8e65d2925 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,5 +1,5 @@
 # Default admin user (change password after first deploy to a server!)
-if Administrator.count == 0
+if Administrator.count == 0 && !Rails.env.test?
   admin = User.create!(username: 'admin', email: 'admin@madrid.es', password: '12345678', password_confirmation: '12345678', confirmed_at: Time.now, terms_of_service: "1")
   admin.create_administrator
 end
diff --git a/spec/features/stats_spec.rb b/spec/features/stats_spec.rb
index ef8d15ad5..b0360aeb1 100644
--- a/spec/features/stats_spec.rb
+++ b/spec/features/stats_spec.rb
@@ -42,16 +42,10 @@ feature 'Stats' do
     end
 
     scenario 'Users' do
-      Administrator.destroy_all
-      User.all.map(&:really_destroy!)
-
       1.times { create(:user, :level_three) }
       2.times { create(:user, :level_two) }
       3.times { create(:user) }
 
-      admin = create(:administrator)
-      login_as(admin.user)
-
       visit admin_stats_path
 
       expect(page).to have_content "Level three users 1"

From 7db2fecbb1f05c478a05fb373286521d4d6978de Mon Sep 17 00:00:00 2001
From: juandefelix <juandefelix@yahoo.es>
Date: Sat, 3 Oct 2015 11:54:48 -0500
Subject: [PATCH 11/37] added validation for tag count

---
 app/models/concerns/taggable.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/models/concerns/taggable.rb b/app/models/concerns/taggable.rb
index 1cce0152d..52efc04a7 100644
--- a/app/models/concerns/taggable.rb
+++ b/app/models/concerns/taggable.rb
@@ -3,6 +3,7 @@ module Taggable
 
   included do
     acts_as_taggable
+    validate :max_number_of_tags
   end
 
   def tag_list_with_limit(limit = nil)
@@ -17,4 +18,8 @@ module Taggable
     count = tags.size - limit
     count < 0 ? 0 : count
   end
+
+  def max_number_of_tags
+    errors.add(:tag_list, :less_than_or_equal_to, count: 6) if tag_list.count > 6
+  end
 end

From 45a29f2f4d20990fd38780c0b2c34c9fbe18a900 Mon Sep 17 00:00:00 2001
From: juandefelix <juandefelix@yahoo.es>
Date: Sat, 3 Oct 2015 11:58:09 -0500
Subject: [PATCH 12/37] added tag_list errors translations

---
 config/locales/activerecord.en.yml | 10 ++++++++++
 config/locales/activerecord.es.yml | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml
index 303bd5ded..d72967bfa 100644
--- a/config/locales/activerecord.en.yml
+++ b/config/locales/activerecord.en.yml
@@ -34,3 +34,13 @@ en:
       organization:
         name: Organization name
         responsible_name: Person in charge
+    errors:
+      models:
+        debate:
+          attributes:
+            tag_list:
+              less_than_or_equal_to: tags must be less than or equal to %{count}
+        proposal:
+          attributes:
+            tag_list:
+              less_than_or_equal_to: tags must be less than or equal to %{count}
\ No newline at end of file
diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml
index 3ba5e7cca..f4bf58b04 100644
--- a/config/locales/activerecord.es.yml
+++ b/config/locales/activerecord.es.yml
@@ -56,3 +56,13 @@ es:
       organization:
         name: Nombre de organización
         responsible_name: Persona responsable del colectivo
+    errors:
+      models:
+        debate:
+          attributes:
+            tag_list:
+              less_than_or_equal_to: los temas deben ser menor o igual que %{count}
+        proposal:
+          attributes:
+            tag_list:
+              less_than_or_equal_to: los temas deben ser menor o igual que %{count}

From 03b0fceecc8dfa296a264bc8b18770267fdc4742 Mon Sep 17 00:00:00 2001
From: juandefelix <juandefelix@yahoo.es>
Date: Sat, 3 Oct 2015 11:59:14 -0500
Subject: [PATCH 13/37] updated tag visibility tests for the new valid tag
 count

---
 spec/features/debates_spec.rb   | 4 ++--
 spec/features/proposals_spec.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index e542feb99..21b131c79 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -339,13 +339,13 @@ feature 'Debates' do
 
   describe 'Limiting tags shown' do
     scenario 'Index page shows up to 5 tags per debate' do
-      tag_list = ["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa", "Huelgas"]
+      tag_list = ["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa"]
       create :debate, tag_list: tag_list
 
       visit debates_path
 
       within('.debate .tags') do
-        expect(page).to have_content '2+'
+        expect(page).to have_content '1+'
       end
     end
 
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index 453f3053a..ad5644747 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -422,13 +422,13 @@ feature 'Proposals' do
 
   describe 'Limiting tags shown' do
     scenario 'Index page shows up to 5 tags per proposal' do
-      tag_list = ["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa", "Huelgas"]
+      tag_list = ["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa"]
       create :proposal, tag_list: tag_list
 
       visit proposals_path
 
       within('.proposal .tags') do
-        expect(page).to have_content '2+'
+        expect(page).to have_content '1+'
       end
     end
 

From 2503350526626c349bbb71bef81f07a995f6df26 Mon Sep 17 00:00:00 2001
From: juandefelix <juandefelix@yahoo.es>
Date: Sat, 3 Oct 2015 11:59:54 -0500
Subject: [PATCH 14/37] added models tests for tag_list count validation

---
 spec/models/debate_spec.rb   | 20 ++++++++++++++++----
 spec/models/proposal_spec.rb | 20 ++++++++++++++++----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/spec/models/debate_spec.rb b/spec/models/debate_spec.rb
index c4ac619b0..a9ef3892a 100644
--- a/spec/models/debate_spec.rb
+++ b/spec/models/debate_spec.rb
@@ -57,10 +57,22 @@ describe Debate do
     end
   end
 
-  it "should sanitize the tag list" do
-    debate.tag_list = "user_id=1"
-    debate.valid?
-    expect(debate.tag_list).to eq(['user_id1'])
+  describe "#tag_list" do
+    it "should sanitize the tag list" do
+      debate.tag_list = "user_id=1"
+      debate.valid?
+      expect(debate.tag_list).to eq(['user_id1'])
+    end
+
+    it "should not be valid with a tag list of more than 6 elements" do
+      debate.tag_list = ["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa", "Huelgas"]
+      expect(debate).to_not be_valid
+    end
+
+    it "should be valid with a tag list of  6 elements" do
+      debate.tag_list = ["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa"]
+      expect(debate).to be_valid
+    end
   end
 
   it "should not be valid without accepting terms of service" do
diff --git a/spec/models/proposal_spec.rb b/spec/models/proposal_spec.rb
index 8b58d0eec..ac7c1edfb 100644
--- a/spec/models/proposal_spec.rb
+++ b/spec/models/proposal_spec.rb
@@ -99,10 +99,22 @@ describe Proposal do
     end
   end
 
-  it "should sanitize the tag list" do
-    proposal.tag_list = "user_id=1"
-    proposal.valid?
-    expect(proposal.tag_list).to eq(['user_id1'])
+  describe "tag_list" do
+    it "should sanitize the tag list" do
+      proposal.tag_list = "user_id=1"
+      proposal.valid?
+      expect(proposal.tag_list).to eq(['user_id1'])
+    end
+
+    it "should not be valid with a tag list of more than 6 elements" do
+      proposal.tag_list = ["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa", "Huelgas"]
+      expect(proposal).to_not be_valid
+    end
+
+    it "should be valid with a tag list of more than 6 elements" do
+      proposal.tag_list = ["Hacienda", "Economía", "Medio Ambiente", "Corrupción", "Fiestas populares", "Prensa"]
+      expect(proposal).to be_valid
+    end
   end
 
   it "should not be valid without accepting terms of service" do

From 7856839bfff1fa044a6044e6123beb4758769bb6 Mon Sep 17 00:00:00 2001
From: juandefelix <juandefelix@yahoo.es>
Date: Sat, 19 Sep 2015 20:05:09 -0500
Subject: [PATCH 15/37] added javascript to the test

---
 spec/features/debates_spec.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index f5238fd68..10b205770 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -50,14 +50,13 @@ feature 'Debates' do
     end
   end
 
-  scenario 'Show: "Back" link directs to previous page' do
+  scenario 'Show: "Back" link directs to previous page', :js do
     debate = create(:debate, title: 'Test Debate 1')
 
-    visit debates_path( order: :hot_score, page: 1)
+    visit debates_path(order: :hot_score, page: 1)
     find(:xpath, "//a[@href='/debates/#{debate.id}']", match: :first).click
-    click_link('Back')
-    
-    expect(current_url).to include(debates_path order: :hot_score, page: 1)
+
+    expect(find_link('Back')[:href]).to include(debates_path order: :hot_score, page: 1)
   end
 
   scenario 'Create' do

From 7ba8e3f2558af409a8815fdf0a04a2d5c9022123 Mon Sep 17 00:00:00 2001
From: juandefelix <juandefelix@yahoo.es>
Date: Sat, 3 Oct 2015 13:05:33 -0500
Subject: [PATCH 16/37] updated test systax

---
 spec/features/debates_spec.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index 10b205770..24811a7d0 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -54,9 +54,10 @@ feature 'Debates' do
     debate = create(:debate, title: 'Test Debate 1')
 
     visit debates_path(order: :hot_score, page: 1)
-    find(:xpath, "//a[@href='/debates/#{debate.id}']", match: :first).click
+    first(:link, debate.title).click
+    link_text = find_link('Back')[:href]
 
-    expect(find_link('Back')[:href]).to include(debates_path order: :hot_score, page: 1)
+    expect(link_text).to include(debates_path order: :hot_score, page: 1)
   end
 
   scenario 'Create' do

From 77a81578b7bac968ef87e76d026e0d83ccfccbfa Mon Sep 17 00:00:00 2001
From: juandefelix <juandefelix@yahoo.es>
Date: Sat, 3 Oct 2015 13:39:34 -0500
Subject: [PATCH 17/37] added features test for tag limit

---
 spec/features/tags_spec.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/spec/features/tags_spec.rb b/spec/features/tags_spec.rb
index 232c220c0..3f310071e 100644
--- a/spec/features/tags_spec.rb
+++ b/spec/features/tags_spec.rb
@@ -90,6 +90,24 @@ feature 'Tags' do
     expect(page).to have_content 'Impuestos'
   end
 
+  scenario 'Create with too many tags' do
+    user = create(:user)
+    login_as(user)
+
+    visit new_debate_path
+    fill_in 'debate_title', with: 'Title'
+    fill_in 'debate_description', with: 'Description'
+    fill_in 'debate_captcha', with: correct_captcha_text
+    check 'debate_terms_of_service'
+
+    fill_in 'debate_tag_list', with: "Impuestos, Economía, Hacienda, Sanidad, Educación, Política, Igualdad"
+
+    click_button 'Start a debate'
+
+    expect(page).to have_content '1 error prohibited this debate from being saved:'
+    expect(page).to have_content 'tags must be less than or equal to 6'
+  end
+
   scenario 'Update' do
     debate = create(:debate, tag_list: 'Economía')
 

From 0e968669ca938e50841d9d851df581eb00301921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Sun, 4 Oct 2015 13:39:44 +0200
Subject: [PATCH 18/37] updates dependencies

---
 Gemfile.lock | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 032d466cb..af3ddc1af 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -88,7 +88,7 @@ GEM
     capistrano-rvm (0.1.2)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
-    capistrano3-delayed-job (1.4.0)
+    capistrano3-delayed-job (1.4.1)
       capistrano (>= 3.0.0)
     capybara (2.5.0)
       mime-types (>= 1.16)
@@ -113,7 +113,7 @@ GEM
       execjs
     coffee-script-source (1.9.1.1)
     colorize (0.7.7)
-    coveralls (0.8.2)
+    coveralls (0.8.3)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.10.0)
@@ -175,12 +175,12 @@ GEM
     geocoder (1.2.11)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
-    groupdate (2.4.0)
+    groupdate (2.5.0)
       activesupport (>= 3)
     gyoku (1.3.1)
       builder (>= 2.1.2)
     hashie (3.4.2)
-    highline (1.7.6)
+    highline (1.7.7)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     httpi (2.4.1)
@@ -220,13 +220,13 @@ GEM
       mime-types (>= 1.16, < 3)
     mime-types (2.6.2)
     mini_portile (0.6.2)
-    minitest (5.8.0)
+    minitest (5.8.1)
     multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
+    net-ssh (3.0.1)
     netrc (0.10.3)
     newrelic_rpm (3.13.2.302)
     nokogiri (1.6.6.2)
@@ -245,7 +245,7 @@ GEM
       rack (~> 1.0)
     omniauth-facebook (2.0.1)
       omniauth-oauth2 (~> 1.2)
-    omniauth-google-oauth2 (0.2.7)
+    omniauth-google-oauth2 (0.2.8)
       addressable (~> 2.3)
       jwt (~> 1.0)
       multi_json (~> 1.3)
@@ -264,7 +264,7 @@ GEM
     paranoia (2.1.3)
       activerecord (~> 4.0)
     pg (0.18.3)
-    poltergeist (1.6.0)
+    poltergeist (1.7.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
@@ -356,8 +356,8 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     spring (1.4.0)
-    sprockets (3.3.4)
-      rack (~> 1.0)
+    sprockets (3.3.5)
+      rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)

From ca80da37bd0363393a6ddd2d6055db150301e711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Wed, 7 Oct 2015 15:34:50 +0200
Subject: [PATCH 19/37] updates rollbar

---
 Gemfile      | 2 +-
 Gemfile.lock | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 819f3194c..ec3f3930f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,7 @@ gem 'paranoia'
 gem 'rinku', require: 'rails_rinku'
 gem 'savon'
 gem 'dalli'
-gem 'rollbar', '~> 2.3.0'
+gem 'rollbar', '~> 2.4.0'
 gem 'delayed_job_active_record', '~> 4.1.0'
 gem 'daemons'
 gem 'devise-async'
diff --git a/Gemfile.lock b/Gemfile.lock
index af3ddc1af..1d846a940 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -239,7 +239,6 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    oj (2.12.14)
     omniauth (1.2.2)
       hashie (>= 1.2, < 4)
       rack (~> 1.0)
@@ -309,8 +308,8 @@ GEM
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     rinku (1.7.3)
-    rollbar (2.3.0)
-      oj (~> 2.12.14)
+    rollbar (2.4.0)
+      multi_json
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
@@ -461,7 +460,7 @@ DEPENDENCIES
   rails (= 4.2.4)
   responders
   rinku
-  rollbar (~> 2.3.0)
+  rollbar (~> 2.4.0)
   rspec-rails (~> 3.0)
   sass-rails (~> 5.0)
   savon

From b3c2830d2f4db42a7931ccaadefdb289c74304b0 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Thu, 8 Oct 2015 10:23:35 +0200
Subject: [PATCH 20/37] Changes blog url

---
 app/controllers/pages_controller.rb | 2 +-
 app/views/layouts/_footer.html.erb  | 2 +-
 app/views/layouts/_header.html.erb  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 2267c2360..daa90c7da 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -47,6 +47,6 @@ class PagesController < ApplicationController
   end
 
   def blog
-    redirect_to "http://diario.madrid.es/blog/category/gobiernoabierto/"
+    redirect_to "http://diario.madrid.es/participa/"
   end
 end
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 8718c781d..60ba049dd 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -57,7 +57,7 @@
         <%= link_to "https://www.facebook.com/Abriendo-Madrid-1475577616080350/", target: "_blank", title: t("social.facebook") do %>
           <i class="icon-facebook"></i>
         <% end %>
-        <%= link_to "http://diario.madrid.es/blog/category/gobiernoabierto/", target: "_blank", title: t("social.blog") do %>
+        <%= link_to "/blog", target: "_blank", title: t("social.blog") do %>
           <i class="icon-blog"></i>
         <% end %>
       </div>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 636e3323e..498b22795 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -14,7 +14,7 @@
             <%= link_to "https://www.facebook.com/Abriendo-Madrid-1475577616080350/", target: "_blank", title: t("social.facebook") do %>
               <i class="icon-facebook"></i>
             <% end %>
-            <%= link_to "http://diario.madrid.es/blog/category/gobiernoabierto/", target: "_blank", title: t("social.blog") do %>
+            <%= link_to "/blog", target: "_blank", title: t("social.blog") do %>
               <i class="icon-blog"></i>
             <% end %>
           </div>

From 8b2179ac896b7a9e52817765123504de0a698b2a Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Thu, 8 Oct 2015 21:31:19 +0200
Subject: [PATCH 21/37] Changes some texts

---
 config/locales/en.yml | 4 ++--
 config/locales/es.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a070b7e3f..6fb17a0d7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -37,7 +37,7 @@ en:
       transparency_text: Get any information on the City of Madrid.
       open_data_title:  Open Data
       open_data_text: "All City Council data are yours."
-      contact_us: "Contact us"
+      contact_us: "For technical support contact us"
       privacy: "Privacy Policy"
       conditions: "Terms of use"
       more_info: "More information"
@@ -152,7 +152,7 @@ en:
       select_order_long: Order proposals by
       orders:
         confidence_score: "most supported"
-        hot_score: most active
+        hot_score: "most active today"
         created_at: newest
         most_commented: most commented
         random: random
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 85285e010..0997e6e6c 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -37,7 +37,7 @@ es:
       transparency_text: "Obtén cualquier información sobre el Ayuntamiento de Madrid."
       open_data_title: Datos Abiertos
       open_data_text: "Todos los datos del Ayuntamiento son tuyos."
-      contact_us: "Contacta con nosotros en"
+      contact_us: "Para asistencia técnica contáctenos en"
       privacy: "Política de privacidad"
       conditions: "Condiciones de uso"
       more_info: "Más información"
@@ -152,7 +152,7 @@ es:
       select_order_long: Estás viendo las propuestas
       orders:
         confidence_score: "más apoyadas"
-        hot_score: "más activas"
+        hot_score: "más activas hoy"
         created_at: "más nuevas"
         most_commented: "más comentadas"
         random: "aleatorias"

From e86f585232a573cb42a49de1a1236dbec2d082d8 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Fri, 9 Oct 2015 11:30:57 +0200
Subject: [PATCH 22/37] Change some links to proposals

---
 app/views/layouts/_header.html.erb          | 2 +-
 app/views/verification/letter/edit.html.erb | 2 +-
 app/views/verification/letter/new.html.erb  | 2 +-
 config/locales/en.yml                       | 2 +-
 config/locales/es.yml                       | 2 +-
 config/locales/verification.en.yml          | 4 ++--
 config/locales/verification.es.yml          | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 636e3323e..0afc43f12 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -64,7 +64,7 @@
       <div class="small-12 medium-7 column">
         <h1><%= t("layouts.header.open_city_title") %></h1>
         <p><%= t("layouts.header.open_city_slogan_html") %></p>
-        <%= link_to t("layouts.header.see_all"), highlights_path, class: "button radius see-more warning" %>
+        <%= link_to t("layouts.header.see_all"), proposals_path, class: "button radius see-more warning" %>
         <%= link_to t("layouts.header.more_information"), "/more_information", class: "more-info" %>
       </div>
 
diff --git a/app/views/verification/letter/edit.html.erb b/app/views/verification/letter/edit.html.erb
index 1ed2cff3d..d5722f1fb 100644
--- a/app/views/verification/letter/edit.html.erb
+++ b/app/views/verification/letter/edit.html.erb
@@ -17,6 +17,6 @@
       %>
     </div>
 
-    <%= link_to t("verification.letter.edit.see_all"), highlights_path, class: "button success radius" %>
+    <%= link_to t("verification.letter.edit.see_all"), proposals_path, class: "button warning radius" %>
   </div>
 </div>
diff --git a/app/views/verification/letter/new.html.erb b/app/views/verification/letter/new.html.erb
index f302492a3..47bd7f0fc 100644
--- a/app/views/verification/letter/new.html.erb
+++ b/app/views/verification/letter/new.html.erb
@@ -38,7 +38,7 @@
         </ul>
       </div>
 
-      <%= link_to t("verification.letter.new.go_to_index"), root_path, class: "button radius success" %>
+      <%= link_to t("verification.letter.new.go_to_index"), root_path, class: "button radius warning" %>
     </div>
     <div class="small-12 medium-8 column final-votes-info">
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6fb17a0d7..f4362960f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -15,7 +15,7 @@ en:
       open_city_slogan_html:
         "Start listening to Madrid.
         For that we open this digital Puerta del Sol, where all the locals can meet to discuss and share everything we want."
-      see_all: See debates and proposals
+      see_all: "See proposals"
       my_account_link: My account
       locale: "Language:"
       administration: Administration
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 0997e6e6c..fdac85fa2 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -15,7 +15,7 @@ es:
       open_city_slogan_html:
         "Existen ciudades gobernadas directamente por sus habitantes, que <b>debaten</b> sobre temas que les preocupan, <b>proponen</b> ideas para mejorar
         sus vidas y <b>deciden</b> entre todas y todos las que se llevan a cabo. Madrid ya es una de ellas."
-      see_all: Ver debates y propuestas
+      see_all: "Ver propuestas"
       my_account_link: Mi cuenta
       locale: "Idioma:"
       administration: Administrar
diff --git a/config/locales/verification.en.yml b/config/locales/verification.en.yml
index 1feb43860..50e0d425b 100644
--- a/config/locales/verification.en.yml
+++ b/config/locales/verification.en.yml
@@ -77,7 +77,7 @@ en:
         offices: "Office of Citizen"
         offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
         send_letter: "Request a letter"
-        go_to_index: "See proposals and debates"
+        go_to_index: "See proposals"
       create:
         flash:
           success_html: "Before voting you'll receive a letter whith the instructions for verify your account.<br> Remember you can verify your information in any %{offices}."
@@ -85,7 +85,7 @@ en:
           offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
       edit:
         title: "Letter requested"
-        see_all: "See proposals and debates"
+        see_all: "See proposals"
       update:
         flash:
           success: "Correct code. Your account is verified"
diff --git a/config/locales/verification.es.yml b/config/locales/verification.es.yml
index bf0102ad1..fbd7c9499 100644
--- a/config/locales/verification.es.yml
+++ b/config/locales/verification.es.yml
@@ -77,7 +77,7 @@ es:
         offices: "Oficina de Atención al Ciudadano"
         offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
         send_letter: "Solicitar una carta por correo postal"
-        go_to_index: "Ver propuestas y debates"
+        go_to_index: "Ver propuestas"
       create:
         flash:
           success_html: "Antes de las votaciones recibirás una carta con las instrucciones para verificar tu cuenta.<br> Recuerda que puedes ahorrar el envío verificándote presencialmente en cualquiera de las %{offices}."
@@ -85,7 +85,7 @@ es:
           offices_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD"
       edit:
         title: "Carta solicitada"
-        see_all: "Ver debates y propuestas"
+        see_all: "Ver propuestas"
       update:
         flash:
           success: "Código correcto. Tu cuenta ya está verificada"

From 784dd649c903338781628f270bd446ea24161214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Fri, 9 Oct 2015 14:33:54 +0200
Subject: [PATCH 23/37] updates cancancan

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1d846a940..81789e0d3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,7 +74,7 @@ GEM
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.9.0)
     byebug (6.0.2)
-    cancancan (1.12.0)
+    cancancan (1.13.0)
     capistrano (3.4.0)
       i18n
       rake (>= 10.0.0)

From 86e435dbe84b3f0b6c0ec55a2b4c2e2ba266c071 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Fri, 9 Oct 2015 16:31:49 +0200
Subject: [PATCH 24/37] Adds Youtube link on header and footer

---
 app/assets/fonts/icons.eot         | Bin 10060 -> 10544 bytes
 app/assets/fonts/icons.svg         |   1 +
 app/assets/fonts/icons.ttf         | Bin 9904 -> 10388 bytes
 app/assets/fonts/icons.woff        | Bin 7640 -> 8084 bytes
 app/assets/stylesheets/icons.scss  |   3 +++
 app/views/layouts/_footer.html.erb |   3 +++
 app/views/layouts/_header.html.erb |   3 +++
 config/locales/en.yml              |   1 +
 config/locales/es.yml              |   1 +
 9 files changed, 12 insertions(+)

diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot
index 8d0dc8ece8bf374d58d55fab7cd1e3a0fd017f30..fed38cb4b73b91b2adc9fd5f288de42bdce9660e 100644
GIT binary patch
delta 935
zcmYjPT}TvB6h3!myfd@2J2T?!t~>6!w$r++2IY>kX1Q5VNthZ|q9D{{<`1qesZdfZ
z1QH=iHW5TcQW4RE7(V1n^kBV7VfYXPf%F<ZL_ts1nbp8KbI+OYeBV9i-r=maEq2g-
zRRDLBb2QCu)JEs$4rhCpA3Os{UIBn`^U-6+;Ve+ZU5G2%Pw!2&f9ZJ(KwR9}o3(Sx
zC)b+*7y)w+`|YvZ-@m}3{uJ^;|M1mIH($@J0kD4ncJ&PO*%yoMH>^1-iRNG8jzv^;
z4UhKPcN%YgMiq93j;wtp2NTRJ^7|22jM&+}KxSqIAbtjOBe~JB@s?hC3!w5H;%OkL
z!ZjbQ-8iQ-{sxJ`1i+`vwV|DnfkIx`3eEzlDM~WaAUR*j`<6YZ#B&!`xKI(`9wN7P
z7&w^3D4=bXZh=X>r~4cMd;6<!2K-mL^MeVJgu}5@=xx^TJZ4`wC%9%#T>x0R%}qt~
z5@0{Fj>SY!APCja2;E>q9;V>|yuzFMH6xa=(q<~?H>|o;+_Vh8=|9L|phnE9%n-w`
z1p}!jV$~%ojTrCpR=`Zvr|T_4<583$<~Bzo#MRcPtu$-Z#Ugp4rGlt&EtaTstq%90
zVZVTD#N@HB%a~E(M=8oO1VzZ#BZKALgz47;SR1=q<bcFe%1gGcZ+<WDE{}ACLLyH|
zh+)IZB*UqSHx%;8D#zG*o-m@%6g*mqR}ekbA|(r@r5^;=r^wd2B`ZEwaDieC4sD^$
zZxJKR$)Z@UT^Bq_k5F*uby<;FRwtAfA7x5tC$IT@T8*whof-C0A`axdf>d1A5G+#F
zLvLhNEz&ua@o1s$NI+5)DNySMK_EnH)bL$tiYq=Zp_F)iigCkG{{uBfYA(07YE^n!
zi<SzBvMdEt?p`r4s}y^9B{#@&grVN7Q?mOfX>e$~8hveioFtv+@ivCUmwv^IiNIeS
hofx0E(C6@p@<alMi^CDx8Yy?sU^VmPqZ@aQ?mq&wq^$q|

delta 421
zcmdlGbjFX(N1cITgW5zkGnUD{ny)81<R&k@E62c~HidzKLB`$1)r}#9fepwn0rD06
zgY}L4Z^!IsU|@^@^23sI6ALb#*_p+_z{CL*o0XneT=4%t12a&44p5#WJ*P6Q_Rq>~
z3=GU)7#QSRGEx&$Slg<-Ckrsj*Vh4cYyg>(lb@W}*w=mosA>t2ACQ|^QNU2h)CZKe
z0P+>`5_41e&3X?rFeq05#qtXBi%WEVL^UulsJsC38yOgZs(|>lX7A*9ew(ih+)O|L
z28K%}vOv!vXeI`*I0uB9ypB<uRh_Aufn)ML#-rXKg+O<Mu?*Nm28Jm>9>{DN1{MaO
z%?uns2r=4=p$h0v5O8EjgtEYH0EU&s<abQsli8VDCMPnBO<u^nVzN7n=jJIat@4vU
ts(xTJn*2yj3rO;+moTbNZc_K#d`Vr95oqk>*BWw+YLmG%rMZzD4gjVQU`qf1

diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg
index b01dfc6b6..602058baf 100644
--- a/app/assets/fonts/icons.svg
+++ b/app/assets/fonts/icons.svg
@@ -43,4 +43,5 @@
 <glyph glyph-name="print" unicode="&#72;" d="M463 332c0 5-4 9-9 9l-67 0 0 110c0 5-5 10-10 10l-242 0c-5 0-10-5-10-10l0-110-67 0c0 0 0 0 0 0-5 0-9-4-9-9l0 0 0-188c0-5 4-10 9-10l67 0 0 79 262 0 0-79 67 0c5 0 9 5 9 10l0 188z m-102-33l-210 0 0 127c0 5 4 9 9 9l192 0c5 0 9-4 9-9l0-127z m-209-238c0-5 4-10 9-10l190 0c5 0 9 5 9 10l0 126-208 0z"/>
 <glyph glyph-name="blog" unicode="&#74;" d="M52 369c38 71 115 118 204 118 58 0 110-24 150-59-11 2-24 0-36-7-30-17-40-66-1-90 24-15 32-53 32-76-1-23-56-128-56-128l-54 184c0 0-2 13-2 17 0 4 2 10 5 13 2 3 5 7 8 7l26 0 0 21-139 0 0-21 5 0c4 0 9-6 13-10 5-6 11-25 19-45l20-67-43-100-48 200c0 0 2 14 5 16 1 2 4 6 8 6l1 0 0 21z m27-35c0 0-11 14-23 14l-12 0c-12-25-18-60-18-91 0-95 58-176 141-211z m375 36c5-20 4-46-5-73-22-72-77-202-99-252 81 36 136 116 136 209 0 43-11 82-32 116z m-193-194l-59-144c17-4 35-7 54-7 19 0 38 3 56 7z"/>
 <glyph glyph-name="box" unicode="&#73;" d="M311 274c0 5-2 10-6 13-3 4-7 6-12 6l-74 0c-5 0-9-2-12-6-4-3-6-8-6-13 0-5 2-9 6-13 3-3 7-5 12-5l74 0c5 0 9 2 12 5 4 4 6 8 6 13z m164 55l0-274c0-5-1-9-5-13-4-4-8-5-13-5l-402 0c-5 0-9 1-13 5-4 4-5 8-5 13l0 274c0 5 1 9 5 13 4 4 8 5 13 5l402 0c5 0 9-1 13-5 4-4 5-8 5-13z m19 128l0-73c0-5-2-9-6-13-3-3-8-5-13-5l-438 0c-5 0-10 2-13 5-4 4-6 8-6 13l0 73c0 5 2 9 6 13 3 4 8 5 13 5l438 0c5 0 10-1 13-5 4-4 6-8 6-13z"/>
+<glyph glyph-name="youtube" unicode="&#75;" d="M314 157l0-61c0-12-4-19-11-19-5 0-9 2-13 6l0 86c4 5 8 7 13 7 7 0 11-7 11-19z m97-1l0-13-26 0 0 13c0 13 4 20 13 20 8 0 13-7 13-20z m-276 63l30 0 0 26-89 0 0-26 30 0 0-163 29 0z m82-163l25 0 0 141-25 0 0-108c-6-8-11-12-16-12-4 0-6 2-6 6-1 1-1 4-1 10l0 104-25 0 0-112c0-9 1-16 2-20 2-7 8-11 17-11 9 0 19 6 29 17z m122 42l0 57c0 13 0 23-2 28-3 11-10 16-20 16-10 0-19-5-27-16l0 62-25 0 0-189 25 0 0 14c9-11 17-16 27-16 10 0 17 5 20 16 2 5 2 14 2 28z m97 3l0 4-26 0c0-10 0-16-1-18-1-6-5-10-11-10-9 0-13 7-13 20l0 25 51 0 0 29c0 15-3 26-8 33-7 10-17 15-30 15-13 0-23-5-31-15-5-7-8-18-8-33l0-49c0-15 3-26 9-33 7-10 17-15 31-15 13 0 24 5 30 15 4 5 6 10 6 16 1 1 1 7 1 16z m-174 261l0 60c0 13-4 20-12 20-8 0-12-7-12-20l0-60c0-13 4-20 12-20 8 0 12 7 12 20z m206-215c0-44-3-77-8-100-2-11-8-20-16-28-9-7-18-12-29-13-35-4-88-6-159-6-71 0-124 2-159 6-11 1-20 6-29 13-8 8-14 17-16 28-5 22-8 55-8 100 0 45 3 78 8 100 2 12 8 21 16 29 9 7 18 12 30 13 35 4 87 6 158 6 71 0 124-2 159-6 11-1 20-6 29-13 8-8 14-17 16-29 5-21 8-54 8-100z m-285 365l29 0-35-114 0-77-28 0 0 77c-3 14-9 34-18 61-7 19-13 37-18 53l30 0 20-75z m105-95l0-50c0-16-2-27-8-34-7-10-17-14-30-14-13 0-23 4-30 14-5 7-8 19-8 34l0 50c0 15 3 26 8 33 7 10 17 15 30 15 13 0 23-5 30-15 6-7 8-18 8-33z m96 46l0-142-26 0 0 15c-10-12-20-17-29-17-9 0-15 3-17 10-2 5-3 12-3 22l0 112 26 0 0-105c0-6 1-9 1-10 0-4 2-6 6-6 5 0 10 4 16 12l0 109z"/>
 </font></defs></svg>
diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf
index 841a221f8b76f46675e299976e9621b5115111ec..96e94423136a4d546cf33e396661d0ab27ad8889 100644
GIT binary patch
delta 939
zcmX|9O=uHQ5T3WY*`I9or?^R)ZIae(^J5jnY&Nx;v?y8+HMZ6tS`c)t)fk&L*c97R
zi3p`=X%DUnqJp3Y5fr5ddl8Z9RZw~m^deq8iGnBVY+Bvf_h!HOzL|Nmyyu0RhigCp
zK!PhkLtl6I(L!bU?jwNIBu2vr_U-S6W56OFK-|)MWP7^z^NH60#Kp&l%64V>;A$5D
z#bfN=IeWaawuY4;)rUNPZe;50+{=Xz0Q7Hw%_oY(_8HHe4#e;USGHIjuG!3X%7e)o
z23m{d>ZH&~KSBH)@xaK~kbNUJ_X!K&p`gEPPgY=pT10*);+9dnJRHa`tN_H1Vr;ZB
zHeT%+Vy^)t-Xfl_4~GLjXx{Plq>}puB86!HAM-P%bx+NdZjihuMa_fg>?QApwqYCx
zsIPE6AK*43_cw)sfob$S+IpcLn8tzKXAjsLU)UHi3p(x*h(a^OpanLA0j-dLI3%4S
zHA|At8_Ms{^ke5KeSlG)0WAHbXPavx;0eeomKQ*QAhbaa2Em3J%)?!Hfs^_*BbKzX
zW;*CMtV}v?T87{B@21ePM$Ag&iQ(6RfpizKGRcGy<6PbfnCbRxyJct`it@zV;MfRp
zwe49eOIw*(q(-!K5H+sFk_p!`n1_b_0<IC0!@e$KHWNQeQI;ntLcSdtEbj(PzZSsS
z*wrGtM2=-S(bn}p-=l-kNPj3Ka4ZQ?bXb|D7*+9wLXxa9l&#kYB}gXk)i(Kf!P_RV
z<XL0md!CjQ*;=(^MWT5ZDAxJXI{Nc1VuTr45Te>;-kb9B_3e}{D>6;%gyn?$`AzI`
zPLm{UtFAv>81b=0C{}#D*wEAw^r&j*D_K=NI-^ovEi@Pjh>9WxcDRn`3DI&IzAIgE
zMe-4rB|b?pt{Un;pvK77i-m%=MQ`fS(jh^X#bDaa6#|P&gO^h(=V^vetgq}`GJcQ_
vr_|bp`>ob0Njcv5A&SJ82I38b=cdLcsuQP&oePO5UXJUDCh`9zohkhVVRWP`

delta 447
zcmX|-O(;ZB6vzMfJu^K`l9H79WW0yelr&kOh!J84lcaPTV_uq%H_a>tF{6AeWESqM
ztSPclQ_9Lhc2-sjTPYh0%0i7ZGjea|-23~V&N=to{Pg8S1`I$AvXC+5^UY2er!RIu
z&68>!85;Is7G~lUvC}`}>GD4<-T-W#I1r3-<Kg~#6_6Ctj>9}@6pK^|YJ}oSII^~~
z`Ez~+$e(~?M-TC3)8587#h%H$x*p2#DvxBM<a!d^dNh@;?w7ZSFNp(@c#v=B_8+Oh
z3Gq~vrwt^e9L0NxoiQE_)p`$aftECBF(aN#b$%~osni?sc6m4&@V)&|EY<dY!6H!_
z@X&43DyL-Aj#!^blMbMWL3YPWG7V5RYdIgt6P3QniYibaD6}hu#;{HUm(~FI-;Ej*
zo6$(#20I*Rh7&Hdzzr3xVpZA|F1bON<TG(0j~2e=U5A)!{a{_fr*@D}s41q2S9P-B
W)#?~E68<(jQ$?(;$@2ejoAwJ3PG1NB

diff --git a/app/assets/fonts/icons.woff b/app/assets/fonts/icons.woff
index 0e89bddd1090f890d931b4f9a1aba617bb05ce0b..fb76f3b26da124fdec35092e214c4a0d5c186e59 100644
GIT binary patch
delta 7981
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

delta 7538
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
BZ6g2x

diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss
index d71ab1884..93f7ebcf3 100644
--- a/app/assets/stylesheets/icons.scss
+++ b/app/assets/stylesheets/icons.scss
@@ -145,3 +145,6 @@
 .icon-box:before {
   content: "I";
 }
+.icon-youtube:before {
+  content: "K";
+}
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 60ba049dd..9a3ae7b7d 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -60,6 +60,9 @@
         <%= link_to "/blog", target: "_blank", title: t("social.blog") do %>
           <i class="icon-blog"></i>
         <% end %>
+        <%= link_to "https://www.youtube.com/channel/UCFmaChI9quIY7lwHplnacfg", target: "_blank", title: t("social.youtube") do %>
+          <i class="icon-youtube"></i>
+        <% end %>
       </div>
     </div>
   </div>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index d62bd6d5c..00cb4d65e 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -17,6 +17,9 @@
             <%= link_to "/blog", target: "_blank", title: t("social.blog") do %>
               <i class="icon-blog"></i>
             <% end %>
+            <%= link_to "https://www.youtube.com/channel/UCFmaChI9quIY7lwHplnacfg", target: "_blank", title: t("social.youtube") do %>
+              <i class="icon-youtube"></i>
+            <% end %>
           </div>
       </div>
     </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f4362960f..564d933e1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -53,6 +53,7 @@ en:
     twitter: "Twitter"
     facebook: "Facebook"
     blog: "Blog"
+    youtube: "YouTube"
   form:
       error: error
       errors: errors
diff --git a/config/locales/es.yml b/config/locales/es.yml
index fdac85fa2..27c61f3c1 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -53,6 +53,7 @@ es:
     twitter: "Twitter"
     facebook: "Facebook"
     blog: "Blog"
+    youtube: "YouTube"
   form:
       error: error
       errors: errores

From 7012d0c901c16b6ea61b77e25ccf12f8e6991c8c Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Thu, 8 Oct 2015 17:19:37 +0200
Subject: [PATCH 25/37] Refactors css for comments and flags

---
 app/assets/stylesheets/application.scss       |   2 +-
 app/assets/stylesheets/debates.scss           | 171 ------------------
 .../{participacion.scss => layout.scss}       | 171 ++++++++++++++++++
 app/assets/stylesheets/proposals.scss         | 171 ------------------
 4 files changed, 172 insertions(+), 343 deletions(-)
 rename app/assets/stylesheets/{participacion.scss => layout.scss} (89%)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 4bf184c2c..94ddf4867 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -4,7 +4,7 @@
 @import "icons";
 @import "variables";
 @import "admin";
-@import "participacion";
+@import "layout";
 @import "debates";
 @import "proposals";
 @import "c3";
\ No newline at end of file
diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss
index 560c16664..1155382dc 100644
--- a/app/assets/stylesheets/debates.scss
+++ b/app/assets/stylesheets/debates.scss
@@ -6,8 +6,6 @@
 //  02.2. List
 // 03. Show
 // 04. New
-// 05. Comments
-// 06. Flags
 //
 
 // 01. Debates
@@ -615,172 +613,3 @@
 .debate-edit {
   @extend .debate-new;
 }
-
-// 05. Comments
-// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-.comments {
-  background: $white;
-  background-repeat: repeat-x;
-  padding-top: rem-calc(24);
-  padding-bottom: rem-calc(96);
-
-  h2 {
-    margin: 0;
-    font-weight: bold;
-
-    span {
-      font-size: rem-calc(18);
-      font-weight: normal;
-      opacity: .8;
-    }
-  }
-
-  .comment {
-    margin: rem-calc(6) 0;
-
-    p {
-      margin-bottom: 0;
-    }
-
-    .comment-votes {
-      color: $text-medium;
-      font-weight: lighter;
-      line-height: rem-calc(24);
-      margin: rem-calc(10) rem-calc(12) rem-calc(6) 0;
-
-      a {
-        color: $text-light;
-        display: inline-block;
-        vertical-align: top;
-
-        &:hover {
-          color: $text-medium;
-        }
-      }
-
-      [class^="icon-"] {
-        font-size: rem-calc(20);
-        vertical-align: middle;
-      }
-    }
-
-    .comment-body {
-      margin-left: rem-calc(42);
-
-      p {
-        font-size: rem-calc(14);
-      }
-
-      .reply {
-        background: white;
-        border: 1px solid $border;
-        font-size: rem-calc(12);
-        margin: rem-calc(6) 0;
-        padding: rem-calc(6);
-
-        .divider {
-          color: $text-light;
-        }
-      }
-
-      .comment-user {
-        margin-top: rem-calc(6);
-        padding: rem-calc(6) 0;
-        overflow: hidden;
-
-        @each $n in ("1", "2", "3","4", "5") {
-          &.level-#{$n} {
-            @if $n == "5" {
-              background: $comment-level-5;
-              padding: rem-calc(6) rem-calc(12);
-            }
-            @elseif $n == "1" {
-              background: none;
-              padding: rem-calc(6) rem-calc(12);
-            }
-            @else {
-              background: $comment-official;
-              padding: rem-calc(6) rem-calc(12);
-            }
-          }
-        }
-
-        &.is-author {
-          background: $comment-author;
-          padding: rem-calc(6) rem-calc(12);
-        }
-
-        &.is-admin {
-          background: $comment-admin;
-          padding: rem-calc(6) rem-calc(12);
-        }
-
-        &.is-moderator {
-          @extend .is-admin;
-        }
-
-        &.level-5 {
-          background: $comment-level-5;
-          padding: rem-calc(6) rem-calc(12);
-        }
-      }
-    }
-
-    .is-deleted {
-      background: $deleted;
-      margin-left: rem-calc(42);
-      padding: rem-calc(6) rem-calc(12);
-    }
-
-    .comment-children {
-      border-left: 1px dashed $border;
-      margin-left: rem-calc(42);
-      padding-left: rem-calc(6);
-
-      @media only screen and (max-width: 40em) {
-        margin-left: rem-calc(16);
-      }
-    }
-
-    .comment-info {
-      color: $text-light;
-      font-size: rem-calc(13);
-      font-weight: lighter;
-      margin-top: rem-calc(6);
-      vertical-align: middle;
-
-      span.user-name {
-        color: $text;
-        font-weight: bold;
-      }
-    }
-  }
-}
-
-.faded {
-  opacity: 0.4;
-}
-
-// 06. Flags
-// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-.flag-content {
-
-  .button {
-    background: none;
-    margin-bottom: 0;
-    padding: 0;
-  }
-}
-
-.flag-disable {
-  color: $text-medium;
-  line-height: rem-calc(24);
-  vertical-align: middle;
-}
-
-.flag-active {
-  @extend .flag-disable;
-  color: $delete;
-}
diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/layout.scss
similarity index 89%
rename from app/assets/stylesheets/participacion.scss
rename to app/assets/stylesheets/layout.scss
index 520a836aa..28e53b5b3 100644
--- a/app/assets/stylesheets/participacion.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -17,6 +17,8 @@
 // 15. Social
 // 16. Pages
 // 17. Verification
+// 18. Comments
+// 19. Flags
 //
 
 // 01. Variables
@@ -1727,3 +1729,172 @@ table {
     }
   }
 }
+
+// 18. Comments
+// - - - - - - - - - - - - - - - - - - - - - - - - -
+
+.comments {
+  background: $white;
+  background-repeat: repeat-x;
+  padding-top: rem-calc(24);
+  padding-bottom: rem-calc(96);
+
+  h2 {
+    margin: 0;
+    font-weight: bold;
+
+    span {
+      font-size: rem-calc(18);
+      font-weight: normal;
+      opacity: .8;
+    }
+  }
+
+  .comment {
+    margin: rem-calc(6) 0;
+
+    p {
+      margin-bottom: 0;
+    }
+
+    .comment-votes {
+      color: $text-medium;
+      font-weight: lighter;
+      line-height: rem-calc(24);
+      margin: rem-calc(10) rem-calc(12) rem-calc(6) 0;
+
+      a {
+        color: $text-light;
+        display: inline-block;
+        vertical-align: top;
+
+        &:hover {
+          color: $text-medium;
+        }
+      }
+
+      [class^="icon-"] {
+        font-size: rem-calc(20);
+        vertical-align: middle;
+      }
+    }
+
+    .comment-body {
+      margin-left: rem-calc(42);
+
+      p {
+        font-size: rem-calc(14);
+      }
+
+      .reply {
+        background: white;
+        border: 1px solid $border;
+        font-size: rem-calc(12);
+        margin: rem-calc(6) 0;
+        padding: rem-calc(6);
+
+        .divider {
+          color: $text-light;
+        }
+      }
+
+      .comment-user {
+        margin-top: rem-calc(6);
+        padding: rem-calc(6) 0;
+        overflow: hidden;
+
+        @each $n in ("1", "2", "3","4", "5") {
+          &.level-#{$n} {
+            @if $n == "5" {
+              background: $comment-level-5;
+              padding: rem-calc(6) rem-calc(12);
+            }
+            @elseif $n == "1" {
+              background: none;
+              padding: rem-calc(6) rem-calc(12);
+            }
+            @else {
+              background: $comment-official;
+              padding: rem-calc(6) rem-calc(12);
+            }
+          }
+        }
+
+        &.is-author {
+          background: $comment-author;
+          padding: rem-calc(6) rem-calc(12);
+        }
+
+        &.is-admin {
+          background: $comment-admin;
+          padding: rem-calc(6) rem-calc(12);
+        }
+
+        &.is-moderator {
+          @extend .is-admin;
+        }
+
+        &.level-5 {
+          background: $comment-level-5;
+          padding: rem-calc(6) rem-calc(12);
+        }
+      }
+    }
+
+    .is-deleted {
+      background: $deleted;
+      margin-left: rem-calc(42);
+      padding: rem-calc(6) rem-calc(12);
+    }
+
+    .comment-children {
+      border-left: 1px dashed $border;
+      margin-left: rem-calc(42);
+      padding-left: rem-calc(6);
+
+      @media only screen and (max-width: 40em) {
+        margin-left: rem-calc(16);
+      }
+    }
+
+    .comment-info {
+      color: $text-light;
+      font-size: rem-calc(13);
+      font-weight: lighter;
+      margin-top: rem-calc(6);
+      vertical-align: middle;
+
+      span.user-name {
+        color: $text;
+        font-weight: bold;
+      }
+    }
+  }
+}
+
+.faded {
+  opacity: 0.4;
+}
+
+// 19. Flags
+// - - - - - - - - - - - - - - - - - - - - - - - - -
+
+.flag-content {
+
+  .button {
+    background: none;
+    margin-bottom: 0;
+    padding: 0;
+  }
+}
+
+.flag-disable {
+  color: $text-medium;
+  line-height: rem-calc(24);
+  vertical-align: middle;
+}
+
+.flag-active {
+  @extend .flag-disable;
+  color: $delete;
+}
diff --git a/app/assets/stylesheets/proposals.scss b/app/assets/stylesheets/proposals.scss
index 7689e93dd..92db612b7 100644
--- a/app/assets/stylesheets/proposals.scss
+++ b/app/assets/stylesheets/proposals.scss
@@ -6,8 +6,6 @@
 //  02.2. List
 // 03. Show
 // 04. New
-// 05. Comments
-// 06. Flags
 //
 
 // 01. Proposals
@@ -605,172 +603,3 @@
 .proposal-edit {
   @extend .proposal-new;
 }
-
-// 05. Comments
-// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-.comments {
-  background: $white;
-  background-repeat: repeat-x;
-  padding-top: rem-calc(24);
-  padding-bottom: rem-calc(96);
-
-  h2 {
-    margin: 0;
-    font-weight: bold;
-
-    span {
-      font-size: rem-calc(18);
-      font-weight: normal;
-      opacity: .8;
-    }
-  }
-
-  .comment {
-    margin: rem-calc(6) 0;
-
-    p {
-      margin-bottom: 0;
-    }
-
-    .comment-votes {
-      color: $text-medium;
-      font-weight: lighter;
-      line-height: rem-calc(24);
-      margin: rem-calc(10) rem-calc(12) rem-calc(6) 0;
-
-      a {
-        color: $text-light;
-        display: inline-block;
-        vertical-align: top;
-
-        &:hover {
-          color: $text-medium;
-        }
-      }
-
-      [class^="icon-"] {
-        font-size: rem-calc(20);
-        vertical-align: middle;
-      }
-    }
-
-    .comment-body {
-      margin-left: rem-calc(42);
-
-      p {
-        font-size: rem-calc(14);
-      }
-
-      .reply {
-        background: white;
-        border: 1px solid $border;
-        font-size: rem-calc(12);
-        margin: rem-calc(6) 0;
-        padding: rem-calc(6);
-
-        .divider {
-          color: $text-light;
-        }
-      }
-
-      .comment-user {
-        margin-top: rem-calc(6);
-        padding: rem-calc(6) 0;
-        overflow: hidden;
-
-        @each $n in ("1", "2", "3","4", "5") {
-          &.level-#{$n} {
-            @if $n == "5" {
-              background: $comment-level-5;
-              padding: rem-calc(6) rem-calc(12);
-            }
-            @elseif $n == "1" {
-              background: none;
-              padding: rem-calc(6) rem-calc(12);
-            }
-            @else {
-              background: $comment-official;
-              padding: rem-calc(6) rem-calc(12);
-            }
-          }
-        }
-
-        &.is-author {
-          background: $comment-author;
-          padding: rem-calc(6) rem-calc(12);
-        }
-
-        &.is-admin {
-          background: $comment-admin;
-          padding: rem-calc(6) rem-calc(12);
-        }
-
-        &.is-moderator {
-          @extend .is-admin;
-        }
-
-        &.level-5 {
-          background: $comment-level-5;
-          padding: rem-calc(6) rem-calc(12);
-        }
-      }
-    }
-
-    .is-deleted {
-      background: $deleted;
-      margin-left: rem-calc(42);
-      padding: rem-calc(6) rem-calc(12);
-    }
-
-    .comment-children {
-      border-left: 1px dashed $border;
-      margin-left: rem-calc(42);
-      padding-left: rem-calc(6);
-
-      @media only screen and (max-width: 40em) {
-        margin-left: rem-calc(16);
-      }
-    }
-
-    .comment-info {
-      color: $text-light;
-      font-size: rem-calc(13);
-      font-weight: lighter;
-      margin-top: rem-calc(6);
-      vertical-align: middle;
-
-      span.user-name {
-        color: $text;
-        font-weight: bold;
-      }
-    }
-  }
-}
-
-.faded {
-  opacity: 0.4;
-}
-
-// 06. Flags
-// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-.flag-content {
-
-  .button {
-    background: none;
-    margin-bottom: 0;
-    padding: 0;
-  }
-}
-
-.flag-disable {
-  color: $text-medium;
-  line-height: rem-calc(24);
-  vertical-align: middle;
-}
-
-.flag-active {
-  @extend .flag-disable;
-  color: $delete;
-}

From df5a5ae7eb8e14431df89901a152c046b82f8ff8 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Fri, 9 Oct 2015 10:43:14 +0200
Subject: [PATCH 26/37] Cleans CSS for debates

---
 app/assets/stylesheets/debates.scss | 102 ++++++++++++++++++++++++----
 1 file changed, 88 insertions(+), 14 deletions(-)

diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss
index 1155382dc..eff65e01a 100644
--- a/app/assets/stylesheets/debates.scss
+++ b/app/assets/stylesheets/debates.scss
@@ -66,7 +66,7 @@
     }
   }
 
-  .like {
+  .like, .unlike {
     line-height: rem-calc(48);
     vertical-align: super;
 
@@ -81,10 +81,6 @@
     }
   }
 
-  .unlike {
-    @extend .like;
-  }
-
   .voted {
     .icon-like {
       @extend .icon-like;
@@ -297,16 +293,18 @@
 }
 
 .debate {
-  @extend .debate-featured;
   margin-bottom: 0;
   margin-top: 0;
 
   .panel {
+    background: white;
+    border: 1px solid;
+    border-color: #e5e6e9 #dfe0e4 #d0d1d5;
     border-radius: 0;
     box-shadow: 0px 1px 3px 0 $border;
     margin-bottom: rem-calc(12);
     min-height: rem-calc(192);
-    padding-top: rem-calc(12);
+    padding: rem-calc(12) rem-calc(12) 0 rem-calc(12);
 
     @media (min-width: $small-breakpoint) {
       margin-bottom: rem-calc(-1);
@@ -314,13 +312,36 @@
     }
 
     .label-debate {
+      background: none;
+      clear: both;
+      color: $debates;
+      display: block;
+      font-size: rem-calc(12);
+      font-weight: bold;
       line-height: $line-height;
       padding-bottom: 0;
+      padding-left: 0;
+      padding-top: 0;
+      text-transform: uppercase;
     }
 
     h3 {
-      margin-top: 0;
+      font-weight: bold;
+      margin: 0;
       min-height: rem-calc(48);
+
+      a {
+        clear: both;
+        color: $text;
+        display: block;
+        font-size: rem-calc(16);
+        line-height: $line-height;
+        text-transform: lowercase;
+
+        &:first-letter {
+          text-transform: uppercase;
+        }
+      }
     }
 
     .debate-content {
@@ -333,18 +354,75 @@
     }
 
     .icon-debates {
+      color: $debates;
       font-size: rem-calc(18);
       left: rem-calc(60);
+      line-height: $line-height;
+      position: absolute;
       top: 0;
     }
 
+    .debate-info {
+      color: $text-medium;
+      font-weight: lighter;
+      margin-bottom: 0;
+
+      .icon-comments {
+        font-size: rem-calc(16);
+        vertical-align: top;
+      }
+
+      a {
+        color: $text-medium;
+      }
+    }
+
     .debate-description {
+      color: $text;
+      font-size: rem-calc(13);
       height: rem-calc(72);
+      line-height: $line-height;
+      margin-bottom: rem-calc(12);
       margin-top: 0;
+      overflow: hidden;
+      position: relative;
+
+      a {
+        color: $text;
+      }
+
+      ul, ol {
+
+        li {
+          font-size: rem-calc(13);
+          margin-bottom: rem-calc(12);
+        }
+      }
+    }
+
+    .truncate {
+      background: image-url('truncate.png');
+      background-repeat: repeat-x;
+      bottom: 0;
+      height: 24px;
+      position: absolute;
+      width: 100%;
+    }
+
+    p {
+      color: $text;
+      font-size: rem-calc(14);
+      line-height: $line-height;
+      margin-bottom: rem-calc(12);
+
+      &.debate-info {
+        font-size: rem-calc(13);
+      }
     }
   }
 
   .votes {
+    @include votes;
     border: 1px solid $votes-border;
     margin: 0 rem-calc(-12);
 
@@ -388,7 +466,7 @@
     }
 
     @media (min-width: $small-breakpoint) {
-      .like {
+      .like, .unlike {
 
         span {
           display: block;
@@ -561,7 +639,7 @@
 // 04. New
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
-.debate-new {
+.debate-new, .debate-edit {
   background: white;
   padding-top: rem-calc(24);
 
@@ -609,7 +687,3 @@
     }
   }
 }
-
-.debate-edit {
-  @extend .debate-new;
-}

From 72adf987419f0c8e21b6487ec6b5974a08b6ac6d Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Fri, 9 Oct 2015 11:20:57 +0200
Subject: [PATCH 27/37] Adds participation scss

---
 app/assets/stylesheets/application.scss   |   1 +
 app/assets/stylesheets/debates.scss       | 541 ++++-------------
 app/assets/stylesheets/participation.scss | 690 ++++++++++++++++++++++
 app/assets/stylesheets/proposals.scss     | 550 ++++-------------
 4 files changed, 889 insertions(+), 893 deletions(-)
 create mode 100644 app/assets/stylesheets/participation.scss

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 94ddf4867..9cda8cab1 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -5,6 +5,7 @@
 @import "variables";
 @import "admin";
 @import "layout";
+@import "participation";
 @import "debates";
 @import "proposals";
 @import "c3";
\ No newline at end of file
diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss
index eff65e01a..547d57a9b 100644
--- a/app/assets/stylesheets/debates.scss
+++ b/app/assets/stylesheets/debates.scss
@@ -5,282 +5,131 @@
 //  02.1. Featured
 //  02.2. List
 // 03. Show
-// 04. New
 //
 
-// 01. Debates
-// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-@mixin votes {
-  background: $votes-bg;
-  border-top: 1px solid $votes-border;
-  margin: 0 rem-calc(-12);
-  padding: rem-calc(14) rem-calc(12);
-  position: relative;
-
-  .icon-like {
-    background: white;
-    border: 2px solid $votes-border;
-    border-radius: rem-calc(3);
-    color: $text-light;
-    display: inline-block;
-    font-size: rem-calc(30);
-    line-height: rem-calc(30);
-    padding: rem-calc(3) rem-calc(6);
-    position: relative;
-
-    &:hover {
-      background: $votes-like;
-      border-color: white;
-      color: white;
-      cursor: pointer;
-      opacity: 1 !important;
-    }
-
-    &:active {
-      border-color: $votes-like-act;
-    }
-  }
-
-  .icon-unlike {
-    background: white;
-    border: 2px solid $votes-border;
-    border-radius: rem-calc(3);
-    color: $text-light;
-    display: inline-block;
-    font-size: rem-calc(30);
-    line-height: rem-calc(30);
-    padding: rem-calc(3) rem-calc(6);
-    position: relative;
-
-    &:hover {
-      background: $votes-unlike;
-      border-color: white;
-      color: white;
-      cursor: pointer;
-      opacity: 1 !important;
-    }
-
-    &:active {
-      border-color: $votes-unlike-act;
-    }
-  }
-
-  .like, .unlike {
-    line-height: rem-calc(48);
-    vertical-align: super;
-
-    span {
-      color: white;
-      display: inline-block;
-      font-size: rem-calc(16);
-      font-weight: lighter;
-      line-height: $line-height*2;
-      padding-left: rem-calc(8);
-      vertical-align: top;
-    }
-  }
-
-  .voted {
-    .icon-like {
-      @extend .icon-like;
-      background: $votes-like;
-      border-color: white;
-      color: white;
-    }
-
-    .icon-unlike {
-      @extend .icon-unlike;
-      background: $votes-unlike;
-      border-color: white;
-      color: white;
-    }
-  }
-
-  .no-voted {
-    .icon-like, .icon-unlike {
-      opacity: .5;
-    }
-  }
-
-  .total-votes {
-    color: white;
-    float: right;
-    line-height: $line-height*2;
-  }
-
-  .divider {
-    margin: 0 rem-calc(6);
-  }
-
-  .not-logged {
-    background: rgba(22,99,135,.9);
-    color: white;
-    height: 100%;
-    left: 0;
-    line-height: $line-height*2;
-    padding-top: rem-calc(12);
-    position: absolute;
-    text-align: center;
-    top: 0;
-    width: 100%;
-    filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#222222', endColorstr='#222222'); /* IE */
-
-    a {
-      color: white;
-      text-decoration: underline;
-    }
-  }
-
-  .anonymous-votes, .organizations-votes {
-    background: $warning-bg;
-    color: $warning-color;
-    height: 100%;
-    left: 0;
-    line-height: $line-height;
-    padding-top: rem-calc(12);
-    position: absolute;
-    text-align: center;
-    top: 0;
-    width: 100%;
-
-    p {
-      color: $warning-color;
-      margin: 0 rem-calc(12);
-      text-align: left;
-    }
-
-    a {
-      color: $warning-color;
-      font-weight: bold;
-      text-decoration: underline;
-    }
-  }
-}
-
 // 02. Index
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
 // 02.1. Featured
 // - - - - - - - - - - - - -
 
-.debate-featured {
+// .debate-featured {
 
-  .panel {
-    background: white;
-    border: 1px solid;
-    border-color: #e5e6e9 #dfe0e4 #d0d1d5;
-    border-radius: rem-calc(3);
-    margin-bottom: rem-calc(24);
-    padding: rem-calc(24) rem-calc(12) 0 rem-calc(12);
+//   .panel {
+//     background: white;
+//     border: 1px solid;
+//     border-color: #e5e6e9 #dfe0e4 #d0d1d5;
+//     border-radius: rem-calc(3);
+//     margin-bottom: rem-calc(24);
+//     padding: rem-calc(24) rem-calc(12) 0 rem-calc(12);
 
-    .debate-content {
-      min-height: rem-calc(353);
-    }
+//     .debate-content {
+//       min-height: rem-calc(353);
+//     }
 
-    .label-debate {
-      background: none;
-      clear: both;
-      color: $debates;
-      display: block;
-      font-size: rem-calc(12);
-      font-weight: bold;
-      text-transform: uppercase;
-      padding-left: 0;
-      padding-top: 0;
-    }
+//     .label-debate {
+//       background: none;
+//       clear: both;
+//       color: $debates;
+//       display: block;
+//       font-size: rem-calc(12);
+//       font-weight: bold;
+//       text-transform: uppercase;
+//       padding-left: 0;
+//       padding-top: 0;
+//     }
 
-    .icon-debates {
-      color: $debates;
-      font-size: rem-calc(36);
-      line-height: $line-height;
-      position: absolute;
-      right: rem-calc(18);
-      top: rem-calc(12);
-    }
+//     .icon-debates {
+//       color: $debates;
+//       font-size: rem-calc(36);
+//       line-height: $line-height;
+//       position: absolute;
+//       right: rem-calc(18);
+//       top: rem-calc(12);
+//     }
 
-    h3 {
-      font-weight: bold;
-      margin: rem-calc(8) 0 0 0;
-      min-height: rem-calc(65);
+//     h3 {
+//       font-weight: bold;
+//       margin: rem-calc(8) 0 0 0;
+//       min-height: rem-calc(65);
 
-      a {
-        clear: both;
-        color: $text;
-        display: block;
-        font-size: rem-calc(16);
-        line-height: $line-height;
-        text-transform: lowercase;
+//       a {
+//         clear: both;
+//         color: $text;
+//         display: block;
+//         font-size: rem-calc(16);
+//         line-height: $line-height;
+//         text-transform: lowercase;
 
-        &:first-letter {
-          text-transform: uppercase;
-        }
-      }
-    }
+//         &:first-letter {
+//           text-transform: uppercase;
+//         }
+//       }
+//     }
 
-    .debate-info {
-      color: $text-medium;
-      font-weight: lighter;
-      margin-bottom: 0;
+//     .debate-info {
+//       color: $text-medium;
+//       font-weight: lighter;
+//       margin-bottom: 0;
 
-      .icon-comments {
-        font-size: rem-calc(16);
-        vertical-align: top;
-      }
+//       .icon-comments {
+//         font-size: rem-calc(16);
+//         vertical-align: top;
+//       }
 
-      a {
-        color: $text-medium;
-      }
-    }
+//       a {
+//         color: $text-medium;
+//       }
+//     }
 
-    .debate-description {
-      color: $text;
-      font-size: rem-calc(13);
-      height: rem-calc(156);
-      line-height: $line-height;
-      margin-bottom: rem-calc(12);
-      margin-top: rem-calc(24);
-      overflow: hidden;
-      position: relative;
+//     .debate-description {
+//       color: $text;
+//       font-size: rem-calc(13);
+//       height: rem-calc(156);
+//       line-height: $line-height;
+//       margin-bottom: rem-calc(12);
+//       margin-top: rem-calc(24);
+//       overflow: hidden;
+//       position: relative;
 
-      a {
-        color: $text;
-      }
+//       a {
+//         color: $text;
+//       }
 
-      ul, ol {
+//       ul, ol {
 
-        li {
-          font-size: rem-calc(13);
-          margin-bottom: rem-calc(12);
-        }
-      }
-    }
+//         li {
+//           font-size: rem-calc(13);
+//           margin-bottom: rem-calc(12);
+//         }
+//       }
+//     }
 
-    .truncate {
-      background: image-url('truncate.png');
-      background-repeat: repeat-x;
-      bottom: 0;
-      height: 24px;
-      position: absolute;
-      width: 100%;
-    }
+//     .truncate {
+//       background: image-url('truncate.png');
+//       background-repeat: repeat-x;
+//       bottom: 0;
+//       height: 24px;
+//       position: absolute;
+//       width: 100%;
+//     }
 
-    p {
-      color: $text;
-      font-size: rem-calc(14);
-      line-height: $line-height;
-      margin-bottom: rem-calc(12);
+//     p {
+//       color: $text;
+//       font-size: rem-calc(14);
+//       line-height: $line-height;
+//       margin-bottom: rem-calc(12);
 
-      &.debate-info {
-        font-size: rem-calc(13);
-      }
-    }
-  }
+//       &.debate-info {
+//         font-size: rem-calc(13);
+//       }
+//     }
+//   }
 
-  .votes {
-    @include votes;
-  }
-}
+//   .votes {
+//     @include votes;
+//   }
+// }
 
 // 02.2. List
 // - - - - - - - - - - - - -
@@ -495,195 +344,3 @@
     }
   }
 }
-
-// 03. Show
-// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-.debate-show {
-  padding-top: rem-calc(12);
-
-  .back {
-    @include back;
-  }
-
-  .icon-angle-left {
-   @extend .back;
-  }
-
-  h1 {
-    clear: both;
-    font-size: rem-calc(30);
-    font-weight: bold;
-    margin: 0;
-    text-transform: lowercase;
-
-    &:first-letter {
-      text-transform: uppercase;
-    }
-  }
-
-  .edit-debate {
-    margin-bottom: 0;
-  }
-
-  .debate-info {
-    clear: both;
-    color: $text-medium;
-    font-weight: lighter;
-    line-height: $line-height*2;
-    text-align: justify;
-
-    a {
-        color: $text-medium;
-    }
-
-    p {
-      font-size: rem-calc(15);
-      line-height: $line-height;
-      margin-bottom: 0;
-    }
-  }
-
-  .debate-description {
-    font-size: rem-calc(15);
-    line-height: rem-calc(30);
-  }
-
-  ul, ol {
-    margin: rem-calc(12) 0;
-
-    li {
-      font-size: rem-calc(15);
-      margin-bottom: rem-calc(15);
-    }
-  }
-
-  .author-photo {
-    line-height: $line-height*2;
-    margin-right: rem-calc(6);
-    vertical-align: middle;
-    width: 32px;
-  }
-
-  .author {
-    color: $text;
-    font-weight: bold;
-  }
-
-  aside {
-
-    h3 {
-      border-top: 2px solid $brand;
-      display: inline-block;
-      font-size: rem-calc(16);
-      margin: -1px 0 rem-calc(12);
-      padding-top: rem-calc(6);
-      text-transform: uppercase;
-    }
-  }
-
-  .votes {
-    @include votes;
-    border: 0;
-    border-radius: 0;
-    margin: 0;
-
-    .total-votes {
-      display: block;
-      float: none;
-      line-height: $line-height;
-    }
-
-    .not-logged {
-      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 {
-    display: inline-block;
-    margin-top: rem-calc(24);
-  }
-
-  .tags {
-    display: block;
-    margin: rem-calc(24) 0;
-
-    a {
-      margin-right: rem-calc(6);
-    }
-  }
-}
-
-.bullet {
-  color: $border;
-}
-
-// 04. New
-// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-.debate-new, .debate-edit {
-  background: white;
-  padding-top: rem-calc(24);
-
-  .back {
-    @include back;
-  }
-
-  h1 {
-    clear: both;
-    font-size: rem-calc(36);
-    font-weight: bold;
-    line-height: $line-height*2;
-    margin-bottom: rem-calc(24);
-  }
-
-  .icon-debates {
-    color: $debates;
-    font-size: rem-calc(60);
-    line-height: $line-height;
-    opacity: .5;
-  }
-
-  h2 {
-    clear: both;
-    font-size: rem-calc(20);
-    font-weight: bold;
-    line-height: $line-height;
-    margin: 0;
-  }
-
-  .recommendations {
-    list-style-type: none;
-    margin-left: 0;
-    margin-top: rem-calc(24);
-
-    li {
-      font-size: rem-calc(12);
-      margin: rem-calc(12) 0;
-
-      &:before {
-        color: $debates;
-        content: "l ";
-        font-family: "icons" !important;
-      }
-    }
-  }
-}
diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
new file mode 100644
index 000000000..deb13635a
--- /dev/null
+++ b/app/assets/stylesheets/participation.scss
@@ -0,0 +1,690 @@
+// Table of Contents
+//
+// Styles for debates and proposals
+// 01. Votes and supports
+// 02. New participation
+// 03. Show participation
+// 04. Featured
+// 05.
+//
+
+// 01. Votes and supports
+// - - - - - - - - - - - - - - - - - - - - - - - - -
+
+@mixin votes {
+  background: $votes-bg;
+  border-top: 1px solid $votes-border;
+  margin: 0 rem-calc(-12);
+  padding: rem-calc(14) rem-calc(12);
+  position: relative;
+
+  .icon-like {
+    background: white;
+    border: 2px solid $votes-border;
+    border-radius: rem-calc(3);
+    color: $text-light;
+    display: inline-block;
+    font-size: rem-calc(30);
+    line-height: rem-calc(30);
+    padding: rem-calc(3) rem-calc(6);
+    position: relative;
+
+    &:hover {
+      background: $votes-like;
+      border-color: white;
+      color: white;
+      cursor: pointer;
+      opacity: 1 !important;
+    }
+
+    &:active {
+      border-color: $votes-like-act;
+    }
+  }
+
+  .icon-unlike {
+    background: white;
+    border: 2px solid $votes-border;
+    border-radius: rem-calc(3);
+    color: $text-light;
+    display: inline-block;
+    font-size: rem-calc(30);
+    line-height: rem-calc(30);
+    padding: rem-calc(3) rem-calc(6);
+    position: relative;
+
+    &:hover {
+      background: $votes-unlike;
+      border-color: white;
+      color: white;
+      cursor: pointer;
+      opacity: 1 !important;
+    }
+
+    &:active {
+      border-color: $votes-unlike-act;
+    }
+  }
+
+  .like, .unlike {
+    line-height: rem-calc(48);
+    vertical-align: super;
+
+    span {
+      color: white;
+      display: inline-block;
+      font-size: rem-calc(16);
+      font-weight: lighter;
+      line-height: $line-height*2;
+      padding-left: rem-calc(8);
+      vertical-align: top;
+    }
+  }
+
+  .voted {
+    .icon-like {
+      @extend .icon-like;
+      background: $votes-like;
+      border-color: white;
+      color: white;
+    }
+
+    .icon-unlike {
+      @extend .icon-unlike;
+      background: $votes-unlike;
+      border-color: white;
+      color: white;
+    }
+  }
+
+  .no-voted {
+    .icon-like, .icon-unlike {
+      opacity: .5;
+    }
+  }
+
+  .total-votes {
+    color: white;
+    float: right;
+    line-height: $line-height*2;
+  }
+
+  .divider {
+    margin: 0 rem-calc(6);
+  }
+
+  .not-logged {
+    background: rgba(22,99,135,.9);
+    color: white;
+    height: 100%;
+    left: 0;
+    line-height: $line-height*2;
+    padding-top: rem-calc(12);
+    position: absolute;
+    text-align: center;
+    top: 0;
+    width: 100%;
+    filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#222222', endColorstr='#222222'); /* IE */
+
+    a {
+      color: white;
+      text-decoration: underline;
+    }
+  }
+
+  .anonymous-votes, .organizations-votes {
+    background: $warning-bg;
+    color: $warning-color;
+    height: 100%;
+    left: 0;
+    line-height: $line-height;
+    padding-top: rem-calc(12);
+    position: absolute;
+    text-align: center;
+    top: 0;
+    width: 100%;
+
+    p {
+      color: $warning-color;
+      margin: 0 rem-calc(12);
+      text-align: left;
+    }
+
+    a {
+      color: $warning-color;
+      font-weight: bold;
+      text-decoration: underline;
+    }
+  }
+}
+
+@mixin supports {
+  background: $proposals;
+  border-top: 1px solid $proposals-border;
+  margin: 0 rem-calc(-12);
+  padding: rem-calc(14) rem-calc(12);
+  position: relative;
+
+  .progress {
+    background-color: rgba(255,255,255,.8);
+    height: rem-calc(12);
+    margin-bottom: rem-calc(6);
+    margin-top: rem-calc(4);
+
+    .meter {
+      background: $votes-like;
+    }
+  }
+
+  .percentage {
+    font-size: rem-calc(10);
+    color: $brand;
+    vertical-align: top;
+    position: absolute;
+    top: 17px;
+    right: 18px;
+  }
+
+  abbr {
+    color: white;
+
+    &[title] {
+      border-bottom: 1px dotted white;
+    }
+  }
+
+  .button-support {
+    background: white;
+    color: $proposals;
+    display: inline-block;
+    font-size: rem-calc(14);
+    margin-top: rem-calc(12);
+
+    &:hover {
+      background: $proposals-border;
+      color: white;
+      cursor: pointer;
+    }
+
+    &:active {
+      opacity: .75;
+    }
+  }
+
+  .total-supports {
+    color: white;
+    text-align: center;
+    font-size: rem-calc(14);
+
+    span {
+      display: block;
+      font-size: rem-calc(11);
+      opacity: .75;
+    }
+  }
+
+  .divider {
+    margin: 0 rem-calc(6);
+  }
+
+  .not-logged {
+    background: rgba(255,164,45,.9);
+    color: white;
+    height: 100%;
+    left: 0;
+    line-height: $line-height*2;
+    padding-top: rem-calc(12);
+    position: absolute;
+    text-align: center;
+    top: 0;
+    width: 100%;
+    filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#222222', endColorstr='#222222'); /* IE */
+
+    a {
+      color: white;
+      text-decoration: underline;
+    }
+  }
+
+  .anonymous-votes, .organizations-votes {
+    background: $warning-bg;
+    color: $warning-color;
+    height: 100%;
+    left: 0;
+    line-height: $line-height;
+    padding-top: rem-calc(12);
+    position: absolute;
+    text-align: center;
+    top: 0;
+    width: 100%;
+
+    p {
+      color: $warning-color;
+      margin: 0 rem-calc(12);
+      text-align: left;
+    }
+
+    a {
+      color: $warning-color;
+      font-weight: bold;
+      text-decoration: underline;
+    }
+  }
+
+  .supported {
+    color: white;
+    margin-top: rem-calc(12);
+  }
+}
+
+// 02. New participation
+// - - - - - - - - - - - - - - - - - - - - - - - - -
+
+.debate-new, .debate-edit, .proposal-new, .proposal-edit,  {
+  background: white;
+  padding-top: rem-calc(24);
+
+  .back {
+    @include back;
+  }
+
+  h1 {
+    clear: both;
+    font-size: rem-calc(36);
+    font-weight: bold;
+    line-height: $line-height*2;
+    margin-bottom: rem-calc(24);
+  }
+
+  .icon-debates {
+    color: $debates;
+    font-size: rem-calc(60);
+    line-height: $line-height;
+    opacity: .5;
+  }
+
+  .icon-proposals {
+    color: $proposals;
+    font-size: rem-calc(50);
+    line-height: $line-height;
+    opacity: .5;
+  }
+
+  h2 {
+    clear: both;
+    font-size: rem-calc(20);
+    font-weight: bold;
+    line-height: $line-height;
+    margin: 0;
+  }
+
+  .recommendations {
+    list-style-type: none;
+    margin-left: 0;
+    margin-top: rem-calc(24);
+
+    li {
+      font-size: rem-calc(12);
+      margin: rem-calc(12) 0;
+
+      &:before {
+        content: "l ";
+        font-family: "icons" !important;
+      }
+    }
+  }
+}
+
+.debate-new, .debate-edit {
+
+  .recommendations li:before {
+    color: $debates;
+  }
+}
+
+.proposal-new, .proposal-edit {
+
+  .recommendations li:before {
+    color: $proposals;
+  }
+}
+
+// 02. Show participation
+// - - - - - - - - - - - - - - - - - - - - - - - - -
+
+.debate-show, .proposal-show {
+  padding-top: rem-calc(12);
+
+  .back, .icon-angle-left {
+    @include back;
+  }
+
+  h1 {
+    clear: both;
+    font-size: rem-calc(30);
+    font-weight: bold;
+    margin: 0;
+    text-transform: lowercase;
+
+    &:first-letter {
+      text-transform: uppercase;
+    }
+  }
+
+  h4 {
+    margin: rem-calc(12) 0;
+  }
+
+  .edit-debate, .edit-proposal {
+    margin-bottom: 0;
+  }
+
+  .debate-info, .proposal-info {
+    clear: both;
+    color: $text-medium;
+    font-weight: lighter;
+    line-height: $line-height*2;
+    text-align: justify;
+
+    a {
+        color: $text-medium;
+    }
+
+    p {
+      font-size: rem-calc(15);
+      line-height: $line-height;
+      margin-bottom: 0;
+    }
+  }
+
+  .debate-description, .proposal-description {
+    font-size: rem-calc(15);
+    line-height: rem-calc(30);
+  }
+
+  ul, ol {
+    margin: rem-calc(12) 0;
+
+    li {
+      font-size: rem-calc(15);
+      margin-bottom: rem-calc(15);
+    }
+  }
+
+  .author-photo {
+    line-height: $line-height*2;
+    margin-right: rem-calc(6);
+    vertical-align: middle;
+    width: 32px;
+  }
+
+  .author {
+    color: $text;
+    font-weight: bold;
+  }
+
+  aside {
+
+    h3 {
+      border-top: 2px solid $brand;
+      display: inline-block;
+      font-size: rem-calc(16);
+      margin: -1px 0 rem-calc(12);
+      padding-top: rem-calc(6);
+      text-transform: uppercase;
+    }
+  }
+
+  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";
+    }
+  }
+
+  .votes {
+    @include votes;
+    border: 0;
+    border-radius: 0;
+    margin: 0;
+
+    .total-votes {
+      display: block;
+      float: none;
+      line-height: $line-height;
+    }
+
+    .not-logged {
+      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;
+      }
+    }
+  }
+
+  .supports {
+    @include supports;
+    border: 0;
+    border-radius: 0;
+    margin: 0;
+
+    .total-supports {
+      display: block;
+      float: none;
+      line-height: $line-height;
+    }
+
+    .not-logged {
+      line-height: $line-height;
+      padding: rem-calc(24);
+    }
+  }
+
+  .leave-comment {
+    display: inline-block;
+    margin-top: rem-calc(24);
+  }
+
+  .tags {
+    display: block;
+    margin: rem-calc(24) 0;
+
+    a {
+      margin-right: rem-calc(6);
+    }
+  }
+}
+
+.bullet {
+  color: $border;
+}
+
+// 04. Featured
+// - - - - - - - - - - - - - - - - - - - - - - - - -
+
+.debate-featured, .proposal-featured {
+
+  .panel {
+    background: white;
+    border: 1px solid;
+    border-color: #E5E6E9 #DFE0E4 #D0D1D5;
+    border-radius: rem-calc(3);
+    margin-bottom: rem-calc(24);
+    padding: rem-calc(24) rem-calc(12) 0 rem-calc(12);
+
+    .debate-content, .proposal-content {
+      min-height: rem-calc(353);
+    }
+
+    .label-debate, .label-proposal {
+      background: none;
+      clear: both;
+      display: block;
+      font-size: rem-calc(12);
+      font-weight: bold;
+      text-transform: uppercase;
+      padding-left: 0;
+      padding-top: 0;
+    }
+
+    .label-debate {
+      color: $debates;
+    }
+
+    .label-proposal {
+      color: $proposals;
+    }
+
+    .icon-debates, .icon-proposals {
+      font-size: rem-calc(36);
+      line-height: $line-height;
+      position: absolute;
+      right: rem-calc(18);
+      top: rem-calc(12);
+    }
+
+    .icon-debates {
+      color: $debates;
+    }
+
+    .icon-proposals {
+      color: $proposals;
+    }
+
+    h3 {
+      font-weight: bold;
+      margin: rem-calc(8) 0 0 0;
+      min-height: rem-calc(65);
+
+      a {
+        clear: both;
+        color: $text;
+        display: block;
+        font-size: rem-calc(16);
+        line-height: $line-height;
+        text-transform: lowercase;
+
+        &:first-letter {
+          text-transform: uppercase;
+        }
+      }
+    }
+
+    .debate-info, .proposal-info {
+      color: $text-medium;
+      font-weight: lighter;
+      margin-bottom: 0;
+
+      .icon-comments {
+        font-size: rem-calc(16);
+        vertical-align: top;
+      }
+
+      a {
+        color: $text-medium;
+      }
+    }
+
+    .debate-description, .proposal-description {
+      color: $text;
+      font-size: rem-calc(13);
+      height: rem-calc(156);
+      line-height: $line-height;
+      margin-bottom: rem-calc(12);
+      margin-top: rem-calc(24);
+      overflow: hidden;
+      position: relative;
+
+      a {
+        color: $text;
+      }
+
+      ul, ol {
+
+        li {
+          font-size: rem-calc(13);
+          margin-bottom: rem-calc(12);
+        }
+      }
+    }
+
+    .truncate {
+      background: image-url('truncate.png');
+      background-repeat: repeat-x;
+      bottom: 0;
+      height: 24px;
+      position: absolute;
+      width: 100%;
+    }
+
+    p {
+      color: $text;
+      font-size: rem-calc(14);
+      line-height: $line-height;
+      margin-bottom: rem-calc(12);
+
+      &.debate-info {
+        font-size: rem-calc(13);
+      }
+    }
+  }
+
+  .supports {
+    @include supports;
+  }
+
+  .votes {
+    @include votes;
+  }
+}
+
+
+
+
diff --git a/app/assets/stylesheets/proposals.scss b/app/assets/stylesheets/proposals.scss
index 92db612b7..d2cdac183 100644
--- a/app/assets/stylesheets/proposals.scss
+++ b/app/assets/stylesheets/proposals.scss
@@ -5,138 +5,8 @@
 //  02.1. Featured
 //  02.2. List
 // 03. Show
-// 04. New
 //
 
-// 01. Proposals
-// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-.button-proposal {
-  background: $proposals;
-
-  &:hover {
-    background: $proposals-border;
-  }
-}
-
-@mixin supports {
-  background: $proposals;
-  border-top: 1px solid $proposals-border;
-  margin: 0 rem-calc(-12);
-  padding: rem-calc(14) rem-calc(12);
-  position: relative;
-
-  .progress {
-    background-color: rgba(255,255,255,.8);
-    height: rem-calc(12);
-    margin-bottom: rem-calc(6);
-    margin-top: rem-calc(4);
-
-    .meter {
-      background: $votes-like;
-    }
-  }
-
-  .percentage {
-    font-size: rem-calc(10);
-    color: $brand;
-    vertical-align: top;
-    position: absolute;
-    top: 17px;
-    right: 18px;
-  }
-
-  abbr {
-    color: white;
-
-    &[title] {
-      border-bottom: 1px dotted white;
-    }
-  }
-
-  .button-support {
-    background: white;
-    color: $proposals;
-    display: inline-block;
-    font-size: rem-calc(14);
-    margin-top: rem-calc(12);
-
-    &:hover {
-      background: $proposals-border;
-      color: white;
-      cursor: pointer;
-    }
-
-    &:active {
-      opacity: .75;
-    }
-  }
-
-  .total-supports {
-    color: white;
-    text-align: center;
-    font-size: rem-calc(14);
-
-    span {
-      display: block;
-      font-size: rem-calc(11);
-      opacity: .75;
-    }
-  }
-
-  .divider {
-    margin: 0 rem-calc(6);
-  }
-
-  .not-logged {
-    background: rgba(255,164,45,.9);
-    color: white;
-    height: 100%;
-    left: 0;
-    line-height: $line-height*2;
-    padding-top: rem-calc(12);
-    position: absolute;
-    text-align: center;
-    top: 0;
-    width: 100%;
-    filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#222222', endColorstr='#222222'); /* IE */
-
-    a {
-      color: white;
-      text-decoration: underline;
-    }
-  }
-
-  .anonymous-votes, .organizations-votes {
-    background: $warning-bg;
-    color: $warning-color;
-    height: 100%;
-    left: 0;
-    line-height: $line-height;
-    padding-top: rem-calc(12);
-    position: absolute;
-    text-align: center;
-    top: 0;
-    width: 100%;
-
-    p {
-      color: $warning-color;
-      margin: 0 rem-calc(12);
-      text-align: left;
-    }
-
-    a {
-      color: $warning-color;
-      font-weight: bold;
-      text-decoration: underline;
-    }
-  }
-
-  .supported {
-    color: white;
-    margin-top: rem-calc(12);
-  }
-}
 
 // 02. Index
 // - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -144,123 +14,123 @@
 // 02.1. Featured
 // - - - - - - - - - - - - -
 
-.proposal-featured {
+// .proposal-featured {
 
-  .panel {
-    background: white;
-    border: 1px solid;
-    border-color: #e5e6e9 #dfe0e4 #d0d1d5;
-    border-radius: rem-calc(3);
-    margin-bottom: rem-calc(24);
-    padding: rem-calc(24) rem-calc(12) 0 rem-calc(12);
+//   .panel {
+//     background: white;
+//     border: 1px solid;
+//     border-color: #e5e6e9 #dfe0e4 #d0d1d5;
+//     border-radius: rem-calc(3);
+//     margin-bottom: rem-calc(24);
+//     padding: rem-calc(24) rem-calc(12) 0 rem-calc(12);
 
-    .proposal-content {
-      min-height: rem-calc(353);
-    }
+//     .proposal-content {
+//       min-height: rem-calc(353);
+//     }
 
-    .label-proposal {
-      background: none;
-      clear: both;
-      color: $proposals;
-      display: block;
-      font-size: rem-calc(12);
-      font-weight: bold;
-      text-transform: uppercase;
-      padding-left: 0;
-      padding-top: 0;
-    }
+//     .label-proposal {
+//       background: none;
+//       clear: both;
+//       color: $proposals;
+//       display: block;
+//       font-size: rem-calc(12);
+//       font-weight: bold;
+//       text-transform: uppercase;
+//       padding-left: 0;
+//       padding-top: 0;
+//     }
 
-    .icon-proposals {
-      color: $proposals;
-      font-size: rem-calc(36);
-      line-height: $line-height;
-      position: absolute;
-      right: rem-calc(18);
-      top: rem-calc(12);
-    }
+//     .icon-proposals {
+//       color: $proposals;
+//       font-size: rem-calc(36);
+//       line-height: $line-height;
+//       position: absolute;
+//       right: rem-calc(18);
+//       top: rem-calc(12);
+//     }
 
-    h3 {
-      font-weight: bold;
-      margin: rem-calc(8) 0 0 0;
-      min-height: rem-calc(65);
+//     h3 {
+//       font-weight: bold;
+//       margin: rem-calc(8) 0 0 0;
+//       min-height: rem-calc(65);
 
-      a {
-        clear: both;
-        color: $text;
-        display: block;
-        font-size: rem-calc(16);
-        line-height: $line-height;
-        text-transform: lowercase;
+//       a {
+//         clear: both;
+//         color: $text;
+//         display: block;
+//         font-size: rem-calc(16);
+//         line-height: $line-height;
+//         text-transform: lowercase;
 
-        &:first-letter {
-          text-transform: uppercase;
-        }
-      }
-    }
+//         &:first-letter {
+//           text-transform: uppercase;
+//         }
+//       }
+//     }
 
-    .proposal-info {
-      color: $text-medium;
-      font-weight: lighter;
-      margin-bottom: 0;
+//     .proposal-info {
+//       color: $text-medium;
+//       font-weight: lighter;
+//       margin-bottom: 0;
 
-      .icon-comments {
-        font-size: rem-calc(16);
-        vertical-align: top;
-      }
+//       .icon-comments {
+//         font-size: rem-calc(16);
+//         vertical-align: top;
+//       }
 
-      a {
-        color: $text-medium;
-      }
-    }
+//       a {
+//         color: $text-medium;
+//       }
+//     }
 
-    .proposal-description {
-      color: $text;
-      font-size: rem-calc(13);
-      height: rem-calc(156);
-      line-height: $line-height;
-      margin-bottom: rem-calc(12);
-      margin-top: rem-calc(24);
-      overflow: hidden;
-      position: relative;
+//     .proposal-description {
+//       color: $text;
+//       font-size: rem-calc(13);
+//       height: rem-calc(156);
+//       line-height: $line-height;
+//       margin-bottom: rem-calc(12);
+//       margin-top: rem-calc(24);
+//       overflow: hidden;
+//       position: relative;
 
-      a {
-        color: $text;
-      }
+//       a {
+//         color: $text;
+//       }
 
-      ul, ol {
+//       ul, ol {
 
-        li {
-          font-size: rem-calc(13);
-          margin-bottom: rem-calc(12);
-        }
-      }
-    }
+//         li {
+//           font-size: rem-calc(13);
+//           margin-bottom: rem-calc(12);
+//         }
+//       }
+//     }
 
-    .truncate {
-      background: image-url('truncate.png');
-      background-repeat: repeat-x;
-      bottom: 0;
-      height: 24px;
-      position: absolute;
-      width: 100%;
-    }
+//     .truncate {
+//       background: image-url('truncate.png');
+//       background-repeat: repeat-x;
+//       bottom: 0;
+//       height: 24px;
+//       position: absolute;
+//       width: 100%;
+//     }
 
-    p {
-      color: $text;
-      font-size: rem-calc(14);
-      line-height: $line-height;
-      margin-bottom: rem-calc(12);
+//     p {
+//       color: $text;
+//       font-size: rem-calc(14);
+//       line-height: $line-height;
+//       margin-bottom: rem-calc(12);
 
-      &.debate-info {
-        font-size: rem-calc(13);
-      }
-    }
-  }
+//       &.debate-info {
+//         font-size: rem-calc(13);
+//       }
+//     }
+//   }
 
-  .supports {
-    @include supports;
-  }
-}
+//   .supports {
+//     @include supports;
+//   }
+// }
 
 // 02.2. List
 // - - - - - - - - - - - - -
@@ -381,225 +251,3 @@
     }
   }
 }
-
-// 03. Show
-// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-.proposal-show {
-  padding-top: rem-calc(12);
-
-  .back {
-    @include back;
-  }
-
-  .icon-angle-left {
-   @extend .back;
-  }
-
-  h1 {
-    clear: both;
-    font-size: rem-calc(30);
-    font-weight: bold;
-    margin: 0;
-    text-transform: lowercase;
-
-    &:first-letter {
-      text-transform: uppercase;
-    }
-  }
-
-  h4 {
-    margin: rem-calc(12) 0;
-  }
-
-  .edit-proposal {
-    margin-bottom: 0;
-  }
-
-  .proposal-info {
-    clear: both;
-    color: $text-medium;
-    font-weight: lighter;
-    line-height: $line-height*2;
-    text-align: justify;
-
-    a {
-        color: $text-medium;
-    }
-
-    p {
-      font-size: rem-calc(15);
-      line-height: $line-height;
-      margin-bottom: 0;
-    }
-  }
-
-  .proposal-description {
-    font-size: rem-calc(15);
-    line-height: rem-calc(30);
-  }
-
-  ul, ol {
-    margin: rem-calc(12) 0;
-
-    li {
-      font-size: rem-calc(15);
-      margin-bottom: rem-calc(15);
-    }
-  }
-
-  .author-photo {
-    line-height: $line-height*2;
-    margin-right: rem-calc(6);
-    vertical-align: middle;
-    width: 32px;
-  }
-
-  .author {
-    color: $text;
-    font-weight: bold;
-  }
-
-  aside {
-
-    h3 {
-      border-top: 2px solid $brand;
-      display: inline-block;
-      font-size: rem-calc(16);
-      margin: -1px 0 rem-calc(12);
-      padding-top: rem-calc(6);
-      text-transform: uppercase;
-    }
-  }
-
-  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;
-    border-radius: 0;
-    margin: 0;
-
-    .total-supports {
-      display: block;
-      float: none;
-      line-height: $line-height;
-    }
-
-    .not-logged {
-      line-height: $line-height;
-      padding: rem-calc(24);
-    }
-  }
-
-  .leave-comment {
-    display: inline-block;
-    margin-top: rem-calc(24);
-  }
-
-  .tags {
-    display: block;
-    margin: rem-calc(24) 0;
-
-    a {
-      margin-right: rem-calc(6);
-    }
-  }
-}
-
-.bullet {
-  color: $border;
-}
-
-// 04. New
-// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-.proposal-new {
-  background: white;
-  padding-top: rem-calc(24);
-
-  .back {
-    @include back;
-  }
-
-  h1 {
-    clear: both;
-    font-size: rem-calc(36);
-    font-weight: bold;
-    line-height: $line-height*2;
-    margin-bottom: rem-calc(24);
-  }
-
-  .icon-proposals {
-    color: $proposals;
-    font-size: rem-calc(50);
-    line-height: $line-height;
-    opacity: .5;
-  }
-
-  h2 {
-    clear: both;
-    font-size: rem-calc(20);
-    font-weight: bold;
-    line-height: $line-height;
-    margin: 0;
-  }
-
-  .recommendations {
-    list-style-type: none;
-    margin-left: 0;
-    margin-top: rem-calc(24);
-
-    li {
-      font-size: rem-calc(12);
-      margin: rem-calc(12) 0;
-
-      &:before {
-        color: $proposals;
-        content: "l ";
-        font-family: "icons" !important;
-      }
-    }
-  }
-}
-
-.proposal-edit {
-  @extend .proposal-new;
-}

From 1341fb449322a201462ebedb1eb1670d6c250aca Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Fri, 9 Oct 2015 13:14:06 +0200
Subject: [PATCH 28/37] Merges debates and proposals on participation.scss

---
 app/assets/stylesheets/application.scss   |   2 -
 app/assets/stylesheets/debates.scss       | 346 ----------------------
 app/assets/stylesheets/participation.scss | 212 ++++++++++---
 app/assets/stylesheets/proposals.scss     | 253 ----------------
 4 files changed, 171 insertions(+), 642 deletions(-)
 delete mode 100644 app/assets/stylesheets/debates.scss
 delete mode 100644 app/assets/stylesheets/proposals.scss

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 9cda8cab1..b9f9ca39e 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -6,6 +6,4 @@
 @import "admin";
 @import "layout";
 @import "participation";
-@import "debates";
-@import "proposals";
 @import "c3";
\ No newline at end of file
diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss
deleted file mode 100644
index 547d57a9b..000000000
--- a/app/assets/stylesheets/debates.scss
+++ /dev/null
@@ -1,346 +0,0 @@
-// Table of Contents
-//
-// 01. Debates
-// 02. Index
-//  02.1. Featured
-//  02.2. List
-// 03. Show
-//
-
-// 02. Index
-// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-// 02.1. Featured
-// - - - - - - - - - - - - -
-
-// .debate-featured {
-
-//   .panel {
-//     background: white;
-//     border: 1px solid;
-//     border-color: #e5e6e9 #dfe0e4 #d0d1d5;
-//     border-radius: rem-calc(3);
-//     margin-bottom: rem-calc(24);
-//     padding: rem-calc(24) rem-calc(12) 0 rem-calc(12);
-
-//     .debate-content {
-//       min-height: rem-calc(353);
-//     }
-
-//     .label-debate {
-//       background: none;
-//       clear: both;
-//       color: $debates;
-//       display: block;
-//       font-size: rem-calc(12);
-//       font-weight: bold;
-//       text-transform: uppercase;
-//       padding-left: 0;
-//       padding-top: 0;
-//     }
-
-//     .icon-debates {
-//       color: $debates;
-//       font-size: rem-calc(36);
-//       line-height: $line-height;
-//       position: absolute;
-//       right: rem-calc(18);
-//       top: rem-calc(12);
-//     }
-
-//     h3 {
-//       font-weight: bold;
-//       margin: rem-calc(8) 0 0 0;
-//       min-height: rem-calc(65);
-
-//       a {
-//         clear: both;
-//         color: $text;
-//         display: block;
-//         font-size: rem-calc(16);
-//         line-height: $line-height;
-//         text-transform: lowercase;
-
-//         &:first-letter {
-//           text-transform: uppercase;
-//         }
-//       }
-//     }
-
-//     .debate-info {
-//       color: $text-medium;
-//       font-weight: lighter;
-//       margin-bottom: 0;
-
-//       .icon-comments {
-//         font-size: rem-calc(16);
-//         vertical-align: top;
-//       }
-
-//       a {
-//         color: $text-medium;
-//       }
-//     }
-
-//     .debate-description {
-//       color: $text;
-//       font-size: rem-calc(13);
-//       height: rem-calc(156);
-//       line-height: $line-height;
-//       margin-bottom: rem-calc(12);
-//       margin-top: rem-calc(24);
-//       overflow: hidden;
-//       position: relative;
-
-//       a {
-//         color: $text;
-//       }
-
-//       ul, ol {
-
-//         li {
-//           font-size: rem-calc(13);
-//           margin-bottom: rem-calc(12);
-//         }
-//       }
-//     }
-
-//     .truncate {
-//       background: image-url('truncate.png');
-//       background-repeat: repeat-x;
-//       bottom: 0;
-//       height: 24px;
-//       position: absolute;
-//       width: 100%;
-//     }
-
-//     p {
-//       color: $text;
-//       font-size: rem-calc(14);
-//       line-height: $line-height;
-//       margin-bottom: rem-calc(12);
-
-//       &.debate-info {
-//         font-size: rem-calc(13);
-//       }
-//     }
-//   }
-
-//   .votes {
-//     @include votes;
-//   }
-// }
-
-// 02.2. List
-// - - - - - - - - - - - - -
-
-.debates-list {
-
-  @media (min-width: $small-breakpoint) {
-    margin-bottom: rem-calc(48);
-  }
-}
-
-.debate {
-  margin-bottom: 0;
-  margin-top: 0;
-
-  .panel {
-    background: white;
-    border: 1px solid;
-    border-color: #e5e6e9 #dfe0e4 #d0d1d5;
-    border-radius: 0;
-    box-shadow: 0px 1px 3px 0 $border;
-    margin-bottom: rem-calc(12);
-    min-height: rem-calc(192);
-    padding: rem-calc(12) rem-calc(12) 0 rem-calc(12);
-
-    @media (min-width: $small-breakpoint) {
-      margin-bottom: rem-calc(-1);
-      padding-bottom: rem-calc(12);
-    }
-
-    .label-debate {
-      background: none;
-      clear: both;
-      color: $debates;
-      display: block;
-      font-size: rem-calc(12);
-      font-weight: bold;
-      line-height: $line-height;
-      padding-bottom: 0;
-      padding-left: 0;
-      padding-top: 0;
-      text-transform: uppercase;
-    }
-
-    h3 {
-      font-weight: bold;
-      margin: 0;
-      min-height: rem-calc(48);
-
-      a {
-        clear: both;
-        color: $text;
-        display: block;
-        font-size: rem-calc(16);
-        line-height: $line-height;
-        text-transform: lowercase;
-
-        &:first-letter {
-          text-transform: uppercase;
-        }
-      }
-    }
-
-    .debate-content {
-      margin: 0;
-      min-height: rem-calc(180);
-
-      .tags {
-        display: block;
-      }
-    }
-
-    .icon-debates {
-      color: $debates;
-      font-size: rem-calc(18);
-      left: rem-calc(60);
-      line-height: $line-height;
-      position: absolute;
-      top: 0;
-    }
-
-    .debate-info {
-      color: $text-medium;
-      font-weight: lighter;
-      margin-bottom: 0;
-
-      .icon-comments {
-        font-size: rem-calc(16);
-        vertical-align: top;
-      }
-
-      a {
-        color: $text-medium;
-      }
-    }
-
-    .debate-description {
-      color: $text;
-      font-size: rem-calc(13);
-      height: rem-calc(72);
-      line-height: $line-height;
-      margin-bottom: rem-calc(12);
-      margin-top: 0;
-      overflow: hidden;
-      position: relative;
-
-      a {
-        color: $text;
-      }
-
-      ul, ol {
-
-        li {
-          font-size: rem-calc(13);
-          margin-bottom: rem-calc(12);
-        }
-      }
-    }
-
-    .truncate {
-      background: image-url('truncate.png');
-      background-repeat: repeat-x;
-      bottom: 0;
-      height: 24px;
-      position: absolute;
-      width: 100%;
-    }
-
-    p {
-      color: $text;
-      font-size: rem-calc(14);
-      line-height: $line-height;
-      margin-bottom: rem-calc(12);
-
-      &.debate-info {
-        font-size: rem-calc(13);
-      }
-    }
-  }
-
-  .votes {
-    @include votes;
-    border: 1px solid $votes-border;
-    margin: 0 rem-calc(-12);
-
-    @media (min-width: $small-breakpoint) {
-      border-top-left-radius: 3px;
-      border-bottom-left-radius: 3px;
-      margin: 0 rem-calc(-25) 0 rem-calc(12);
-    }
-
-    &:after {
-      content: none;
-      position: absolute;
-      display: block;
-      border-style: solid;
-      border-color: #166387 transparent transparent transparent;
-      bottom: rem-calc(-14);
-      border-left-width: 0;
-      border-right-color: transparent;
-      right: rem-calc(-1);
-      border-width: 1em 1em 0 0;
-
-      @media (min-width: $small-breakpoint) {
-        content: "";
-      }
-    }
-
-    .total-votes {
-      display: inline-block;
-      line-height: $line-height;
-      margin-left: rem-calc(24);
-      padding-top: rem-calc(12);
-      vertical-align: top;
-
-      @media (min-width: $small-breakpoint) {
-        display: block;
-        float: none;
-        line-height: $line-height*2;
-        margin-left: 0;
-        padding-top: 0;
-      }
-    }
-
-    @media (min-width: $small-breakpoint) {
-      .like, .unlike {
-
-        span {
-          display: block;
-          line-height: $line-height/2;
-        }
-      }
-    }
-
-    .not-logged {
-      line-height: $line-height;
-      padding-top: rem-calc(24);
-    }
-
-    .anonymous-votes, .organizations-votes {
-      padding-top: rem-calc(24);
-    }
-
-    .divider {
-      display: none;
-    }
-
-    @media (min-width: $medium-breakpoint) {
-      .divider {
-        display: inline-block;
-      }
-    }
-  }
-}
diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index deb13635a..9aa06dd04 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -1,11 +1,9 @@
-// Table of Contents
+// Table of Contents - Styles for debates and proposals
 //
-// Styles for debates and proposals
 // 01. Votes and supports
 // 02. New participation
 // 03. Show participation
-// 04. Featured
-// 05.
+// 04. List participation
 //
 
 // 01. Votes and supports
@@ -83,14 +81,12 @@
 
   .voted {
     .icon-like {
-      @extend .icon-like;
       background: $votes-like;
       border-color: white;
       color: white;
     }
 
     .icon-unlike {
-      @extend .icon-unlike;
       background: $votes-unlike;
       border-color: white;
       color: white;
@@ -442,7 +438,7 @@
     line-height: rem-calc(30);
   }
 
-  .document-link {
+  .document-link, .video-link {
     border: 1px solid $border;
     display: block;
     margin-top: rem-calc(12);
@@ -466,7 +462,6 @@
   }
 
   .video-link {
-    @extend .document-link;
 
     :before {
       color: #CC181E;
@@ -546,21 +541,33 @@
   color: $border;
 }
 
-// 04. Featured
+// 04. List participation
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
-.debate-featured, .proposal-featured {
+.debates-list, .proposals-list {
+
+  @media (min-width: $small-breakpoint) {
+    margin-bottom: rem-calc(48);
+  }
+}
+
+.debate, .proposal {
+  margin-bottom: 0;
+  margin-top: 0;
 
   .panel {
     background: white;
     border: 1px solid;
-    border-color: #E5E6E9 #DFE0E4 #D0D1D5;
-    border-radius: rem-calc(3);
-    margin-bottom: rem-calc(24);
-    padding: rem-calc(24) rem-calc(12) 0 rem-calc(12);
+    border-color: #e5e6e9 #dfe0e4 #d0d1d5;
+    border-radius: 0;
+    box-shadow: 0px 1px 3px 0 $border;
+    margin-bottom: rem-calc(12);
+    min-height: rem-calc(192);
+    padding: rem-calc(12) rem-calc(12) 0 rem-calc(12);
 
-    .debate-content, .proposal-content {
-      min-height: rem-calc(353);
+    @media (min-width: $small-breakpoint) {
+      margin-bottom: rem-calc(-1);
+      padding-bottom: rem-calc(12);
     }
 
     .label-debate, .label-proposal {
@@ -569,9 +576,11 @@
       display: block;
       font-size: rem-calc(12);
       font-weight: bold;
-      text-transform: uppercase;
+      line-height: $line-height;
+      padding-bottom: 0;
       padding-left: 0;
       padding-top: 0;
+      text-transform: uppercase;
     }
 
     .label-debate {
@@ -582,26 +591,10 @@
       color: $proposals;
     }
 
-    .icon-debates, .icon-proposals {
-      font-size: rem-calc(36);
-      line-height: $line-height;
-      position: absolute;
-      right: rem-calc(18);
-      top: rem-calc(12);
-    }
-
-    .icon-debates {
-      color: $debates;
-    }
-
-    .icon-proposals {
-      color: $proposals;
-    }
-
     h3 {
       font-weight: bold;
-      margin: rem-calc(8) 0 0 0;
-      min-height: rem-calc(65);
+      margin: 0;
+      min-height: rem-calc(48);
 
       a {
         clear: both;
@@ -617,6 +610,32 @@
       }
     }
 
+    .debate-content, .proposal-content {
+      margin: 0;
+      min-height: rem-calc(180);
+
+      .tags {
+        display: block;
+      }
+    }
+
+    .icon-debates, .icon-proposals {
+      font-size: rem-calc(18);
+      line-height: $line-height;
+      position: absolute;
+      top: 0;
+    }
+
+    .icon-debates {
+      color: $debates;
+      left: rem-calc(60);
+    }
+
+    .icon-proposals {
+      color: $proposals;
+      left: rem-calc(88);
+    }
+
     .debate-info, .proposal-info {
       color: $text-medium;
       font-weight: lighter;
@@ -635,10 +654,10 @@
     .debate-description, .proposal-description {
       color: $text;
       font-size: rem-calc(13);
-      height: rem-calc(156);
+      height: rem-calc(72);
       line-height: $line-height;
       margin-bottom: rem-calc(12);
-      margin-top: rem-calc(24);
+      margin-top: 0;
       overflow: hidden;
       position: relative;
 
@@ -676,15 +695,126 @@
     }
   }
 
-  .supports {
-    @include supports;
+  .not-logged {
+    line-height: $line-height;
+    padding-top: rem-calc(24);
   }
 
-  .votes {
-    @include votes;
+  .anonymous-votes, .organizations-votes {
+    padding-top: rem-calc(24);
+  }
+
+  .divider {
+    display: none;
+  }
+
+  @media (min-width: $medium-breakpoint) {
+    .divider {
+      display: inline-block;
+    }
   }
 }
 
+.debate {
 
+  .votes {
+    @include votes;
+    border: 1px solid $votes-border;
+    margin: 0 rem-calc(-12);
 
+    @media (min-width: $small-breakpoint) {
+      border-top-left-radius: 3px;
+      border-bottom-left-radius: 3px;
+      margin: 0 rem-calc(-25) 0 rem-calc(12);
+    }
 
+    &:after {
+      content: none;
+      position: absolute;
+      display: block;
+      border-style: solid;
+      border-color: #166387 transparent transparent transparent;
+      bottom: rem-calc(-14);
+      border-left-width: 0;
+      border-right-color: transparent;
+      right: rem-calc(-1);
+      border-width: 1em 1em 0 0;
+
+      @media (min-width: $small-breakpoint) {
+        content: "";
+      }
+    }
+
+    .total-votes {
+      display: inline-block;
+      line-height: $line-height;
+      margin-left: rem-calc(24);
+      padding-top: rem-calc(12);
+      vertical-align: top;
+
+      @media (min-width: $small-breakpoint) {
+        display: block;
+        float: none;
+        line-height: $line-height*2;
+        margin-left: 0;
+        padding-top: 0;
+      }
+    }
+
+    @media (min-width: $small-breakpoint) {
+      .like, .unlike {
+
+        span {
+          display: block;
+          line-height: $line-height/2;
+        }
+      }
+    }
+  }
+}
+
+.proposal {
+
+  .supports {
+    @include supports;
+    border: 1px solid $proposals-border;
+    margin: 0 rem-calc(-12);
+
+    @media (min-width: $small-breakpoint) {
+      border-top-left-radius: 3px;
+      border-bottom-left-radius: 3px;
+      margin: 0 rem-calc(-25) 0 rem-calc(12);
+    }
+
+    &:after {
+      content: none;
+      position: absolute;
+      display: block;
+      border-style: solid;
+      border-color: #664212 transparent transparent transparent;
+      bottom: rem-calc(-14);
+      border-left-width: 0;
+      border-right-color: transparent;
+      right: rem-calc(-1);
+      border-width: 1em 1em 0 0;
+
+      @media (min-width: $small-breakpoint) {
+        content: "";
+      }
+    }
+
+    .total-supports {
+      display: inline-block;
+      line-height: $line-height;
+      padding-top: rem-calc(12);
+      vertical-align: top;
+
+      @media (min-width: $small-breakpoint) {
+        display: block;
+        float: none;
+        margin-left: 0;
+        padding-top: 0;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/proposals.scss b/app/assets/stylesheets/proposals.scss
deleted file mode 100644
index d2cdac183..000000000
--- a/app/assets/stylesheets/proposals.scss
+++ /dev/null
@@ -1,253 +0,0 @@
-// Table of Contents
-//
-// 01. Debates
-// 02. Index
-//  02.1. Featured
-//  02.2. List
-// 03. Show
-//
-
-
-// 02. Index
-// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-// 02.1. Featured
-// - - - - - - - - - - - - -
-
-// .proposal-featured {
-
-//   .panel {
-//     background: white;
-//     border: 1px solid;
-//     border-color: #e5e6e9 #dfe0e4 #d0d1d5;
-//     border-radius: rem-calc(3);
-//     margin-bottom: rem-calc(24);
-//     padding: rem-calc(24) rem-calc(12) 0 rem-calc(12);
-
-//     .proposal-content {
-//       min-height: rem-calc(353);
-//     }
-
-//     .label-proposal {
-//       background: none;
-//       clear: both;
-//       color: $proposals;
-//       display: block;
-//       font-size: rem-calc(12);
-//       font-weight: bold;
-//       text-transform: uppercase;
-//       padding-left: 0;
-//       padding-top: 0;
-//     }
-
-//     .icon-proposals {
-//       color: $proposals;
-//       font-size: rem-calc(36);
-//       line-height: $line-height;
-//       position: absolute;
-//       right: rem-calc(18);
-//       top: rem-calc(12);
-//     }
-
-//     h3 {
-//       font-weight: bold;
-//       margin: rem-calc(8) 0 0 0;
-//       min-height: rem-calc(65);
-
-//       a {
-//         clear: both;
-//         color: $text;
-//         display: block;
-//         font-size: rem-calc(16);
-//         line-height: $line-height;
-//         text-transform: lowercase;
-
-//         &:first-letter {
-//           text-transform: uppercase;
-//         }
-//       }
-//     }
-
-//     .proposal-info {
-//       color: $text-medium;
-//       font-weight: lighter;
-//       margin-bottom: 0;
-
-//       .icon-comments {
-//         font-size: rem-calc(16);
-//         vertical-align: top;
-//       }
-
-//       a {
-//         color: $text-medium;
-//       }
-//     }
-
-//     .proposal-description {
-//       color: $text;
-//       font-size: rem-calc(13);
-//       height: rem-calc(156);
-//       line-height: $line-height;
-//       margin-bottom: rem-calc(12);
-//       margin-top: rem-calc(24);
-//       overflow: hidden;
-//       position: relative;
-
-//       a {
-//         color: $text;
-//       }
-
-//       ul, ol {
-
-//         li {
-//           font-size: rem-calc(13);
-//           margin-bottom: rem-calc(12);
-//         }
-//       }
-//     }
-
-//     .truncate {
-//       background: image-url('truncate.png');
-//       background-repeat: repeat-x;
-//       bottom: 0;
-//       height: 24px;
-//       position: absolute;
-//       width: 100%;
-//     }
-
-//     p {
-//       color: $text;
-//       font-size: rem-calc(14);
-//       line-height: $line-height;
-//       margin-bottom: rem-calc(12);
-
-//       &.debate-info {
-//         font-size: rem-calc(13);
-//       }
-//     }
-//   }
-
-//   .supports {
-//     @include supports;
-//   }
-// }
-
-// 02.2. List
-// - - - - - - - - - - - - -
-
-.proposals-list {
-
-  @media (min-width: $small-breakpoint) {
-    margin-bottom: rem-calc(48);
-  }
-}
-
-.proposal {
-  @extend .proposal-featured;
-  margin-bottom: 0;
-  margin-top: 0;
-
-  .panel {
-    border-radius: 0;
-    box-shadow: 0px 1px 3px 0 $border;
-    margin-bottom: rem-calc(12);
-    min-height: rem-calc(192);
-    padding-top: rem-calc(12);
-
-    @media (min-width: $small-breakpoint) {
-      margin-bottom: rem-calc(-1);
-      padding-bottom: rem-calc(12);
-    }
-
-    .label-proposal {
-      line-height: $line-height;
-      padding-bottom: 0;
-    }
-
-    h3 {
-      margin-top: 0;
-      min-height: rem-calc(48);
-    }
-
-    .proposal-content {
-      margin: 0;
-      min-height: rem-calc(180);
-
-      .tags {
-        display: block;
-      }
-    }
-
-    .icon-proposals {
-      font-size: rem-calc(18);
-      left: rem-calc(88);
-      top: 0;
-    }
-
-    .proposal-description {
-      height: rem-calc(72);
-      margin-top: 0;
-    }
-  }
-
-  .supports {
-    border: 1px solid $proposals-border;
-    margin: 0 rem-calc(-12);
-
-    @media (min-width: $small-breakpoint) {
-      border-top-left-radius: 3px;
-      border-bottom-left-radius: 3px;
-      margin: 0 rem-calc(-25) 0 rem-calc(12);
-    }
-
-    &:after {
-      content: none;
-      position: absolute;
-      display: block;
-      border-style: solid;
-      border-color: #664212 transparent transparent transparent;
-      bottom: rem-calc(-14);
-      border-left-width: 0;
-      border-right-color: transparent;
-      right: rem-calc(-1);
-      border-width: 1em 1em 0 0;
-
-      @media (min-width: $small-breakpoint) {
-        content: "";
-      }
-    }
-
-    .total-supports {
-      display: inline-block;
-      line-height: $line-height;
-      padding-top: rem-calc(12);
-      vertical-align: top;
-
-      @media (min-width: $small-breakpoint) {
-        display: block;
-        float: none;
-        margin-left: 0;
-        padding-top: 0;
-      }
-    }
-
-    .not-logged {
-      line-height: $line-height;
-      padding-top: rem-calc(24);
-    }
-
-    .anonymous-votes, .organizations-votes {
-      padding-top: rem-calc(24);
-    }
-
-    .divider {
-      display: none;
-    }
-
-    @media (min-width: $medium-breakpoint) {
-      .divider {
-        display: inline-block;
-      }
-    }
-  }
-}

From 7039c0d29427caaf90fd4de8619ffe3248f9a6b0 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Fri, 9 Oct 2015 13:14:31 +0200
Subject: [PATCH 29/37] Cleans layout CSS

---
 app/assets/stylesheets/layout.scss | 94 ++++++++++++++++++++----------
 1 file changed, 64 insertions(+), 30 deletions(-)

diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 28e53b5b3..f41831dcf 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -444,7 +444,7 @@ header {
 }
 
 .contain-to-grid {
-  background: rgba(0,0,0,.5);
+  background: #112E51;
 }
 
 .top-bar {
@@ -774,15 +774,14 @@ footer {
 // 06. Tags
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
-.tags {
+.tags, .tag-cloud {
 
   a {
     background: $border;
-    border-radius: rem-calc(30);
+    border-radius: rem-calc(6);
     color: #4d4d4d;
     display: inline-block;
     font-size: rem-calc(13);
-    font-weight: bold;
     line-height: rem-calc(22);
     margin-bottom: rem-calc(8);
     padding: 0 rem-calc(8);
@@ -796,7 +795,6 @@ footer {
 }
 
 .tag-cloud {
-  @extend .tags;
 
   h3 {
     border-top: 2px solid $brand;
@@ -946,14 +944,13 @@ form {
     margin: rem-calc(12) 0 rem-calc(12) rem-calc(6);
   }
 
-  .note {
+  .note, .note-marked {
     display: block;
     font-size: rem-calc(13);
     margin-bottom: rem-calc(12);
   }
 
   .note-marked {
-    @extend .note;
     background: yellow;
     display: inline-block;
 
@@ -1139,16 +1136,12 @@ label.error, label.error a {
   }
 }
 
-img.avatar, img.admin-avatar, img.moderator-avatar {
+img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar {
   border-radius: rem-calc(1000);
   position: relative;
 }
 
-img.initialjs-avatar {
-  @extend .avatar;
-}
-
-.author-deleted {
+.author-deleted, .user-deleted {
   background-color: rgba(255,255,255,.5);
   color: rgba(0,0,0,.4);
   font-size: rem-calc(40);
@@ -1158,7 +1151,6 @@ img.initialjs-avatar {
 }
 
 .user-deleted {
-  @extend .author-deleted;
   top: -9px;
 }
 
@@ -1199,7 +1191,7 @@ img.initialjs-avatar {
 // 11. Filters & search
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
-.filters {
+.filters, .search-results {
 
   h2 {
     display: inline-block;
@@ -1250,10 +1242,6 @@ img.initialjs-avatar {
   }
 }
 
-.search-results {
-  @extend .filters;
-}
-
 .search-form {
 
   h3 {
@@ -1380,6 +1368,7 @@ table {
   }
 
   &:hover {
+    background: white;
     color: #40A2D1;
   }
 }
@@ -1419,6 +1408,7 @@ table {
   }
 
   &:hover {
+    background: white;
     color: #354F88;
   }
 }
@@ -1458,6 +1448,7 @@ table {
   }
 
   &:hover {
+    background: white;
     color: #CE3E26;
   }
 }
@@ -1500,27 +1491,72 @@ table {
   }
 
   .social-share-button-twitter {
-    @extend .social-share-button-twitter;
     background: none;
     color: white;
     height: rem-calc(24);
+    position: relative;
     width: rem-calc(48);
+
+    &:before {
+      content: "f";
+      font-family: "icons" !important;
+      font-size: rem-calc(24);
+      left: 50%;
+      line-height: $line-height*2;
+      margin-left: rem-calc(-11);
+      position: absolute;
+      top: 0;
+    }
+
+    &:hover {
+      color: #40A2D1;
+    }
   }
 
   .social-share-button-facebook {
-    @extend .social-share-button-facebook;
     background: none;
     color: white;
     height: rem-calc(24);
+    position: relative;
     width: rem-calc(48);
+
+    &:before {
+      content: "A";
+      font-family: "icons" !important;
+      font-size: rem-calc(24);
+      left: 50%;
+      line-height: $line-height*2;
+      margin-left: rem-calc(-11);
+      position: absolute;
+      top: 0;
+    }
+
+    &:hover {
+      color: #354F88;
+    }
   }
 
   .social-share-button-google_plus {
-    @extend .social-share-button-google_plus;
     background: none;
     color: white;
     height: rem-calc(24);
+    position: relative;
     width: rem-calc(48);
+
+    &:before {
+      content: "B";
+      font-family: "icons" !important;
+      font-size: rem-calc(24);
+      left: 50%;
+      line-height: $line-height*2;
+      margin-left: rem-calc(-11);
+      position: absolute;
+      top: 0;
+    }
+
+    &:hover {
+      color: #CE3E26;
+    }
   }
 }
 
@@ -1825,15 +1861,11 @@ table {
           padding: rem-calc(6) rem-calc(12);
         }
 
-        &.is-admin {
+        &.is-admin, &.is-moderator {
           background: $comment-admin;
           padding: rem-calc(6) rem-calc(12);
         }
 
-        &.is-moderator {
-          @extend .is-admin;
-        }
-
         &.level-5 {
           background: $comment-level-5;
           padding: rem-calc(6) rem-calc(12);
@@ -1888,13 +1920,15 @@ table {
   }
 }
 
-.flag-disable {
-  color: $text-medium;
+.flag-disable, .flag-active {
   line-height: rem-calc(24);
   vertical-align: middle;
 }
 
+.flag-disable {
+  color: $text-medium;
+}
+
 .flag-active {
-  @extend .flag-disable;
   color: $delete;
 }

From bbda35b8a3ee1116e30b3b71c55ea129624ecd6a Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Fri, 9 Oct 2015 13:15:04 +0200
Subject: [PATCH 30/37] Changes header of transparency and open data pages

---
 app/views/layouts/_header.html.erb | 11 ++++++++++-
 config/locales/en.yml              |  8 +++++---
 config/locales/es.yml              |  8 +++++---
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index d62bd6d5c..8ab43b55b 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -29,7 +29,16 @@
         <li class="name">
           <%= link_to root_path do %>
             <%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up left', size: '96x96') %>
-            <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %> <span>|</span> <span class="logo-site"><%= t("layouts.header.participation") %></span>
+            <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %> <span>|</span>
+            <span class="logo-site">
+              <% if transparency_page? %>
+                <%= t("layouts.header.transparency") %>
+              <% elsif opendata_page? %>
+                <%= t("layouts.header.open_data") %>
+              <% else %>
+                <%= t("layouts.header.participation") %>
+              <% end %>
+            </span>
           <% end %>
         </li>
       </ul>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f4362960f..917a7f218 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -10,7 +10,9 @@ en:
       external_link_blog_url: "/blog"
       open_gov: "%{open} government"
       open: "Open"
-      participation: Participation
+      participation: "Participation"
+      transparency: "Transparency"
+      open_data: "Open data"
       open_city_title: "The city you want, it will be the city you want."
       open_city_slogan_html:
         "Start listening to Madrid.
@@ -117,7 +119,7 @@ en:
         one: 1 Comment
         other: "%{count} Comments"
       login_to_comment: "You need to %{signin} or %{signup} to comment."
-      edit_debate_link: Edit
+      edit_debate_link: "Edit debate"
       share: Share
       flag: "This debate has been flag as innapropiate for some users."
     edit:
@@ -208,7 +210,7 @@ en:
         one: 1 Comment
         other: "%{count} Comments"
       login_to_comment: "You need to %{signin} or %{signup} to comment."
-      edit_proposal_link: Edit
+      edit_proposal_link: "Edit proposal"
       share: Share
       flag: "This proposal has been flag as innapropiate for some users."
     edit:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index fdac85fa2..fbfc06c89 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -10,7 +10,9 @@ es:
       external_link_blog_url: "/blog"
       open_gov: "Gobierno %{open}"
       open: "abierto"
-      participation: Participación
+      participation: "Participación"
+      transparency: "Transparencia"
+      open_data: "Datos abiertos"
       open_city_title: "La ciudad que quieres será la ciudad que quieras."
       open_city_slogan_html:
         "Existen ciudades gobernadas directamente por sus habitantes, que <b>debaten</b> sobre temas que les preocupan, <b>proponen</b> ideas para mejorar
@@ -117,7 +119,7 @@ es:
         one: 1 Comentario
         other: "%{count} Comentarios"
       login_to_comment: "Necesitas %{signin} o %{signup} para comentar."
-      edit_debate_link: Editar
+      edit_debate_link: "Editar debate"
       share: Compartir
       flag: "Este debate ha sido marcado como inapropiado por varios usuarios."
     edit:
@@ -208,7 +210,7 @@ es:
         one: 1 Comentario
         other: "%{count} Comentarios"
       login_to_comment: "Necesitas %{signin} o %{signup} para comentar."
-      edit_proposal_link: Editar
+      edit_proposal_link: "Editar propuesta"
       share: Compartir
       flag: "Esta propuesta ha sido marcada como inapropiada por varios usuarios."
     edit:

From f46a379d6c69b8e39e81aef99b4e95add3e7102c Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Fri, 9 Oct 2015 17:05:58 +0200
Subject: [PATCH 31/37] Updates tests

---
 spec/features/debates_spec.rb   | 2 +-
 spec/features/proposals_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index da67d2ff8..c633f1b2f 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -184,7 +184,7 @@ feature 'Debates' do
     expect(page).not_to have_link('click me')
     expect(page.html).to_not include "<script>alert('hey')</script>"
 
-    click_link 'Edit'
+    click_link 'Edit debate'
 
     expect(current_path).to eq edit_debate_path(Debate.last)
     expect(page).not_to have_link('click me')
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index ad5644747..7bb1146ec 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -253,7 +253,7 @@ feature 'Proposals' do
     expect(page).not_to have_link('click me')
     expect(page.html).to_not include "<script>alert('hey')</script>"
 
-    click_link 'Edit'
+    click_link 'Edit proposal'
 
     expect(current_path).to eq edit_proposal_path(Proposal.last)
     expect(page).not_to have_link('click me')

From 7758dca43edc8f14e0432841f3abee2c93bf17a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Sat, 10 Oct 2015 20:16:43 +0200
Subject: [PATCH 32/37] updates README

---
 README.md    | 4 +---
 README_EN.md | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 85cce257b..d9f01dfb1 100644
--- a/README.md
+++ b/README.md
@@ -11,9 +11,7 @@ Este es el repositorio de código abierto de la Aplicación de Participación Ci
 
 ## Estado del proyecto
 
-El desarrollo de esta aplicación comenzó el [15 de Julio de 2015](https://github.com/AyuntamientoMadrid/participacion/commit/8db36308379accd44b5de4f680a54c41a0cc6fc6)
-
-Este proyecto está en las primeras fases de su desarrollo. Las funcionalidades actualmente presentes en el código, así como sus nombres, deben considerarse como provisionales.
+El desarrollo de esta aplicación comenzó el [15 de Julio de 2015](https://github.com/AyuntamientoMadrid/participacion/commit/8db36308379accd44b5de4f680a54c41a0cc6fc6) y el código fue puesto en producción el día 7 de Septiembre de 2015 en [decide.madrid.es](https://decide.madrid.es). Desde entonces se le añaden mejoras y funcionalidades constantemente. La evolución y futura lista de funcionalidades a implementar se pueden consultar en la lista de [tareas por hacer](https://github.com/AyuntamientoMadrid/participacion/issues).
 
 ## Tecnología
 
diff --git a/README_EN.md b/README_EN.md
index d2d196799..a1ba149a4 100644
--- a/README_EN.md
+++ b/README_EN.md
@@ -11,9 +11,7 @@ This is the opensource code repository of Madrid City government eParticipation
 
 ## Current state
 
-Development started on [2015 July 15th](https://github.com/AyuntamientoMadrid/participacion/commit/8db36308379accd44b5de4f680a54c41a0cc6fc6)
-
-The project is in its early stages. Features currently present in the code (and their names) are subject to change.
+Development started on [2015 July 15th](https://github.com/AyuntamientoMadrid/participacion/commit/8db36308379accd44b5de4f680a54c41a0cc6fc6). Code was deployed to production on 2015 september 7th to [decide.madrid.es](https://decide.madrid.es). Since then new features are added often. You can take a look at a roadmap and future features in the [open issues list](https://github.com/AyuntamientoMadrid/participacion/issues).
 
 ## Tech stack
 

From 047cb1f0876946a48db827cf5d314bef8f379bdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Sun, 11 Oct 2015 11:54:42 +0200
Subject: [PATCH 33/37] updates dependencies

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index ec3f3930f..9e2b370c0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -72,7 +72,7 @@ group :development, :test do
   gem 'i18n-tasks'
   gem 'capistrano', '3.4.0',           require: false
   gem "capistrano-bundler", '1.1.4',   require: false
-  gem "capistrano-rails", '1.1.3',     require: false
+  gem "capistrano-rails", '1.1.4',     require: false
   gem "capistrano-rvm",                require: false
   gem 'capistrano3-delayed-job', '~> 1.0'
   gem "bullet"
diff --git a/Gemfile.lock b/Gemfile.lock
index 81789e0d3..ffbdf91e6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,7 +74,7 @@ GEM
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.9.0)
     byebug (6.0.2)
-    cancancan (1.13.0)
+    cancancan (1.13.1)
     capistrano (3.4.0)
       i18n
       rake (>= 10.0.0)
@@ -82,7 +82,7 @@ GEM
     capistrano-bundler (1.1.4)
       capistrano (~> 3.1)
       sshkit (~> 1.2)
-    capistrano-rails (1.1.3)
+    capistrano-rails (1.1.4)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
     capistrano-rvm (0.1.2)
@@ -97,7 +97,7 @@ GEM
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
     chronic (0.10.2)
-    ckeditor (4.1.3)
+    ckeditor (4.1.4)
       cocaine
       orm_adapter (~> 0.5.0)
     climate_control (0.0.3)
@@ -422,7 +422,7 @@ DEPENDENCIES
   cancancan
   capistrano (= 3.4.0)
   capistrano-bundler (= 1.1.4)
-  capistrano-rails (= 1.1.3)
+  capistrano-rails (= 1.1.4)
   capistrano-rvm
   capistrano3-delayed-job (~> 1.0)
   capybara

From 2069376c4f63d3cf1e936921468fe5eac6f27c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Mon, 12 Oct 2015 20:38:35 +0200
Subject: [PATCH 34/37] updates dependencies

---
 Gemfile.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ffbdf91e6..78af59ad9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -70,7 +70,7 @@ GEM
       debug_inspector (>= 0.0.1)
     browser (1.0.1)
     builder (3.2.2)
-    bullet (4.14.7)
+    bullet (4.14.9)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.9.0)
     byebug (6.0.2)
@@ -139,7 +139,7 @@ GEM
       devise (~> 3.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.24)
+    domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
     easy_translate (0.5.0)
       json
@@ -158,9 +158,9 @@ GEM
       railties (>= 3.0.0)
     faker (1.5.0)
       i18n (~> 0.5)
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    foundation-rails (5.5.2.1)
+    foundation-rails (5.5.3.2)
       railties (>= 3.1.0)
       sass (>= 3.3.0, < 3.5)
     foundation_rails_helper (1.0.0)
@@ -180,7 +180,7 @@ GEM
     gyoku (1.3.1)
       builder (>= 2.1.2)
     hashie (3.4.2)
-    highline (1.7.7)
+    highline (1.7.8)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     httpi (2.4.1)
@@ -332,7 +332,7 @@ GEM
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
     ruby-progressbar (1.7.5)
-    sass (3.4.18)
+    sass (3.4.19)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
@@ -355,7 +355,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     spring (1.4.0)
-    sprockets (3.3.5)
+    sprockets (3.4.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)
@@ -388,7 +388,7 @@ GEM
       rack
       raindrops (~> 0.7)
     uniform_notifier (1.9.0)
-    user_agent_parser (2.2.0)
+    user_agent_parser (2.3.0)
     uuidtools (2.1.5)
     warden (1.2.3)
       rack (>= 1.0)

From 2ca4557f2df6c10dc3d3ab1ddd79e704354932d0 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Tue, 13 Oct 2015 16:48:37 +0200
Subject: [PATCH 35/37] Improves accesibility

---
 app/assets/images/icon_home_debate.png        | Bin 0 -> 9067 bytes
 app/assets/images/icon_home_debate.svg        |  12 -----
 app/assets/images/icon_home_decide.png        | Bin 0 -> 4537 bytes
 app/assets/images/icon_home_decide.svg        |  10 ----
 app/assets/images/icon_home_do.png            | Bin 0 -> 6852 bytes
 app/assets/images/icon_home_done.svg          |  13 -----
 app/assets/images/icon_home_proposal.png      | Bin 0 -> 6937 bytes
 app/assets/images/icon_home_proposal.svg      |  10 ----
 app/assets/stylesheets/layout.scss            |  22 ++++++--
 app/views/devise/confirmations/new.html.erb   |   2 +-
 app/views/devise/passwords/new.html.erb       |   2 +-
 app/views/kaminari/_paginator.html.erb        |   2 +-
 app/views/layouts/_admin_header.html.erb      |   4 +-
 app/views/layouts/_footer.html.erb            |   8 ++-
 app/views/layouts/_header.html.erb            |  10 ++--
 app/views/layouts/devise.html.erb             |   2 +-
 .../organizations/registrations/new.html.erb  |   4 +-
 app/views/pages/conditions.html.erb           |   2 +-
 app/views/pages/more_information.html.erb     |  48 +++++++++---------
 app/views/pages/participation_facts.html.erb  |   2 +-
 app/views/pages/proposals_info.html.erb       |  12 ++---
 app/views/shared/_order_selector.html.erb     |   3 +-
 app/views/shared/_search_form_header.html.erb |   4 +-
 app/views/users/registrations/new.html.erb    |   2 +-
 app/views/welcome/highlights.html.erb         |   2 +
 app/views/welcome/index.html.erb              |   8 +--
 config/locales/en.yml                         |   2 +
 config/locales/es.yml                         |   2 +
 28 files changed, 88 insertions(+), 100 deletions(-)
 create mode 100644 app/assets/images/icon_home_debate.png
 delete mode 100644 app/assets/images/icon_home_debate.svg
 create mode 100644 app/assets/images/icon_home_decide.png
 delete mode 100644 app/assets/images/icon_home_decide.svg
 create mode 100644 app/assets/images/icon_home_do.png
 delete mode 100644 app/assets/images/icon_home_done.svg
 create mode 100644 app/assets/images/icon_home_proposal.png
 delete mode 100644 app/assets/images/icon_home_proposal.svg

diff --git a/app/assets/images/icon_home_debate.png b/app/assets/images/icon_home_debate.png
new file mode 100644
index 0000000000000000000000000000000000000000..77fc23ff06e06d6f455f6e669cec8f501d1af69b
GIT binary patch
literal 9067
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
G@c##8_JSY)

literal 0
HcmV?d00001

diff --git a/app/assets/images/icon_home_debate.svg b/app/assets/images/icon_home_debate.svg
deleted file mode 100644
index 01c932130..000000000
--- a/app/assets/images/icon_home_debate.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="168px" height="168px" viewBox="0 0 168 168" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3 (11970) - http://www.bohemiancoding.com/sketch -->
-    <title>Imported Layers</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="Imported-Layers" sketch:type="MSLayerGroup" transform="translate(21.000000, 35.000000)" fill="#0072AD">
-            <path d="M125.511254,31.9 C125.511254,21.994 121.075254,13.682 112.682254,7.864 C105.367254,2.793 95.5322542,0 84.9902542,0 C69.8922542,0 56.6642542,5.559 49.3292542,14.922 C46.1232542,14.367 42.8152542,14.086 39.4782542,14.086 C31.0882542,14.086 23.1392542,15.861 17.0972542,19.086 C7.8942542,24 -2.0127458,34.63 0.355254197,48.423 C2.8542542,62.974 16.6182542,71.008 28.3212542,73.706 C26.9222542,82.031 20.5142542,87.966 14.3362542,92.71 L9.9652542,96.064 L15.4712542,95.883 C30.3132542,95.4 43.9332542,86.192 47.7262542,74.266 C57.0442542,72.708 65.7892542,68.271 71.5262542,62.197 C72.4532542,62.441 73.3832542,62.655 74.3022542,62.835 C76.0072542,63.167 77.7572542,63.416 79.5172542,63.577 C84.0742542,73.088 95.3592542,80.942 104.710254,80.944 L104.711254,80.944 C106.881254,80.944 108.879254,80.519 110.645254,79.679 L113.825254,78.169 L110.717254,76.516 C104.688254,73.309 100.529254,68.546 98.0472542,61.993 C111.620254,58.224 125.511254,47.525 125.511254,31.9 L125.511254,31.9 Z M50.8742542,18.833 C51.6552542,19.002 52.4082542,19.199 53.1562542,19.4 L48.0952542,24.461 C48.7872542,22.478 49.7142542,20.592 50.8742542,18.833 L50.8742542,18.833 Z M63.3282542,55.228 L75.3252542,43.23 C75.3412542,43.597 75.3752542,43.956 75.3752542,44.328 C75.3752542,45.44 75.2792542,46.527 75.1162542,47.6 L66.1382542,56.578 C65.1822542,56.162 64.2452542,55.71 63.3282542,55.228 L63.3282542,55.228 Z M58.8732542,52.518 L74.2782542,37.11 C74.6222542,38.202 74.8802542,39.331 75.0592542,40.49 L61.3992542,54.151 C60.5312542,53.636 59.6882542,53.09 58.8732542,52.518 L58.8732542,52.518 Z M57.1562542,51.228 C56.3802542,50.612 55.6342542,49.969 54.9252542,49.298 L72.0372542,32.188 C72.5732542,33.069 73.0492542,33.981 73.4602542,34.924 L57.1562542,51.228 L57.1562542,51.228 Z M53.4302542,47.789 C52.7552542,47.06 52.1222542,46.305 51.5342542,45.524 L68.9312542,28.127 C69.6212542,28.849 70.2402542,29.612 70.8242542,30.395 L53.4302542,47.789 L53.4302542,47.789 Z M50.3032542,43.751 C49.7532542,42.88 49.2602542,41.984 48.8282542,41.064 L65.0732542,24.819 C65.8912542,25.402 66.6672542,26.015 67.3942542,26.659 L50.3032542,43.751 L50.3032542,43.751 Z M47.9552542,38.931 C47.5822542,37.863 47.2832542,36.768 47.0832542,35.645 L60.5722542,22.155 C61.5072542,22.615 62.4142542,23.097 63.2682542,23.619 L47.9552542,38.931 L47.9552542,38.931 Z M46.7852542,32.937 C46.7202542,31.494 46.8112542,30.013 47.0602542,28.502 L55.4682542,20.094 C56.5162542,20.437 57.5352542,20.805 58.5092542,21.211 L46.7852542,32.937 L46.7852542,32.937 Z M46.0932542,70.934 L44.9262542,71.099 L44.6282542,72.239 C42.1542542,81.68 32.5512542,89.38 21.1652542,91.669 C26.6082542,86.773 31.3162542,80.681 32.0492542,72.467 L32.1922542,70.873 L30.6172542,70.571 C18.8492542,68.317 6.0072542,60.409 3.8462542,47.824 C1.7972542,35.891 10.6022542,26.569 18.7652542,22.211 C24.3032542,19.255 31.6592542,17.627 39.4782542,17.627 C42.0582542,17.627 44.6192542,17.807 47.1212542,18.161 C45.7972542,20.414 44.7862542,22.829 44.1082542,25.37 C41.8682542,33.744 43.8012542,41.878 49.6972542,48.896 C54.0712542,54.102 60.5272542,58.422 67.7072542,61.006 C62.2772542,66.113 54.4022542,69.759 46.0932542,70.934 L46.0932542,70.934 Z M70.3492542,58.166 C69.6532542,57.943 68.9642542,57.699 68.2792542,57.442 L74.1012542,51.621 C73.2622542,53.92 72.0102542,56.107 70.3492542,58.166 L70.3492542,58.166 Z M95.3432542,59.025 L93.4702542,59.457 L94.0532542,61.289 C96.2602542,68.225 99.9882542,73.525 105.393254,77.383 C105.169254,77.396 104.941254,77.401 104.711254,77.401 L104.710254,77.401 C96.5962542,77.4 85.9302542,69.681 82.3312542,61.204 L81.9072542,60.207 L80.8262542,60.13 C78.8532542,59.989 76.8862542,59.73 74.9802542,59.358 C74.6692542,59.296 74.3592542,59.232 74.0452542,59.164 C77.2802542,54.696 78.9172542,49.717 78.9172542,44.328 C78.9172542,30.313 69.3872542,19.787 53.2592542,15.752 C60.0892542,8.164 71.9502542,3.543 84.9902542,3.543 C102.801254,3.543 121.969254,12.417 121.969254,31.9 C121.969254,46.322 108.167254,56.071 95.3432542,59.025 L95.3432542,59.025 Z" sketch:type="MSShapeGroup"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/app/assets/images/icon_home_decide.png b/app/assets/images/icon_home_decide.png
new file mode 100644
index 0000000000000000000000000000000000000000..93f4c516a1f43e4ee86c6314e687cd6659d204b3
GIT binary patch
literal 4537
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

literal 0
HcmV?d00001

diff --git a/app/assets/images/icon_home_decide.svg b/app/assets/images/icon_home_decide.svg
deleted file mode 100644
index 13fe845a9..000000000
--- a/app/assets/images/icon_home_decide.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="168px" height="168px" viewBox="0 0 168 168" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3 (11970) - http://www.bohemiancoding.com/sketch -->
-    <title>Imported Layers</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <path d="M114.216871,68.813 C112.382871,68.813 110.689871,69.427 109.329871,70.457 C108.210871,67.324 105.214871,65.077 101.701871,65.077 C99.7538708,65.077 97.9638708,65.769 96.5658708,66.919 C95.2908708,64.115 92.4638708,62.16 89.1888708,62.16 C87.5608708,62.16 86.0428708,62.643 84.7718708,63.473 L84.7718708,42.097 C84.7718708,37.633 81.1388708,34 76.6728708,34 C72.2078708,34 68.5758708,37.633 68.5758708,42.097 L68.5758708,81.363 C64.9708708,78.804 60.0988708,77.516 56.2828708,77.737 C48.0188708,78.215 44.6738708,84.626 45.0248708,90.771 L45.0978708,92.05 L46.3228708,92.425 C47.6398708,92.827 49.0678708,93.076 50.5788708,93.339 C55.1588708,94.136 59.8958708,94.959 62.5868708,100.123 C67.0048708,108.604 71.8968708,114.061 78.7838708,118.136 L76.4248708,133.597 L80.0638708,134.152 L82.8048708,116.177 L81.6838708,115.556 C74.7898708,111.74 70.2028708,106.776 65.8508708,98.423 C62.3178708,91.645 56.1588708,90.574 51.2088708,89.714 C50.3328708,89.561 49.4888708,89.414 48.7088708,89.243 C48.8808708,86.665 50.0628708,81.782 56.4948708,81.411 C60.4368708,81.191 66.0408708,83.101 68.5758708,86.347 L68.5758708,93.395 L72.2558708,93.395 L72.2558708,42.097 C72.2558708,39.661 74.2388708,37.68 76.6728708,37.68 C79.1098708,37.68 81.0918708,39.661 81.0918708,42.097 L81.0918708,75.383 L84.7718708,75.383 L84.7718708,70.258 C84.7718708,67.821 86.7528708,65.84 89.1888708,65.84 C91.6238708,65.84 93.6058708,67.821 93.6058708,70.258 L93.6058708,78.301 L97.2848708,78.301 L97.2848708,73.174 C97.2848708,70.738 99.2668708,68.756 101.701871,68.756 C104.137871,68.756 106.118871,70.738 106.118871,73.174 L106.118871,82.036 L109.798871,82.036 L109.798871,76.91 C109.798871,74.474 111.780871,72.493 114.216871,72.493 C116.652871,72.493 118.633871,74.474 118.633871,76.91 L118.633871,86.225 C118.633871,86.681 118.617871,87.153 118.602871,87.622 C118.249871,90.912 117.125871,95.05 113.627871,96.519 C109.960871,98.059 108.856871,101.293 108.000871,104.449 C107.395871,106.681 107.858871,109.064 107.547871,111.355 C107.395871,112.469 107.043871,113.639 106.458871,114.536 C105.913871,114.892 105.352871,115.23 104.764871,115.532 L103.475871,116.194 L107.807871,134.029 L111.383871,133.159 L107.723871,118.095 C118.462871,111.655 122.313871,97.074 122.313871,86.225 L122.313871,76.91 C122.313871,72.446 118.681871,68.813 114.216871,68.813" id="Imported-Layers" fill="#00A14C" sketch:type="MSShapeGroup"></path>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/app/assets/images/icon_home_do.png b/app/assets/images/icon_home_do.png
new file mode 100644
index 0000000000000000000000000000000000000000..3dc0897060c5e973617a7afa574ad90bc425708a
GIT binary patch
literal 6852
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
QtEB*nvLKlnDWjnO10bf@$p8QV

literal 0
HcmV?d00001

diff --git a/app/assets/images/icon_home_done.svg b/app/assets/images/icon_home_done.svg
deleted file mode 100644
index 7a39b8106..000000000
--- a/app/assets/images/icon_home_done.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="168px" height="168px" viewBox="0 0 168 168" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3 (11970) - http://www.bohemiancoding.com/sketch -->
-    <title>Imported Layers</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="Imported-Layers" sketch:type="MSLayerGroup" transform="translate(37.000000, 42.000000)" fill="#1A1918">
-            <path d="M70.681,36.003 C77.815,27.909 85.818,20.678 93.588,13.215 C99.095,7.925 93.841,0.263 87.899,0.263 C86.178,0.263 84.4,0.905 82.808,2.434 C74.512,10.403 66.045,18.153 58.482,26.843 C53.751,32.279 49.383,38.056 45.382,44.048 C43.843,46.353 42.394,48.715 41,51.11 C39.493,49.112 37.986,47.114 36.477,45.117 C34.017,41.862 31.556,38.607 29.065,35.376 C26.79,32.427 24.331,28.542 20.343,28.541 C19.637,28.541 18.884,28.663 18.075,28.932 C11.554,31.107 11.587,39.022 15.427,42.454 C15.563,42.637 15.695,42.821 15.825,42.986 C15.988,43.192 16.148,43.4 16.309,43.607 C16.537,43.904 17.337,44.94 17.53,45.193 C20.072,48.515 22.591,51.855 25.111,55.193 C27.547,58.42 29.98,61.651 32.42,64.875 C33.806,66.708 35.126,68.921 36.762,70.516 C38.257,71.974 40.162,72.636 42.049,72.636 C45.223,72.636 48.349,70.765 49.401,67.659 C55.161,56.222 62.205,45.618 70.681,36.003" id="Fill-1" sketch:type="MSShapeGroup"></path>
-            <path d="M72.969,38.019 C72.778,38.235 72.596,38.461 72.407,38.679 C72.938,41.118 73.218,43.614 73.218,46.138 C73.218,65.368 57.572,81.013 38.342,81.013 C19.111,81.013 3.467,65.368 3.467,46.138 C3.467,26.907 19.111,11.262 38.342,11.262 C46.666,11.262 54.644,14.215 60.95,19.591 C61.736,18.759 62.528,17.935 63.325,17.117 C56.375,11.128 47.552,7.836 38.342,7.836 C17.222,7.836 0.039,25.018 0.039,46.138 C0.039,67.258 17.222,84.44 38.342,84.44 C59.462,84.44 76.645,67.258 76.645,46.138 C76.645,42.551 76.129,39.013 75.153,35.599 C74.415,36.399 73.685,37.206 72.969,38.019" id="Fill-2" sketch:type="MSShapeGroup"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/app/assets/images/icon_home_proposal.png b/app/assets/images/icon_home_proposal.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcf3c3825ee90523c15da1bcf0ad531556abc6d4
GIT binary patch
literal 6937
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

literal 0
HcmV?d00001

diff --git a/app/assets/images/icon_home_proposal.svg b/app/assets/images/icon_home_proposal.svg
deleted file mode 100644
index 0ed3f28eb..000000000
--- a/app/assets/images/icon_home_proposal.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="168px" height="168px" viewBox="0 0 168 168" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3 (11970) - http://www.bohemiancoding.com/sketch -->
-    <title>Imported Layers</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <path d="M83.7019521,31 C66.7919521,31 53.3089521,44.238 53.0049521,61.138 C52.8259521,71.087 57.5089521,80.548 65.5349521,86.446 C68.2559521,88.446 69.8799521,91.664 69.8799521,95.053 L69.8799521,99.237 C69.8799521,100.61 70.3489521,101.873 71.1279521,102.886 C69.9239521,103.842 69.1349521,105.301 69.1349521,106.954 C69.1349521,108.255 69.6139521,109.446 70.4039521,110.361 C69.6139521,111.275 69.1349521,112.466 69.1349521,113.766 C69.1349521,115.067 69.6129521,116.257 70.4029521,117.172 C69.6129521,118.087 69.1349521,119.277 69.1349521,120.577 C69.1349521,123.319 71.2679521,125.549 73.9589521,125.755 L74.7749521,131.146 L92.6299521,131.146 L93.4459521,125.755 C96.1359521,125.55 98.2699521,123.32 98.2699521,120.577 C98.2699521,119.277 97.7919521,118.087 97.0019521,117.172 C97.7919521,116.257 98.2699521,115.067 98.2699521,113.766 C98.2699521,112.466 97.7909521,111.275 97.0009521,110.361 C97.7909521,109.446 98.2699521,108.255 98.2699521,106.954 C98.2699521,105.301 97.4809521,103.842 96.2769521,102.885 C97.0559521,101.873 97.5249521,100.61 97.5249521,99.237 L97.5249521,95.055 C97.5249521,91.683 99.1889521,88.435 101.976952,86.367 C109.758952,80.595 114.404952,71.375 114.404952,61.702 C114.404952,44.773 100.631952,31 83.7019521,31 L83.7019521,31 Z M83.7019521,60.623 C85.9319521,60.623 87.6609521,58.153 87.6609521,56.027 C87.6609521,53.889 86.8459521,51.938 85.5089521,50.468 C86.2729521,50.123 87.1209521,49.93 88.0119521,49.93 C91.5449521,49.93 94.1089521,52.494 94.1089521,56.027 C94.1089521,60.621 91.0709521,65.06 87.5539521,70.201 C86.2759521,72.07 84.9499521,74.007 83.7019521,76.054 C82.4539521,74.007 81.1289521,72.07 79.8499521,70.201 C76.3339521,65.06 73.2969521,60.621 73.2969521,56.027 C73.2969521,52.494 75.8599521,49.93 79.3929521,49.93 C80.2839521,49.93 81.1309521,50.123 81.8949521,50.468 C80.5579521,51.937 79.7419521,53.889 79.7419521,56.027 C79.7419521,58.153 81.4719521,60.623 83.7019521,60.623 L83.7019521,60.623 Z M81.9149521,56.027 C81.9149521,54.346 82.5989521,52.823 83.7019521,51.719 C84.8049521,52.823 85.4879521,54.346 85.4879521,56.027 C85.4879521,57.063 84.6049521,58.45 83.7019521,58.45 C82.7979521,58.45 81.9149521,57.063 81.9149521,56.027 L81.9149521,56.027 Z M87.4779521,93.923 L79.9259521,93.923 C80.1219521,88.864 81.6459521,84.451 83.7019521,80.476 C85.7579521,84.451 87.2819521,88.864 87.4779521,93.923 L87.4779521,93.923 Z M77.5859521,96.095 L89.8179521,96.095 L89.8179521,101.737 L77.5859521,101.737 L77.5859521,96.095 Z M77.4899521,127.989 L77.1579521,125.795 L90.2459521,125.795 L89.9139521,127.989 L77.4899521,127.989 L77.4899521,127.989 Z M93.0519521,122.173 L74.3529521,122.173 C73.4729521,122.173 72.7569521,121.457 72.7569521,120.577 C72.7569521,119.698 73.4729521,118.984 74.3529521,118.984 L93.0519521,118.984 C93.9319521,118.984 94.6479521,119.698 94.6479521,120.577 C94.6479521,121.457 93.9319521,122.173 93.0519521,122.173 L93.0519521,122.173 Z M93.0519521,115.361 L74.3529521,115.361 C73.4729521,115.361 72.7569521,114.646 72.7569521,113.766 C72.7569521,112.887 73.4729521,112.172 74.3529521,112.172 L93.0519521,112.172 C93.9319521,112.172 94.6479521,112.887 94.6479521,113.766 C94.6479521,114.646 93.9319521,115.361 93.0519521,115.361 L93.0519521,115.361 Z M93.0519521,108.549 L74.3529521,108.549 C73.4729521,108.549 72.7569521,107.834 72.7569521,106.954 C72.7569521,106.075 73.4729521,105.36 74.3529521,105.36 L93.0519521,105.36 C93.9319521,105.36 94.6479521,106.075 94.6479521,106.954 C94.6479521,107.834 93.9319521,108.549 93.0519521,108.549 L93.0519521,108.549 Z M99.9639521,83.653 C96.3199521,86.355 94.1459521,90.618 94.1459521,95.055 L94.1459521,99.237 C94.1459521,100.421 93.3519521,101.413 92.2719521,101.737 L91.9909521,101.737 L91.9909521,93.923 L89.6479521,93.923 C89.4329521,87.865 87.4789521,82.746 84.9559521,78.201 C86.3489521,75.812 87.8809521,73.572 89.3479521,71.428 C92.9129521,66.216 96.2809521,61.293 96.2809521,56.027 C96.2809521,51.313 92.7259521,47.757 88.0119521,47.757 C86.4339521,47.757 84.9579521,48.202 83.7019521,48.971 C82.4459521,48.202 80.9709521,47.757 79.3929521,47.757 C74.6789521,47.757 71.1239521,51.313 71.1239521,56.027 C71.1239521,61.293 74.4909521,66.216 78.0569521,71.428 C79.5239521,73.572 81.0559521,75.812 82.4489521,78.201 C79.9249521,82.746 77.9709521,87.865 77.7559521,93.923 L75.4129521,93.923 L75.4129521,101.737 L75.1329521,101.737 C74.0529521,101.413 73.2589521,100.421 73.2589521,99.237 L73.2589521,95.053 C73.2589521,90.593 71.1189521,86.358 67.5359521,83.724 C60.3929521,78.474 56.2239521,70.053 56.3839521,61.198 C56.6529521,46.159 68.6529521,34.379 83.7019521,34.379 C98.7689521,34.379 111.025952,46.636 111.025952,61.702 C111.025952,70.438 106.993952,78.439 99.9639521,83.653 L99.9639521,83.653 Z" id="Imported-Layers" fill="#D82331" sketch:type="MSShapeGroup"></path>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index f41831dcf..1afa5cea2 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -19,6 +19,7 @@
 // 17. Verification
 // 18. Comments
 // 19. Flags
+// 20. Accesibility
 //
 
 // 01. Variables
@@ -310,10 +311,11 @@ header {
     padding: 0;
   }
 
-  p {
+  h2 {
     color: white;
     font-size: rem-calc(16);
-    line-height:  rem-calc(30);
+    font-weight: normal;
+    line-height: rem-calc(30);
   }
 
   .button {
@@ -1642,7 +1644,7 @@ table {
           font-family: "icons" !important;
           position: absolute;
           right: 0;
-          top: rem-calc(6);
+          top: rem-calc(12);
 
           @media (min-width: $small-breakpoint) {
             content: 'c';
@@ -1932,3 +1934,17 @@ table {
 .flag-active {
   color: $delete;
 }
+
+// 20. Accesibility
+// - - - - - - - - - - - - - - - - - - - - - - - - -
+
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  border: 0;
+}
\ No newline at end of file
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
index 722609134..818cd962b 100644
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@@ -1,5 +1,5 @@
 <% provide :title do %><%= t("devise_views.confirmations.title") %><% end %>
-<h1 class="text-center"><%= t("devise_views.confirmations.title") %></h1>
+<h2 class="text-center"><%= t("devise_views.confirmations.title") %></h2>
 
 <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
   <%= render 'shared/errors', resource: resource %>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index c82774991..5f381555a 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -1,5 +1,5 @@
 <% provide :title do %><%= t("devise_views.passwords.new.title") %><% end %>
-<h1 class="text-center"><%= t("devise_views.passwords.new.title") %></h1>
+<h2 class="text-center"><%= t("devise_views.passwords.new.title") %></h2>
 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
   <%= render 'shared/errors', resource: resource %>
 
diff --git a/app/views/kaminari/_paginator.html.erb b/app/views/kaminari/_paginator.html.erb
index 6e15a545d..9e7c906cd 100644
--- a/app/views/kaminari/_paginator.html.erb
+++ b/app/views/kaminari/_paginator.html.erb
@@ -1,6 +1,6 @@
 <%= paginator.render do -%>
   <div class="pagination-centered">
-    <nav role="navigation">
+    <nav>
       <ul class="pagination">
         <%= first_page_tag unless current_page.first? %>
         <%= prev_page_tag unless current_page.first? %>
diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb
index f5d7def4c..49508a4d5 100644
--- a/app/views/layouts/_admin_header.html.erb
+++ b/app/views/layouts/_admin_header.html.erb
@@ -6,11 +6,11 @@
   </section>
 
   <div class="contain-to-grid clear">
-    <nav class="top-bar" data-topbar role="navigation">
+    <nav class="top-bar" data-topbar>
       <ul class="title-area">
         <li class="name">
           <%= link_to root_path do %>
-            <%= image_tag('header_logo_madrid.png', class: 'left', size: '96x96') %>
+            <%= image_tag('header_logo_madrid.png', class: 'left', size: '96x96', alt: t("layouts.header.logo")) %>
             <%= t("layouts.header.open_gov", open: "<strong>#{t('layouts.header.open')}</strong>").html_safe %> <span>|</span> <span class="logo-site"><%= t("admin.dashboard.index.title") %></span>
           <% end %>
         </li>
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 9a3ae7b7d..452848241 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -3,9 +3,9 @@
 		<div class="row">
 
       <div class="small-12 large-4 column">
-        <div class="logo">
+        <h3 class="logo">
           <%= link_to t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %>
-        </div>
+        </h3>
 
         <p>
           <%= t("layouts.footer.description",
@@ -52,15 +52,19 @@
 
       <div class="small-12 medium-2 column social">
         <%= link_to "https://twitter.com/abriendomadrid", target: "_blank", title: t("social.twitter") do %>
+          <span class="sr-only"><%= t("social.twitter") %></span>
           <i class="icon-twitter"></i>
         <% end %>
         <%= link_to "https://www.facebook.com/Abriendo-Madrid-1475577616080350/", target: "_blank", title: t("social.facebook") do %>
+          <span class="sr-only"><%= t("social.facebook") %></span>
           <i class="icon-facebook"></i>
         <% end %>
         <%= link_to "/blog", target: "_blank", title: t("social.blog") do %>
+          <span class="sr-only"><%= t("social.blog") %></span>
           <i class="icon-blog"></i>
         <% end %>
         <%= link_to "https://www.youtube.com/channel/UCFmaChI9quIY7lwHplnacfg", target: "_blank", title: t("social.youtube") do %>
+          <span class="sr-only"><%= t("social.youtube") %></span>
           <i class="icon-youtube"></i>
         <% end %>
       </div>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 47184f61c..2cb65d162 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -9,15 +9,19 @@
           &nbsp;|&nbsp;
           <div class="social inline-block">
             <%= link_to "https://twitter.com/abriendomadrid", target: "_blank", title: t("social.twitter") do %>
+              <span class="sr-only"><%= t("social.twitter") %></span>
               <i class="icon-twitter"></i>
             <% end %>
             <%= link_to "https://www.facebook.com/Abriendo-Madrid-1475577616080350/", target: "_blank", title: t("social.facebook") do %>
+              <span class="sr-only"><%= t("social.facebook") %></span>
               <i class="icon-facebook"></i>
             <% end %>
             <%= link_to "/blog", target: "_blank", title: t("social.blog") do %>
+              <span class="sr-only"><%= t("social.blog") %></span>
               <i class="icon-blog"></i>
             <% end %>
             <%= link_to "https://www.youtube.com/channel/UCFmaChI9quIY7lwHplnacfg", target: "_blank", title: t("social.youtube") do %>
+              <span class="sr-only"><%= t("social.youtube") %></span>
               <i class="icon-youtube"></i>
             <% end %>
           </div>
@@ -26,12 +30,12 @@
   </section>
 
   <div class="contain-to-grid clear">
-    <nav class="top-bar" data-topbar role="navigation">
+    <nav class="top-bar" data-topbar>
       <ul class="title-area">
         <li class="toggle-topbar menu-icon"><a href="#"><span><%= t("application.menu")%></span></a></li>
         <li class="name">
           <%= link_to root_path do %>
-            <%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up left', size: '96x96') %>
+            <%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up left', size: '96x96', alt: t("layouts.header.logo")) %>
             <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %> <span>|</span>
             <span class="logo-site">
               <% if transparency_page? %>
@@ -75,7 +79,7 @@
     <div class="row home-page">
       <div class="small-12 medium-7 column">
         <h1><%= t("layouts.header.open_city_title") %></h1>
-        <p><%= t("layouts.header.open_city_slogan_html") %></p>
+        <h2><%= t("layouts.header.open_city_slogan_html") %></h2>
         <%= link_to t("layouts.header.see_all"), proposals_path, class: "button radius see-more warning" %>
         <%= link_to t("layouts.header.more_information"), "/more_information", class: "more-info" %>
       </div>
diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb
index a2a79796f..2b8f1cecd 100644
--- a/app/views/layouts/devise.html.erb
+++ b/app/views/layouts/devise.html.erb
@@ -18,7 +18,7 @@
         <div class="small-12 medium-8 large-5 column small-centered">
           <h1>
             <%= link_to root_path do %>
-              <%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up left', size: '96x96') %>
+              <%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up left', size: '96x96', alt: t("layouts.header.logo")) %>
               <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %>
             <% end %>
           </h1>
diff --git a/app/views/organizations/registrations/new.html.erb b/app/views/organizations/registrations/new.html.erb
index aa340bd24..c013023d7 100644
--- a/app/views/organizations/registrations/new.html.erb
+++ b/app/views/organizations/registrations/new.html.erb
@@ -8,9 +8,9 @@
 
       <%= f.fields_for :organization do |fo| %>
         <%= fo.text_field :name, autofocus: true, maxlength: Organization.name_max_length, placeholder: t("devise_views.organizations.registrations.new.organization_name_label") %>
-        <%= fo.label t("devise_views.organizations.registrations.new.responsible_name_label") %>
+        <%= fo.label :responsible_name %>
         <p class="note"><%= t("devise_views.organizations.registrations.new.responsible_name_note") %></p>
-        <%= fo.text_field :responsible_name, maxlength: Organization.responsible_name_max_length, label: false %>
+        <%= fo.text_field :responsible_name, placeholder: t("devise_views.organizations.registrations.new.responsible_name_label"), maxlength: Organization.responsible_name_max_length, label: false %>
       <% end %>
 
       <%= f.email_field :email, placeholder: t("devise_views.organizations.registrations.new.email_label") %>
diff --git a/app/views/pages/conditions.html.erb b/app/views/pages/conditions.html.erb
index df0436a4c..81245849e 100644
--- a/app/views/pages/conditions.html.erb
+++ b/app/views/pages/conditions.html.erb
@@ -82,7 +82,7 @@
         <li>B. Protección de datos: Los datos personales aportados por los usuarios que se registren en el Portal de Gobierno Abierto, serán incorporados y tratados en el fichero Gestión de Procesos Participativos, cuya finalidad es gestionar los procesos participativos para el control de la habilitación de las personas que participan en los mismos y recuento meramente numérico y estadístico de los resultados derivados de los procesos de participación ciudadana. Gestión de Agendas para convocatorias y envío de información solicitada. El órgano responsable del fichero es la Dirección General competente en materia de Participación Ciudadana, ante la que la persona interesada podrá ejercer los derechos de acceso, rectificación, cancelación y oposición, todo lo cual se informa en cumplimiento del artículo 5 de la Ley Orgánica 15/1999, de 13 de diciembre, de Protección de Datos de Carácter Personal.</li>
       </ul>
 
-      <p>Como principio general, los datos personales no serán comunicados a terceros, excepto cuando la comunicación haya sido autorizada por el usuario, o la información sea requerida por la autoridad judicial, ministerio fiscal o la policía judicial, o se de alguno de los supuestos regulados en el artículo 11 de la Ley Orgánica 15/1999, de 13 de diciembre, de Protección de Datos de Carácter Personal.<p>
+      <p>Como principio general, los datos personales no serán comunicados a terceros, excepto cuando la comunicación haya sido autorizada por el usuario, o la información sea requerida por la autoridad judicial, ministerio fiscal o la policía judicial, o se de alguno de los supuestos regulados en el artículo 11 de la Ley Orgánica 15/1999, de 13 de diciembre, de Protección de Datos de Carácter Personal.</p>
       <ul>
         <li>Los derechos de acceso, rectificación, cancelación y oposición, se podrán ejercitar dirigiendo una comunicación por escrito al Ayuntamiento de Madrid, Área de Gobierno de Participación Ciudadana, Transparencia y Gobierno Abierto, Dirección General de Participación Ciudadana.</li>
       </ul>
diff --git a/app/views/pages/more_information.html.erb b/app/views/pages/more_information.html.erb
index d935484f0..c80693b58 100644
--- a/app/views/pages/more_information.html.erb
+++ b/app/views/pages/more_information.html.erb
@@ -4,42 +4,42 @@
     <div class="more-information text small-12 medium-8 column">
       <h1>Más información</h1>
       <ul>
-        <a href="/how_it_works">
-          <li>
+        <li>
+          <a href="/how_it_works">
             ¿Cómo funciona este Portal de Gobierno Abierto?
             <span>Descubre todo lo que puedes hacer en esta web</span>
-          </li>
-        </a>
-        <a href="/how_to_use">
-          <li>
+          </a>
+        </li>
+        <li>
+          <a href="/how_to_use">
             Utilízalo en tu municipio
             <span>Utilízalo libremente o ayúdanos a mejorarlo, es software libre</span>
-          </li>
-        </a>
-        <a href="/participation">
-          <li>
+          </a>
+        </li>
+        <li>
+          <a href="/participation">
             Participación y Transparencia en Madrid - Próximas novedades
             <span>Participación Ciudadana, Transparencia y Gobierno Abierto</span>
-          </li>
-        </a>
-        <a href="/proposals_info">
-          <li>
+          </a>
+        </li>
+        <li>
+          <a href="/proposals_info">
             ¿Cómo funcionan las propuestas ciudadanas?
             <span>Crea tus propias propuestas</span>
-          </li>
-        </a>
-        <a href="/participation_world">
-          <li>
+          </a>
+        </li>
+        <li>
+          <a href="/participation_world">
             Participación ciudadana directa en el mundo
             <span>Sistemas de participación ciudadana que ya existen en el mundo</span>
-          </li>
-        </a>
-        <a href="/participation_facts">
-          <li>
+          </a>
+        </li>
+        <li>
+          <a href="/participation_facts">
             Hechos sobre participación ciudadana y democracia directa
             <span>Para perderle el miedo</span>
-          </li>
-        </a>
+          </a>
+        </li>
       </ul>
 
       <p>Si tienes problemas con la web <a href="mailto:web.gobiernoabierto@madrid.es">contacta con el servicio técnico</a>.</p>
diff --git a/app/views/pages/participation_facts.html.erb b/app/views/pages/participation_facts.html.erb
index 2451085d4..12f69d02b 100644
--- a/app/views/pages/participation_facts.html.erb
+++ b/app/views/pages/participation_facts.html.erb
@@ -8,7 +8,7 @@
 
       <div class="small-12 medium-9">
         <div class="flex-video">
-          <iframe width="560" height="315" src="https://www.youtube.com/embed/s_asCv_nkX0?list=PLhnvwI6F9eqUk7l8_sIVcPz7DjvE27hfS" frameborder="0" allowfullscreen></iframe>
+          <iframe width="560" height="315" src="https://www.youtube.com/embed/s_asCv_nkX0?list=PLhnvwI6F9eqUk7l8_sIVcPz7DjvE27hfS" frameborder="0" allowfullscreen title="Vídeos del canal de YouTube de Abriendo Madrid"></iframe>
         </div>
       </div>
 
diff --git a/app/views/pages/proposals_info.html.erb b/app/views/pages/proposals_info.html.erb
index 05ae0b7c3..dbaaf0002 100644
--- a/app/views/pages/proposals_info.html.erb
+++ b/app/views/pages/proposals_info.html.erb
@@ -28,7 +28,7 @@
       <p>Además no hace falta ni que tengas Internet, todos los pasos se pueden hacer en cualquiera de las <a href="http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD" target="_blank">26 Oficinas de Atención al Ciudadano</a> que hay por todo Madrid.</p>
 
       <div class="flex-video">
-        <iframe width="560" height="315" src="https://www.youtube.com/embed/videoseries?list=PLhnvwI6F9eqWqN8vyiZtfpV8SO11ague2" frameborder="0" allowfullscreen></iframe>
+        <iframe width="560" height="315" src="https://www.youtube.com/embed/videoseries?list=PLhnvwI6F9eqWqN8vyiZtfpV8SO11ague2" frameborder="0" allowfullscreen title="Vídeos del canal de YouTube de Abriendo Madrid"></iframe>
       </div>
 
       <h2 id="i">Explicación detallada del proceso</h2>
@@ -39,11 +39,11 @@
         <li><strong>Realización de las propuestas</strong>. En caso de que haya más gente a favor de una propuesta que rechazándola se aceptará como propuesta colectiva de la ciudadanía de Madrid, y el gobierno del Ayuntamiento de Madrid la asumirá como propia y la llevará a cabo.  Para ello en un plazo máximo de un mes, se realizarán los informes técnicos correspondientes sobre su legalidad, viabilidad y coste económico,  teniendo en cuenta a los sectores afectados y a la persona que haya lanzado la propuesta, para detallar la actuación correspondiente por parte del Ayuntamiento. Se publicarán en la web todos los informes realizados, y un seguimiento de las actuaciones que se lleven a cabo, para asegurar un correcto desarrollo de la propuesta.</li>
       </ol>
 
-      <p>Todas las acciones relacionadas con el proceso de propuestas ciudadanas pueden realizarse a través del portal de gobierno abierto, o presencialmente en cualquiera de las 26 Oficinas de Atención al Ciudadano existentes en Madrid. <a href="http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD" target="_blank">Ver la lista completa de oficinas y su ubicación</a>.</p>
+      <p>Todas las acciones relacionadas con el proceso de propuestas ciudadanas pueden realizarse a través del portal de gobierno abierto, o presencialmente en cualquiera de las <a href="http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD" target="_blank">26 Oficinas de Atención al Ciudadano</a> existentes en Madrid.</p>
 
-      <p>El proceso de recogida de apoyos de una propuesta puede realizarse también a través de hojas de firmas, cuyo modelo puede ser <a href="/docs/formulario_propuestas_ciudadanas.pdf" target="_blank">descargado en este enlace</a>. Los apoyos recogidos de esta manera se sumarán a los apoyos ya existentes en el portal de gobierno abierto. Las hojas pueden ser entregadas en cualquiera de los Registros del Ayuntamiento, presentes en cada una de las Juntas de Distrito. <a href="http://www.madrid.es/portales/munimadrid/es/Inicio/Ayuntamiento/Oposiciones-y-Empleo/Direcciones-y-telefonos/Oficinas-de-Registro-del-Ayuntamiento-de-Madrid?vgnextfmt=default&vgnextoid=adedb88db777f010VgnVCM2000000c205a0aRCRD&vgnextchannel=ddc3ca1c5a057010VgnVCM100000dc0ca8c0RCRD" target="_blank">Ver la lista completa de Oficinas de Registro</a>.</p>
+      <p>El proceso de recogida de apoyos de una propuesta puede realizarse también a través de hojas de firmas, cuyo modelo puede ser <a href="/docs/formulario_propuestas_ciudadanas.pdf" target="_blank">descargado en este documento PDF</a>. Los apoyos recogidos de esta manera se sumarán a los apoyos ya existentes en el portal de gobierno abierto. Las hojas pueden ser entregadas en cualquiera de los Registros del Ayuntamiento, presentes en cada una de las Juntas de Distrito. <a href="http://www.madrid.es/portales/munimadrid/es/Inicio/Ayuntamiento/Oposiciones-y-Empleo/Direcciones-y-telefonos/Oficinas-de-Registro-del-Ayuntamiento-de-Madrid?vgnextfmt=default&vgnextoid=adedb88db777f010VgnVCM2000000c205a0aRCRD&vgnextchannel=ddc3ca1c5a057010VgnVCM100000dc0ca8c0RCRD" target="_blank">Ver la lista completa de Oficinas de Registro</a>.</p>
 
-      <p>Las directrices aprobadas por el Ayuntamiento por las que se regulan las propuestas ciudadanas son las siguientes: <a href="/docs/directrices_ejercicio_propuesta.pdf" target="_blank">Directrices sobre el derecho de propuesta</a>.</p>
+      <p>Las directrices aprobadas por el Ayuntamiento por las que se regulan las propuestas ciudadanas son las siguientes: <a href="/docs/directrices_ejercicio_propuesta.pdf" target="_blank">Directrices sobre el derecho de propuesta (documento PDF)</a>.</p>
 
       <h2 id="ii">Preguntas Frecuentes</h2>
       <ol>
@@ -83,7 +83,7 @@
       El quórum es el mínimo de participación necesaria para considerar una votación vinculante de manera legal. Ningún reglamento del Ayuntamiento puede hacer que este mecanismo sea vinculante juridicamente, porque eso está en contra de la legislación española. La vinculación con el mecanismo es política y se asume de manera personal por los concejales y la Alcaldesa. Por ello no se considerará ningún quórum.</li>
 
       <li><strong>¿Existen mecanismos presenciales para participar? ¿Se ha planteado llegar a los ciudadanos y ciudadanas con dificultades de acceso a Internet o en situación de exclusión?</strong><br>
-      Todas las acciones relacionadas con el proceso de propuestas ciudadanas pueden realizarse presencialmente en cualquiera de las <a href="http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD" target="_blank">26 Oficinas de Atención al Ciudadano</a> repartidas por todos los distritos de Madrid. Además, el proceso de recogida de apoyos de una propuesta puede realizarse también a través de hojas de firmas, cuyo modelo puede ser <a href="/docs/formulario_propuestas_ciudadanas.pdf" target="_blank">descargado en este enlace</a>.
+      Todas las acciones relacionadas con el proceso de propuestas ciudadanas pueden realizarse presencialmente en cualquiera de las <a href="http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD" target="_blank">26 Oficinas de Atención al Ciudadano</a> repartidas por todos los distritos de Madrid. Además, el proceso de recogida de apoyos de una propuesta puede realizarse también a través de hojas de firmas, cuyo modelo puede ser <a href="/docs/formulario_propuestas_ciudadanas.pdf" target="_blank">descargado en este documento PDF</a>.
       <br>Adicionalmente se ha creado en el Área de Gobierno de Participación Ciudadana, Transparencia y Gobierno Abierto el Servicio de Inclusión, Neutralidad y Privacidad que pondrá en marcha una mesa de inclusión con personal del Ayuntamiento y asociaciones que trabajan con colectivos en situación de exclusión, para diseñar mecanismos especiales para que puedan participar dichos colectivos.</li>
 
       <li><strong>¿Cómo puede participar la gente que no esté empadronada en Madrid?</strong><br>
@@ -100,7 +100,7 @@
 
       <h2 id="iii">Hojas de firmas para recoger apoyos</h2>
 
-      <p>El proceso de recogida de apoyos de una propuesta, además de en la web, puede realizarse a través de hojas de firmas, cuyo modelo puede ser <a href="/docs/formulario_propuestas_ciudadanas.pdf" target="_blank">descargado en este enlace</a>.</p>
+      <p>El proceso de recogida de apoyos de una propuesta, además de en la web, puede realizarse a través de hojas de firmas, cuyo modelo puede ser <a href="/docs/formulario_propuestas_ciudadanas.pdf" target="_blank">descargado en este documento PDF</a>.</p>
       <p>La hoja debe contener en las casillas superiores el código de la propuesta y su título, según figura en la página web específica de la propuesta, dentro del Portal de Gobierno Abierto.</p>
       <p>Los apoyos recogidos de esta manera se sumarán a los apoyos ya existentes en el portal de gobierno abierto. Las hojas pueden ser entregadas en cualquiera de los Registros del Ayuntamiento, presentes en cada una de las Juntas de Distrito. <a href="http://www.madrid.es/portales/munimadrid/es/Inicio/Ayuntamiento/Oposiciones-y-Empleo/Direcciones-y-telefonos/Oficinas-de-Registro-del-Ayuntamiento-de-Madrid?vgnextfmt=default&vgnextoid=adedb88db777f010VgnVCM2000000c205a0aRCRD&vgnextchannel=ddc3ca1c5a057010VgnVCM100000dc0ca8c0RCRD" target="_blank">Ver la lista completa de Oficinas de Registro</a>.</p>
 
diff --git a/app/views/shared/_order_selector.html.erb b/app/views/shared/_order_selector.html.erb
index 244f3b95f..883205493 100644
--- a/app/views/shared/_order_selector.html.erb
+++ b/app/views/shared/_order_selector.html.erb
@@ -4,7 +4,8 @@
 %>
 
 <form class="inline-block">
-  <select class="js-location-changer js-order-selector select-order" data-order="<%= @current_order %>" name="order-selector">
+  <label for="order-selector-participation" class="sr-only"><%= t("debates.index.select_order") %></label>
+  <select class="js-location-changer js-order-selector select-order" data-order="<%= @current_order %>" name="order-selector" id="order-selector-participation">
      <% @valid_orders.each do |order| %>
        <option <%= 'selected' if order == @current_order %>
                value='<%= current_path_with_query_params(order: order, page: 1) %>'>
diff --git a/app/views/shared/_search_form_header.html.erb b/app/views/shared/_search_form_header.html.erb
index cf84656e6..255d47c41 100644
--- a/app/views/shared/_search_form_header.html.erb
+++ b/app/views/shared/_search_form_header.html.erb
@@ -11,10 +11,12 @@
     <div class="small-12 columns">
       <div class="row collapse">
         <div class="small-10 column">
-          <input type="text" name="search" placeholder="<%= t("#{i18n_namespace}.placeholder") %>" class="search-form">
+          <label for="search-form-header" class="sr-only"><%= t("debates.index.search_form.title") %></label>
+          <input type="text" id="search-form-header" name="search" placeholder="<%= t("#{i18n_namespace}.placeholder") %>" class="search-form">
         </div>
         <div class="small-2 column">
           <button type="submit" class="button postfix" title="<%= t("#{i18n_namespace}.button") %>">
+            <span class="sr-only"><%= t("debates.index.search_form.button") %></span>
             <i class="icon-search"></i>
           </button>
         </div>
diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb
index 8d2d9f919..d30822f37 100644
--- a/app/views/users/registrations/new.html.erb
+++ b/app/views/users/registrations/new.html.erb
@@ -14,7 +14,7 @@
   <div class="row">
     <div class="small-12 column">
 
-      <%= f.label t("devise_views.users.registrations.new.username_label") %>
+      <%= f.label :username %>
       <p class="note"><%= t("devise_views.users.registrations.new.username_note") %></p>
       <%= f.text_field  :username, maxlength: User.username_max_length, placeholder: t("devise_views.users.registrations.new.username_label"), label: false %>
 
diff --git a/app/views/welcome/highlights.html.erb b/app/views/welcome/highlights.html.erb
index 5a6d40df8..f0b4e446e 100644
--- a/app/views/welcome/highlights.html.erb
+++ b/app/views/welcome/highlights.html.erb
@@ -7,6 +7,8 @@
         <div class="filters">
 
           <div class="small-12 medium-7 left">
+              <h1 class="inline-block"><%= t('welcome.highlights') %></h1>
+              &nbsp;&nbsp;
               <h2 class="margin-top">
                 <%= t('welcome.signed_in_home_title') %>
               </h2>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 3f3a5864b..e3c2c9057 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -2,24 +2,24 @@
   <section role="main">
     <div class="row text-center">
       <div class="small-12 medium-3 column">
-        <%= image_tag("icon_home_debate.svg", size: "168x168") %>
+        <%= image_tag("icon_home_debate.png", size: "168x168", alt: t("welcome.debates.title")) %>
         <h3><%= t("welcome.debates.title") %></h3>
         <p><%= t("welcome.debates.description") %></p>
 
       </div>
       <div class="small-12 medium-3 column">
-        <%= image_tag("icon_home_proposal.svg", size: "168x168") %>
+        <%= image_tag("icon_home_proposal.png", size: "168x168", alt: t("welcome.proposal.title"))  %>
         <h3><%= t("welcome.proposal.title") %></h3>
         <p><%= t("welcome.proposal.description") %></p>
       </div>
 
       <div class="small-12 medium-3 column">
-        <%= image_tag("icon_home_decide.svg", size: "168x168") %>
+        <%= image_tag("icon_home_decide.png", size: "168x168", alt: t("welcome.decide.title")) %>
         <h3><%= t("welcome.decide.title") %></h3>
         <p><%= t("welcome.decide.description") %></p>
       </div>
       <div class="small-12 medium-3 column">
-        <%= image_tag("icon_home_done.svg", size: "168x168") %>
+        <%= image_tag("icon_home_do.png", size: "168x168", alt: t("welcome.do.title")) %>
         <h3><%= t("welcome.do.title") %></h3>
         <p><%= t("welcome.do.description") %></p>
       </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5557f3610..50f75770b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2,6 +2,7 @@ en:
   locale: English
   layouts:
     header:
+      logo: "Madrid"
       external_link_transparency: Transparency
       external_link_transparency_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Transparencia?vgnextfmt=default&vgnextchannel=20fd850769797310VgnVCM2000000c205a0aRCRD"
       external_link_opendata: Open data
@@ -317,6 +318,7 @@ en:
     manage:
       all: "You are not authorized to %{action} %{subject}."
   welcome:
+    highlights: "Highlights: "
     signed_in_home_title: Recent activity
     debates:
       title: "Debate"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 0fffc05cc..0cf8ef035 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -2,6 +2,7 @@ es:
   locale: "Español"
   layouts:
     header:
+      logo: "Madrid"
       external_link_transparency: Transparencia
       external_link_transparency_url: "http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Transparencia?vgnextfmt=default&vgnextchannel=20fd850769797310VgnVCM2000000c205a0aRCRD"
       external_link_opendata: Datos abiertos
@@ -317,6 +318,7 @@ es:
     manage:
       all: "No tienes permiso para realizar la acción '%{action}' sobre %{subject}."
   welcome:
+    highlights: "Portada: "
     signed_in_home_title: Actividad reciente
     debates:
       title: "Debates"

From 72b6126f30fd397739a7e1b9df3fb3fa5ad90c0f Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Wed, 14 Oct 2015 12:40:26 +0200
Subject: [PATCH 36/37] uses the month (%m) instead of the minute (%M) in the
 proposal code

---
 app/models/proposal.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/proposal.rb b/app/models/proposal.rb
index b14d2e194..f7c1c5078 100644
--- a/app/models/proposal.rb
+++ b/app/models/proposal.rb
@@ -65,7 +65,7 @@ class Proposal < ActiveRecord::Base
   end
 
   def code
-    "#{Setting.value_for("proposal_code_prefix")}-#{created_at.strftime('%Y-%M')}-#{id}"
+    "#{Setting.value_for("proposal_code_prefix")}-#{created_at.strftime('%Y-%m')}-#{id}"
   end
 
   def after_commented

From 4783d28bf4a9db5069b7d6a19b4e26c1e8c05d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Wed, 14 Oct 2015 12:49:18 +0200
Subject: [PATCH 37/37] fix test

---
 spec/models/proposal_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/models/proposal_spec.rb b/spec/models/proposal_spec.rb
index ac7c1edfb..6e5acb379 100644
--- a/spec/models/proposal_spec.rb
+++ b/spec/models/proposal_spec.rb
@@ -125,7 +125,7 @@ describe Proposal do
   it "should have a code" do
     Setting.find_by(key: "proposal_code_prefix").update(value: "TEST")
     proposal = create(:proposal)
-    expect(proposal.code).to eq "TEST-#{proposal.created_at.strftime('%Y-%M')}-#{proposal.id}"
+    expect(proposal.code).to eq "TEST-#{proposal.created_at.strftime('%Y-%m')}-#{proposal.id}"
   end
 
   describe "#editable?" do