From 9962202b0d2bf9ec97cb18d4d507b6dac89325ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Gonz=C3=A1lez?= <m@martingonzalez.net>
Date: Wed, 15 Feb 2017 19:47:58 +0100
Subject: [PATCH] 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 @@
 
 <div class="column row">
   <div class="draft-panels small-12 column row">
-    <%= render 'version_chooser', process: @process, draft_version: @draft_version %>
-
-    <aside class="small-12 medium-3 column absolute">
-      <div class="sidebar-divider"></div>
-      <h2>Compartir</h2>
-      <div class="social-share-full">
-        <%= render '/legislation/shared/share_buttons', title: "#{@draft_version.title} - #{@process.title}" %>
-      </div>
-    </aside>
+    <%= render 'slim_version_chooser', process: @process, draft_version: @draft_version %>
   </div>
 
   <div class="small-12 medium-8 column row legislation-comments end">
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 @@
 
 <div class="column row">
   <div class="draft-panels small-12 column row">
-    <%= render 'slim_version_chooser', process: @process, draft_version: @draft_version %>
+    <%= render 'version_chooser', process: @process, draft_version: @draft_version %>
 
-    <div class="row">
-      <div class="small-12 medium-12 column legislation-comment">
-        <div class="annotation-comment">
-          <strong><%= t('legislation.annotations.index.comments_about') %></strong>
-          <div class="comment-section">
-            <div class="row">
-              <div class="small-12 medium-10 column legislation-comment">
-                <%= @annotation.context.try(:html_safe).presence || @annotation.quote %>
-              </div>
-              <div class="small-12 medium-2 column legislation-comment">
-                <span class="pull-right">
-                  <%= link_to legislation_process_draft_version_path(@process, @draft_version, anchor: "annotation-id-#{@annotation.id}") do %>
-                    <span><%= t('legislation.annotations.index.see_in_context') %></span> <span class="icon-expand" aria-hidden="true"></span>
-                  <% end %>
-                </span>
+    <div class="legislation-comment">
+      <div class="annotation-comment">
+        <div class="row annotation-share-comment">
+          <div class="small-12 medium-9 column">
+            <strong><%= t('legislation.annotations.index.comments_about') %></strong>
+
+            <div class="comment-section">
+              <div class="row">
+                <div class="small-12 medium-9 column legislation-comment">
+                  <%= @annotation.context.try(:html_safe).presence || @annotation.quote %>
+                </div>
+                <div class="small-12 medium-3 column legislation-comment">
+                  <span class="pull-right">
+                    <%= link_to legislation_process_draft_version_path(@process, @draft_version, anchor: "annotation-id-#{@annotation.id}") do %>
+                      <span><%= t('legislation.annotations.index.see_in_context') %></span> <span class="icon-expand" aria-hidden="true"></span>
+                    <% end %>
+                  </span>
+                </div>
               </div>
             </div>
+          </div>
+          
+          <aside class="small-12 medium-3 column">
+            <div class="sidebar-divider"></div>
+            <h2>Compartir</h2>
+            <div class="social-share-full">
+              <%= render '/legislation/shared/share_buttons', title: @draft_version.title %>
+            </div>
+          </aside>    
         </div>
 
-        <%= 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 } %>
       </div>
     </div>
-
   </div>
-</div>