diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss index 8e68dc5bb..188b3bee4 100644 --- a/app/assets/stylesheets/debates.scss +++ b/app/assets/stylesheets/debates.scss @@ -13,7 +13,7 @@ @mixin votes { border-top: 1px solid $votes-border; padding: rem-calc(14) rem-calc(12); - background: $votes-background; + background: $votes-bg; margin: 0 -12px; .icon-like { @@ -178,6 +178,10 @@ font-size: rem-calc(16); vertical-align: top; } + + a { + color: $text-light; + } } .debate-description { @@ -320,6 +324,10 @@ line-height: $line-height*2; text-align: justify; + a { + color: $text-light; + } + .bullet { color: $border; } @@ -369,6 +377,11 @@ display: inline-block; margin-top: $line-height; } + + .tags { + display: block; + margin-top: $line-height; + } } // 04. New diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss index 09518ad23..7705a8372 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/app/assets/stylesheets/participacion.scss @@ -73,6 +73,14 @@ p { margin-bottom: $line-height/2; } +a { + color: $link; + + &:hover { + color: $link-hover; + } +} + .button { padding: rem-calc(15) rem-calc(32); } diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss index 6251d669d..74f0f2bfb 100644 --- a/app/assets/stylesheets/variables.scss +++ b/app/assets/stylesheets/variables.scss @@ -27,7 +27,7 @@ $comments-text: #3F4549; $header-color: #292B33; $link: #2895F1; -$link-hover: #2178BF; +$link-hover: #2178BF; $tags-bg: #FAFAFA; $tags-border: #F0F0F0; @@ -38,7 +38,7 @@ $text-medium: #999999; $text-light: #A3A6AD; $votes: #31708f; -$votes-background: #26AEEE; +$votes-bg: #26AEEE; $votes-border: #1F94CB; $votes-like: #7BD2A8; $votes-like-act: #5D9E7F; @@ -59,7 +59,7 @@ $success-bg: #DFF0D8; $success-border: #D6E9C6; $success-color: #3C763D; -$info-bg: #D9EDF7; +$info-bg: #D9EDF7; $info-border: #BCE8F1; $info-color: #31708F; diff --git a/app/views/debates/_debate.html.erb b/app/views/debates/_debate.html.erb index f31328ec9..207584fcb 100644 --- a/app/views/debates/_debate.html.erb +++ b/app/views/debates/_debate.html.erb @@ -9,8 +9,7 @@

<%= link_to debate.title, debate %>

  - <%= pluralize(debate.comment_threads.count, - t("debates.debate.comment"), t("debates.debate.comments")) %> + <%= link_to pluralize(debate.comment_threads.count, t("debates.debate.comment"), t("debates.debate.comments")), debate_path(debate, anchor: "comments") %>

<%= link_to debate.description, debate %> diff --git a/app/views/debates/_featured_debate.html.erb b/app/views/debates/_featured_debate.html.erb index 602b3d603..fc175fff8 100644 --- a/app/views/debates/_featured_debate.html.erb +++ b/app/views/debates/_featured_debate.html.erb @@ -8,8 +8,7 @@

<%= link_to featured_debate.title, featured_debate %>

  - <%= pluralize(featured_debate.comment_threads.count, - t("debates.show.comment"), t("debates.show.comments")) %> + <%= link_to pluralize(featured_debate.comment_threads.count, t("debates.show.comment"), t("debates.show.comments")), debate_path(featured_debate, anchor: "comments") %>

<%= link_to featured_debate.description, featured_debate %> diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index 642515185..9ec936163 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -4,11 +4,11 @@  <%= link_to t("debates.show.back_link"), debates_path, class: 'left back' %>
<%= image_tag('user_default.jpg', class: 'author-photo', size: '32x32') %> - <%= @debate.author.name %> •  <%= l @debate.created_at.to_date %>  •  <%= pluralize(@debate.comment_threads.count, t("debates.show.comment"), t("debates.show.comments")) %> + <%= @debate.author.name %> •  <%= l @debate.created_at.to_date %>  •  <%= link_to pluralize(@debate.comment_threads.count, t("debates.show.comment"), t("debates.show.comments")), "#comments" %>

<%= @debate.title %>

<%= @debate.description %> -

<%= render 'shared/tags', debate: @debate %>

+ <%= render 'shared/tags', debate: @debate %>

<%= social_share_button_tag(@debate.title) %>