consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #117 from medialab-prado/107-fix-share-buttons-position

Browse Source 
Invert share buttons layout
This commit is contained in:
Fernando Blat
2017-02-16 16:28:43 +01:00
committed by GitHub
parent 73d580b5ba 16c365ca1d
commit f3d1be93ec
6 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/stylesheets/legislation_process.scss
View File

@@ -528,13 +528,6 @@ $epigraph-line-height: rem-calc(22);
position: relative; position: relative;
padding: 2rem 0; padding: 2rem 0;
aside.absolute {
@include breakpoint(medium) {
position: absolute;
right: 0;
}
}
.draft-chooser { .draft-chooser {
margin-bottom: 2rem; margin-bottom: 2rem;
@@ -1119,6 +1112,10 @@ $epigraph-line-height: rem-calc(22);
// ----------------- // -----------------
.legislation-comment { .legislation-comment {
.annotation-share-comment {
margin-bottom: 2rem;
}
.pull-right { .pull-right {
float: right; float: right;
} }

2
app/views/legislation/annotations/_slim_version_chooser.html.erb
View File

@@ -17,7 +17,7 @@
<div class="sidebar-divider"></div> <div class="sidebar-divider"></div>
<h2>Compartir</h2> <h2>Compartir</h2>
<div class="social-share-full"> <div class="social-share-full">
<%= render '/legislation/shared/share_buttons', title: @draft_version.title %> <%= render '/legislation/shared/share_buttons', title: t('legislation.shared.share_comment', version_name: @draft_version.title.downcase, process_name: @process.title) %>
</div> </div>
</aside> </aside>
</div> </div>

10
app/views/legislation/annotations/index.html.erb
View File

@@ -6,15 +6,7 @@
<div class="column row"> <div class="column row">
<div class="draft-panels small-12 column row"> <div class="draft-panels small-12 column row">
<%= render 'version_chooser', process: @process, draft_version: @draft_version %> <%= render 'slim_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>
</div> </div>
<div class="small-12 medium-8 column row legislation-comments end"> <div class="small-12 medium-8 column row legislation-comments end">

49
app/views/legislation/annotations/show.html.erb
View File

@@ -6,31 +6,40 @@
<div class="column row"> <div class="column row">
<div class="draft-panels small-12 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="legislation-comment">
<div class="small-12 medium-12 column legislation-comment"> <div class="annotation-comment">
<div class="annotation-comment"> <div class="row annotation-share-comment">
<strong><%= t('legislation.annotations.index.comments_about') %></strong> <div class="small-12 medium-9 column">
<div class="comment-section"> <strong><%= t('legislation.annotations.index.comments_about') %></strong>
<div class="row">
<div class="small-12 medium-10 column legislation-comment"> <div class="comment-section">
<%= @annotation.context.try(:html_safe).presence || @annotation.quote %> <div class="row">
</div> <div class="small-12 medium-9 column legislation-comment">
<div class="small-12 medium-2 column legislation-comment"> <%= @annotation.context.try(:html_safe).presence || @annotation.quote %>
<span class="pull-right"> </div>
<%= link_to legislation_process_draft_version_path(@process, @draft_version, anchor: "annotation-id-#{@annotation.id}") do %> <div class="small-12 medium-3 column legislation-comment">
<span><%= t('legislation.annotations.index.see_in_context') %></span> <span class="icon-expand" aria-hidden="true"></span> <span class="pull-right">
<% end %> <%= link_to legislation_process_draft_version_path(@process, @draft_version, anchor: "annotation-id-#{@annotation.id}") do %>
</span> <span><%= t('legislation.annotations.index.see_in_context') %></span> <span class="icon-expand" aria-hidden="true"></span>
<% end %>
</span>
</div>
</div> </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: t('legislation.shared.share_comment', version_name: @draft_version.title.downcase, process_name: @process.title) %>
</div>
</aside>
</div> </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>
</div> </div>
</div>

1
config/locales/legislation.en.yml
View File

@@ -112,3 +112,4 @@ en:
share_twitter: Share on Twitter share_twitter: Share on Twitter
share_facebook: Share on Facebook share_facebook: Share on Facebook
share_gplus: Share on Google+ share_gplus: Share on Google+
share_comment: Comment on %{version_name} from process draft %{process_name}

1
config/locales/legislation.es.yml
View File

@@ -112,3 +112,4 @@ es:
share_twitter: Compartir en Twitter share_twitter: Compartir en Twitter
share_facebook: Compartir en Facebook share_facebook: Compartir en Facebook
share_gplus: Compartir en Google+ share_gplus: Compartir en Google+
share_comment: Comentario sobre la %{version_name} del borrador del proceso %{process_name}