From 9962202b0d2bf9ec97cb18d4d507b6dac89325ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Gonz=C3=A1lez?= Date: Wed, 15 Feb 2017 19:47:58 +0100 Subject: [PATCH 1/2] Invert share buttons layout --- .../stylesheets/legislation_process.scss | 11 ++--- .../legislation/annotations/index.html.erb | 10 +--- .../legislation/annotations/show.html.erb | 49 +++++++++++-------- 3 files changed, 34 insertions(+), 36 deletions(-) diff --git a/app/assets/stylesheets/legislation_process.scss b/app/assets/stylesheets/legislation_process.scss index 3fbc509bf..0b53115d6 100644 --- a/app/assets/stylesheets/legislation_process.scss +++ b/app/assets/stylesheets/legislation_process.scss @@ -527,13 +527,6 @@ $epigraph-line-height: rem-calc(22); .draft-panels { position: relative; padding: 2rem 0; - - aside.absolute { - @include breakpoint(medium) { - position: absolute; - right: 0; - } - } .draft-chooser { margin-bottom: 2rem; @@ -1118,6 +1111,10 @@ $epigraph-line-height: rem-calc(22); // 10. Legislation draft comment // ----------------- .legislation-comment { + + .annotation-share-comment { + margin-bottom: 2rem; + } .pull-right { float: right; diff --git a/app/views/legislation/annotations/index.html.erb b/app/views/legislation/annotations/index.html.erb index ddcd9919b..cc67f9f2d 100644 --- a/app/views/legislation/annotations/index.html.erb +++ b/app/views/legislation/annotations/index.html.erb @@ -6,15 +6,7 @@
- <%= render 'version_chooser', process: @process, draft_version: @draft_version %> - - + <%= render 'slim_version_chooser', process: @process, draft_version: @draft_version %>
diff --git a/app/views/legislation/annotations/show.html.erb b/app/views/legislation/annotations/show.html.erb index 765169246..c2cf53a60 100644 --- a/app/views/legislation/annotations/show.html.erb +++ b/app/views/legislation/annotations/show.html.erb @@ -6,31 +6,40 @@
- <%= render 'slim_version_chooser', process: @process, draft_version: @draft_version %> + <%= render 'version_chooser', process: @process, draft_version: @draft_version %> -
-
-
- <%= t('legislation.annotations.index.comments_about') %> -
-
-
- <%= @annotation.context.try(:html_safe).presence || @annotation.quote %> -
-
- - <%= link_to legislation_process_draft_version_path(@process, @draft_version, anchor: "annotation-id-#{@annotation.id}") do %> - <%= t('legislation.annotations.index.see_in_context') %> - <% end %> - +
+
+
+
+ <%= t('legislation.annotations.index.comments_about') %> + +
+
+
+ <%= @annotation.context.try(:html_safe).presence || @annotation.quote %> +
+
+ + <%= link_to legislation_process_draft_version_path(@process, @draft_version, anchor: "annotation-id-#{@annotation.id}") do %> + <%= t('legislation.annotations.index.see_in_context') %> + <% end %> + +
+
+ +
- <%= render partial: '/comments/comment_tree', locals: { comment_tree: @comment_tree, comment_flags: @comment_flags } %> - + <%= render partial: '/comments/comment_tree', locals: { comment_tree: @comment_tree, comment_flags: @comment_flags } %>
-
-
From 16c365ca1df8795712cf40e3420f801a321f517b Mon Sep 17 00:00:00 2001 From: Fernando Blat Date: Thu, 16 Feb 2017 16:05:08 +0100 Subject: [PATCH 2/2] Improve social networks share text --- .../legislation/annotations/_slim_version_chooser.html.erb | 2 +- app/views/legislation/annotations/show.html.erb | 6 +++--- config/locales/legislation.en.yml | 1 + config/locales/legislation.es.yml | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/legislation/annotations/_slim_version_chooser.html.erb b/app/views/legislation/annotations/_slim_version_chooser.html.erb index cd34736f7..2f2203374 100644 --- a/app/views/legislation/annotations/_slim_version_chooser.html.erb +++ b/app/views/legislation/annotations/_slim_version_chooser.html.erb @@ -17,7 +17,7 @@

Compartir

diff --git a/app/views/legislation/annotations/show.html.erb b/app/views/legislation/annotations/show.html.erb index c2cf53a60..46c728a16 100644 --- a/app/views/legislation/annotations/show.html.erb +++ b/app/views/legislation/annotations/show.html.erb @@ -29,14 +29,14 @@
- + +
<%= render partial: '/comments/comment_tree', locals: { comment_tree: @comment_tree, comment_flags: @comment_flags } %> diff --git a/config/locales/legislation.en.yml b/config/locales/legislation.en.yml index 4517e1f31..589c9e1fc 100644 --- a/config/locales/legislation.en.yml +++ b/config/locales/legislation.en.yml @@ -112,3 +112,4 @@ en: share_twitter: Share on Twitter share_facebook: Share on Facebook share_gplus: Share on Google+ + share_comment: Comment on %{version_name} from process draft %{process_name} diff --git a/config/locales/legislation.es.yml b/config/locales/legislation.es.yml index 1b91ef5c3..4343a9749 100644 --- a/config/locales/legislation.es.yml +++ b/config/locales/legislation.es.yml @@ -112,3 +112,4 @@ es: share_twitter: Compartir en Twitter share_facebook: Compartir en Facebook share_gplus: Compartir en Google+ + share_comment: Comentario sobre la %{version_name} del borrador del proceso %{process_name}