From 5d6c083f6716e43d128930cf01ac82617eef618e Mon Sep 17 00:00:00 2001 From: rgarcia Date: Sun, 4 Dec 2016 19:57:10 +0100 Subject: [PATCH 1/8] updates sitemap daily in all servers --- config/deploy.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/deploy.rb b/config/deploy.rb index acce83b3c..30b08c56d 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -38,7 +38,7 @@ set(:config_files, %w( unicorn.rb )) -set :whenever_roles, -> { :cron } +set :whenever_roles, -> { :app } namespace :deploy do before :starting, 'rvm1:install:rvm' # install/update RVM From ae12848e230588ed43ffbde02cce663a8b46f400 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 5 Dec 2016 14:26:54 +0100 Subject: [PATCH 2/8] adds text for screen readers on toggle comments --- app/assets/javascripts/comments.js.coffee | 1 + app/views/comments/_comment.html.erb | 3 ++- config/locales/en.yml | 1 + config/locales/es.yml | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/comments.js.coffee b/app/assets/javascripts/comments.js.coffee index 876a89b20..fefe85544 100644 --- a/app/assets/javascripts/comments.js.coffee +++ b/app/assets/javascripts/comments.js.coffee @@ -52,5 +52,6 @@ App.Comments = children_container_id = "#{$(this).data().id}_children" $("##{children_container_id}").toggle('slow') App.Comments.toggle_arrow(children_container_id) + $(this).children('.js-child-toggle').toggle() false ) diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb index bf8bfb50d..3424e6fcc 100644 --- a/app/views/comments/_comment.html.erb +++ b/app/views/comments/_comment.html.erb @@ -74,7 +74,8 @@ <% if comment.children.size > 0 %> <%= link_to "", class: "js-toggle-children relative", data: {'id': "#{dom_id(comment)}"} do %> - <%= t("shared.show") %> + + <%= t("shared.hide") %> <%= t("comments.comment.responses", count: comment.children.size) %> <% end %> <% else %> diff --git a/config/locales/en.yml b/config/locales/en.yml index db2b3b1c5..cd713df7e 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -426,6 +426,7 @@ en: check_none: None collective: Collective flag: Flag as inappropriate + hide: Hide print: print_button: Print this info show: Show diff --git a/config/locales/es.yml b/config/locales/es.yml index fea817454..6f1ca30b9 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -426,6 +426,7 @@ es: check_none: Ninguno collective: Colectivo flag: Denunciar como inapropiado + hide: Ocultar print: print_button: Imprimir esta información show: Mostrar From 3b2fe1e184bd028f0fd610af1a6d52a0a146da5c Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 5 Dec 2016 17:02:42 +0100 Subject: [PATCH 3/8] improves headings and outline structure --- app/assets/stylesheets/layout.scss | 2 +- app/assets/stylesheets/participation.scss | 8 ++++++-- app/views/debates/show.html.erb | 4 ++-- app/views/kaminari/_paginator.html.erb | 2 +- app/views/proposal_ballots/index.html.erb | 2 +- app/views/proposals/_categories.html.erb | 2 +- app/views/proposals/_geozones.html.erb | 2 +- app/views/proposals/_popular.html.erb | 2 +- app/views/proposals/_retired.html.erb | 2 +- app/views/proposals/show.html.erb | 4 ++-- app/views/shared/_tag_cloud.html.erb | 2 +- app/views/spending_proposals/_sidebar.html.erb | 2 +- 12 files changed, 19 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 6c6d739af..947349674 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -577,7 +577,7 @@ footer { } } -h3.sidebar-title { +h2.sidebar-title { border-top: 2px solid $brand; display: inline-block; font-size: rem-calc(16); diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 6dbaac394..11d4c97a1 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -383,7 +383,7 @@ aside { - h3 { + h2 { border-top: 2px solid $brand; display: inline-block; font-size: rem-calc(16); @@ -844,11 +844,15 @@ } p { - margin-bottom: 0; &.title { color: #FFD200; } + + &.title-date { + font-size: rem-calc(24); + font-weight: bold; + } } .info { diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index dca39677e..7a528ffa7 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -44,12 +44,12 @@