From 7a907d5e23e92f6fc3e6250d1d860cf1221a7659 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Thu, 14 Jan 2016 13:11:40 +0100 Subject: [PATCH 1/3] Updates icons font --- app/assets/fonts/icons.eot | Bin 9544 -> 9564 bytes app/assets/fonts/icons.svg | 6 ++++-- app/assets/fonts/icons.ttf | Bin 9388 -> 9408 bytes app/assets/fonts/icons.woff | Bin 7468 -> 7496 bytes app/assets/stylesheets/icons.scss | 18 ++++++++++++------ 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot index ced98a9b4790e2f0ffb6ab1792a9671d4d63e209..7323d578fd97c45babb7d99ac69f377304b9e790 100644 GIT binary patch delta 1268 zcmYjROKclO82-mQyIySB`6@dV$syIXfasY`|O2mO<>4gIq!oRi!nbAMj2acxzk-Gpe^vX*wpMlqbL;NA)(A@d)?A+s} zZvn__h!-pMa!a6ppuNR~+~>>Xjn>f-FlhfCuJg-lS1-*h{~ZFLet_WAO08VwZhmnB z*PfshR*<0M78ZRyh$AcY_LYw9F@pig4iXpFnw9eHo1Z=dV7^BDM!kHc1y|uqTtA68 z)F{_$(y5R40KylLYqXjh?KAq%0)YAu@dF@eg>o4`?rmx6FAyw90PKI0myXXC=<+;H z<6Q&OsY^ZAbHLFIb-d9oGiLlo9(5p!J%oK8I~LoQp}x~yWK8!Vpl}UmJD8cw$g^-B zHgU_$_9E)#o__QTV$*|1389=o-x!QQ5QY(lK?4;cm@^IujBUt_UrB)kUT}d71KyigNiqAi4e9v4r=IB|W?fgn~iMqHX z-nxH_el}=C!+RYDGls|^IRq<)p27es=kaC>y4AzQ)mTw4JO04A)0UPK6JW>>@RWOGsYWOj40T1v17(`KB`JY>iY z`3YDE;GIQp%~Q!4w{|Zx|zt5bZR{>$qpR!tto_{CqdnfM#wvA%1nt#y{h2W2&1I z`>B$XY5Rg-^^f zfZe{%A-`{w)Np(n%ft&zZD?zU>wTTY+jgg~bI3n3K2qOgCO|iSR}+>A-4L_|V@V5> zG2;X60woEOyuYupO>7%Q6n?Y+j@P@fy|Zg-yV;-Yu9GM~ByqNf0tJ<{YAHpuN)QC0tx4*LIJRh{ z77n;@04hA`k)}{v^-~d8M9JqkMytTJgB!2d3X5Rbe z&71c(d;ieahxmgo!1YUfz+Jd}&b_p+(cYYT5n%Wt0F(~we|jDkK|r~MvU&8_ATo0KU65|K)?V z+d=ou9xed`lQG^q)Pp7%=ytjt#_XBu@AYS{hm1z|$X9K&kpmYA9Zg0lIdBD$*ozWy z@D{ETQs0Rq@FpfJ{+@&|;d&Qi!gnKD#4{Bbf-*`bSm1yS!+6ICTI7I7EfH;{@aAZo z9iTp_pu-?!ArBf*FrWZl^bC6>T^TCxHZ8{Eqn&6}TcAMa{&5A&j+9}{o_vpDP6UKJ;*8T!n$A50L(7KNCo#%sbD(L}-a zy=pMy`GKA{bWszD;CPe73ud1nUUe==s5*-r+6v~T4V`MDZsU8w(ql4z)%LSIOfBwX=Jc+rgkjbPKIVFmMWd)2R>5{}a zrJ{NoHHv&8%kxxGKe+pdok}TkE}LnbRrRt#DIIdF&z6?Su_DW{>|aw1!}Pd`c4}Zi z%}`p%R~&!Lb0toaMM)B6iR1FQVx3{Iia9LTFIY?k_WvV0!H#^yY5Tv><9zmMXZ$}t z2pN6-m+%715=1d2E9uO`2p9WN8D(AlFYhJS8}pq?zCdY4joS^|mTZ%4>>2>9U$26` z7d3`Hi+;5{--NZKljENIFyVPf!|j9@5Z{U(w=I7kjK2w1y|%V2 g^_THxRB+4w2)crQnB-x_&keqL?4zxC-TBo225w=}W&i*H diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg index d92b9a44a..e272b9550 100644 --- a/app/assets/fonts/icons.svg +++ b/app/assets/fonts/icons.svg @@ -42,8 +42,10 @@ - - + + + + diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf index f3486cf96bec5abc0d42863006781a3c543eb65b..4db54078da27f3f3a2e6576813fffc478c62c3e1 100644 GIT binary patch delta 1313 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 blpY~{bK&v)Z$!3Ii1BE400aOa5rFVN7QQWE delta 7382 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

PZLQlcx3{%J zjPzgz<|0NWBJ+^_5)$G3@SWTY9j%s(%ON98K;WyT(^n7MW%YB~I}?0)x7m{Al`#NL zRTc2^c>Jfgm-0b7ScDSYyT6^g_*~!c2KJOxeNr&Lc}By=R>d@P!$svm0m=Db;r)NR z79d1%=J02{f0AY&UPdE@q6#t!Mkf1j+~Q?e7G|tgOT)E@ihMjNl++vm>Pv25BYOxt z$lxA*<>m{|&>S}Q>qn}I8X~`o^04kAB2)dXCYJQ5 z#WzN$;}>m=l#qFy3;2#lxAcGKD~Q4}c~BD5d{Q04)tEwP%R6VH6E;w9vs6j+I<@a6 zskA&J7hv7?bbKerX?(QFZ2S~VSh2}!?zafqq+66|oaEPWPG>$#;ZimfY|`2Jml^j1 s`8U^(I8+?0%#e-1(4@emfE&u=k diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss index 46e24e4cf..b13b09f46 100644 --- a/app/assets/stylesheets/icons.scss +++ b/app/assets/stylesheets/icons.scss @@ -142,15 +142,21 @@ .icon-letter:before { content: "\4c"; } -.icon-no-notification:before { - content: "\78"; -} -.icon-notification:before { - content: "\6e"; -} .icon-circle:before { content: "\43"; } .icon-circle-o:before { content: "\4d"; } +.icon-help:before { + content: "\4e"; +} +.icon-budget:before { + content: "\53"; +} +.icon-notification:before { + content: "\6e"; +} +.icon-no-notification:before { + content: "\78"; +} From 933fa75a3bfc3bfd8bb1817713b23641b271321a Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Thu, 14 Jan 2016 14:20:07 +0100 Subject: [PATCH 2/3] Changes icon and text for spending proposals --- app/assets/stylesheets/participation.scss | 11 ++++++++++- app/assets/stylesheets/variables.scss | 2 ++ app/views/admin/_menu.html.erb | 2 +- app/views/spending_proposals/index.html.erb | 2 +- app/views/spending_proposals/new.html.erb | 4 ++-- config/locales/en.yml | 4 ++-- config/locales/es.yml | 4 ++-- 7 files changed, 20 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index ba61be077..87aed579d 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -272,7 +272,9 @@ // 02. New participation // - - - - - - - - - - - - - - - - - - - - - - - - - -.debate-new, .debate-edit, .proposal-new, .proposal-edit, { +.debate-new, .debate-edit, +.proposal-new, .proposal-edit, +.spending-proposal-new, .spending-proposal-edit { padding-top: $line-height; .back { @@ -293,6 +295,13 @@ opacity: .5; } + .icon-budget { + color: $budget; + font-size: rem-calc(50); + line-height: $line-height; + opacity: .5; + } + .recommendations { list-style-type: none; margin-left: 0; diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss index 3cb09718c..eeae89a61 100644 --- a/app/assets/stylesheets/variables.scss +++ b/app/assets/stylesheets/variables.scss @@ -73,6 +73,8 @@ $check: #46DB91; $proposals: #FFA42D; $proposals-border: #CC8425; +$budget: #454372; + $highlight: #E7F2FC; $featured: #FED900; diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index b27a8a73b..b075755da 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -34,7 +34,7 @@

  • > <%= link_to admin_spending_proposals_path do %> - + <%= t("admin.menu.spending_proposals") %> <% end %>
  • diff --git a/app/views/spending_proposals/index.html.erb b/app/views/spending_proposals/index.html.erb index 0bf276894..301ae2442 100644 --- a/app/views/spending_proposals/index.html.erb +++ b/app/views/spending_proposals/index.html.erb @@ -4,7 +4,7 @@

    <%= t('spending_proposals.index.title') %>

    -

    <%= t('spending_proposals.index.text') %>

    +

    <%= t('spending_proposals.index.text_html') %>

    <% if can? :create, SpendingProposal %> <%= link_to t('spending_proposals.index.create_link'), new_spending_proposal_path, class: 'button radius' %> diff --git a/app/views/spending_proposals/new.html.erb b/app/views/spending_proposals/new.html.erb index c761487ff..6909f67aa 100644 --- a/app/views/spending_proposals/new.html.erb +++ b/app/views/spending_proposals/new.html.erb @@ -1,4 +1,4 @@ -
    +
    <%= link_to spending_proposals_path, class: "left back" do %> @@ -15,7 +15,7 @@
    - +

    <%= t("spending_proposals.new.recommendations_title") %>

    • <%= t("spending_proposals.new.recommendation_one") %>
    • diff --git a/config/locales/en.yml b/config/locales/en.yml index 0c75f8ecf..94e3728fb 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -249,7 +249,7 @@ en: spending_proposals: index: title: "Participatory budgeting" - text: "Here you can send spending proposals to be considered in the frame of the annual participatory budgeting." + text_html: "Here you can send spending proposals to be considered in the frame of the annual participatory budgeting." create_link: "Create spending proposal" verified_only: "Only verified users can create spending proposals, %{verify_account}." verify_account: "verify your account" @@ -257,7 +257,7 @@ en: back_link: Back start_new: "Create spending proposal" more_info: "How do participatory budgeting works?" - recommendations_title: "Recommendations for creating a spending proposal" + recommendations_title: "How create a spending proposal" recommendation_one: "It's mandatory that the proposal makes reference to a budgetable action." recommendation_two: "Any proposal or comment suggesting illegal action will be deleted." recommendation_three: "Try to go into details when describing your spending proposal so the reviewing team undertands your points." diff --git a/config/locales/es.yml b/config/locales/es.yml index 13c0c6b50..2870f0401 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -249,7 +249,7 @@ es: spending_proposals: index: title: "Presupuestos participativos" - text: "Desde esta sección podrás sugerir propuestas de gasto que irán asociadas a las partidas de presupuestos ciudadanos. El requisito principal es que sean propuestas presupuestables." + text_html: "Desde esta sección podrás sugerir propuestas de gasto que irán asociadas a las partidas de presupuestos ciudadanos.
      El requisito principal es que sean propuestas presupuestables." create_link: "Enviar propuesta de gasto" verified_only: "Sólo los usuarios verificados pueden crear propuestas de gasto, %{verify_account}." verify_account: "verifica tu cuenta" @@ -257,7 +257,7 @@ es: back_link: Volver start_new: "Crear una propuesta de gasto" more_info: "¿Cómo funcionan los presupuestos participativos?" - recommendations_title: "Recomendaciones para crear una propuesta de gasto" + recommendations_title: "Cómo crear una propuesta de gasto" recommendation_one: "Es fundamental que haga referencia a una actuación presupuestable." recommendation_two: "Cualquier propuesta o comentario que implique acciones ilegales será eliminada." recommendation_three: "Intenta detallar lo máximo posible la propuesta para que el equipo de gobierno encargado de estudiarla tenga las menor dudas posibles." From d36ee4cdaf8af1b094deb418a7d89a5d544bd795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Fri, 15 Jan 2016 11:18:00 +0100 Subject: [PATCH 3/3] changes text --- config/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 94e3728fb..6722bd30f 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -257,7 +257,7 @@ en: back_link: Back start_new: "Create spending proposal" more_info: "How do participatory budgeting works?" - recommendations_title: "How create a spending proposal" + recommendations_title: "How to create a spending proposal" recommendation_one: "It's mandatory that the proposal makes reference to a budgetable action." recommendation_two: "Any proposal or comment suggesting illegal action will be deleted." recommendation_three: "Try to go into details when describing your spending proposal so the reviewing team undertands your points."