From e9b5a8980e9286d8a24d1fe3f9423ba7549cf7b4 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Mon, 31 Oct 2016 18:39:57 +0100 Subject: [PATCH 001/138] removes redundant link on header --- app/views/shared/_top_links.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/shared/_top_links.html.erb b/app/views/shared/_top_links.html.erb index be6afb0d7..b30d12aba 100644 --- a/app/views/shared/_top_links.html.erb +++ b/app/views/shared/_top_links.html.erb @@ -2,7 +2,6 @@
<%= render "shared/locale_switcher" %>
- <%= link_to setting['org_name'], root_path, class: ("selected" unless current_page?("/opendata")) %> | <%= link_to t("layouts.header.external_link_transparency"), t("layouts.header.external_link_transparency_url") %> | <%= link_to t("layouts.header.external_link_opendata"), "/opendata", class: ("selected" if current_page?("/opendata")) %> <% if setting['blog_url'] %> From f8649ad6c27e3f59fb1c0288faaa81a1750a6fb9 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 2 Nov 2016 12:17:15 +0100 Subject: [PATCH 002/138] improves styles on comments votes --- app/assets/stylesheets/layout.scss | 18 +++++++++--- app/views/comments/_votes.html.erb | 46 +++++++++++++++++++++--------- 2 files changed, 47 insertions(+), 17 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index c3dded973..b91c2ba80 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -1550,7 +1550,7 @@ table { .comment-votes { color: $text-medium; - font-size: rem-calc(14); + font-size: $small-font-size; line-height: $line-height; a { @@ -1560,12 +1560,21 @@ table { &:hover { color: $text-medium; + text-decoration: none; + + .icon-like { + color: $like; + } + + .icon-unlike { + color: $unlike; + } } } [class^="icon-"] { - font-size: rem-calc(20); - vertical-align: middle; + font-size: $base-font-size; + vertical-align: sub; } } @@ -1685,7 +1694,8 @@ table { } .flag-disable, .flag-active { - vertical-align: middle; + line-height: 0; + vertical-align: sub; } .flag-disable { diff --git a/app/views/comments/_votes.html.erb b/app/views/comments/_votes.html.erb index 0de92a675..93af5b2dd 100644 --- a/app/views/comments/_votes.html.erb +++ b/app/views/comments/_votes.html.erb @@ -6,13 +6,17 @@ <% if can?(:vote, comment) %> <%= link_to vote_comment_path(comment, value: 'yes'), - method: "post", remote: true do %> - + method: "post", remote: true, title: t('votes.agree') do %> + <%= t('votes.agree') %> <% end %> <% else %> - + <%= link_to new_user_session_path do %> + + <%= t('votes.agree') %> + + <% end %> <% end %> <%= comment.total_likes %> @@ -20,13 +24,15 @@ <% if can?(:vote, comment) %> <%= link_to vote_comment_path(comment, value: 'no'), - method: "post", remote: true do %> - + method: "post", remote: true, title: t('votes.disagree') do %> + <%= t('votes.disagree') %> <% end %> <% else %> - + + <%= t('votes.disagree') %> + <% end %> <%= comment.total_dislikes %> @@ -40,26 +46,40 @@ <% if can?(:vote, comment) %> <%= link_to vote_comment_path(comment, value: 'yes'), - method: "post", remote: true do %> - + method: "post", remote: true, title: t('votes.agree') do %> + + <%= t('votes.agree') %> + <% end %> <% else %> - + <%= link_to new_user_session_path do %> + + <%= t('votes.agree') %> + + <% end %> <% end %> <%= comment.total_likes %> + <% if can?(:vote, comment) %> <%= link_to vote_comment_path(comment, value: 'no'), - method: "post", remote: true do %> - + method: "post", remote: true, title: t('votes.disagree') do %> + + <%= t('votes.disagree') %> + <% end %> <% else %> - + <%= link_to new_user_session_path do %> + + <%= t('votes.disagree') %> + + <% end %> <% end %> <%= comment.total_dislikes %> -
+
+ -
+
<%= render 'debates/votes', debate: debate %>
diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index 9625ab42d..dca39677e 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -45,10 +45,8 @@
_reply" class="reply"> - +
<%= render 'comments/votes', comment: comment %> - +
<% if comment.children.size > 0 %> <%= link_to "#{dom_id(comment)}", class: "js-toggle-children relative", data: {'id': "#{dom_id(comment)}"} do %>