Adds styles for comments

This commit is contained in:
Alberto Garcia Cabeza
2015-07-30 13:59:35 +02:00
parent c3aca6ac56
commit d8d03604b9
6 changed files with 95 additions and 26 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -8,7 +8,7 @@
// 05.1. Debates Index // 05.1. Debates Index
// 05.2. Debates Show // 05.2. Debates Show
// 06. Comments // 06. Comments
// 06. Tags // 07. Tags
// //
// 01. Variables // 01. Variables
@@ -24,6 +24,9 @@ $brand: #0077B9;
$debates: #008CCF; $debates: #008CCF;
$comments-bg: #FAF9F8; $comments-bg: #FAF9F8;
$comments-info: #A5B2B9;
$comments-text: #3F4549;
$header-color: #292B33; $header-color: #292B33;
$link: #0077B9; $link: #0077B9;
@@ -291,6 +294,7 @@ header {
.debate-show { .debate-show {
color: $text-medium; color: $text-medium;
margin-top: $line-height; margin-top: $line-height;
margin-bottom: $line-height*2;
padding: 0 $line-height/2; padding: 0 $line-height/2;
.back { .back {
@@ -398,6 +402,10 @@ header {
width: 1px; width: 1px;
} }
} }
.publish-comment {
margin-top: $line-height;
}
} }
// 06. Comments // 06. Comments
@@ -405,13 +413,65 @@ header {
.comments { .comments {
background: $comments-bg; background: $comments-bg;
margin-top: $line-height*2; background-image: url('comments_divider.png');
background-repeat: repeat-x;
padding-top: $line-height; padding-top: $line-height;
padding-bottom: $line-height*4;
h2 { h2 {
margin: 0; margin: 0;
font-weight: bold; font-weight: bold;
} }
.comment {
margin: $line-height/4 0;
p {
color: $comments-text;
font-size: rem-calc(15);
margin-bottom: 0;
}
a {
color: $comments-info;
}
.user-photo {
border-radius: 2px;
display: inline-block;
height: 32px;
line-height: $line-height*2;
margin-right: $line-height/4;
vertical-align: top;
width: 32px;
}
.comment-body {
margin-left: $line-height*1.6;
.reply {
font-size: rem-calc(12);
font-weight: lighter;
}
}
.comment-children {
border-left: 1px dotted $border;
margin-left: $line-height*1.6;
padding-left: $line-height/4;
@media only screen and (max-width: 40em) {
margin-left: $line-height/1.5;
}
}
.comment-info {
color: $comments-info;
font-size: rem-calc(13);
font-weight: lighter;
vertical-align: middle;
}
}
} }
// 07. Tags // 07. Tags

View File

@@ -1,13 +1,18 @@
<div id="comment-<%= comment.id %>" class='comment' style="padding-bottom:30px"> <div class="row">
<p><%= comment.user.name %></p> <div id="comment-<%= comment.id %>" class="small-12 column comment">
<p>hace <%= time_ago_in_words(comment.created_at) %></p>
<p><%= comment.body %></p>
<div style="margin-left:50px"> <%= image_tag('user_default_2.jpg', class: 'user-photo left', size: '32x32') %>
<%= render comment.children %>
</div>
<div style="margin-left:50px"> <div class="comment-body">
<%= render 'comments/form', parent: comment %> <span class="comment-info">
</div> <%= comment.user.name %>&nbsp;&bullet;&nbsp;<%= time_ago_in_words(comment.created_at) %>
</span>
<p><%= comment.body %></p>
<p class="reply"><%= render 'comments/form', parent: comment %></p>
</div>
<div class="comment-children">
<%= render comment.children %>
</div>
</div>
</div> </div>

View File

@@ -6,6 +6,6 @@
<%= f.hidden_field :commentable_type, value: parent.class %> <%= f.hidden_field :commentable_type, value: parent.class %>
<%= f.hidden_field :commentable_id, value: parent.id %> <%= f.hidden_field :commentable_id, value: parent.id %>
<%= f.submit comment_button_text(parent), class: "button radius" %> <%= f.submit comment_button_text(parent), class: "button radius small" %>
<% end %> <% end %>
</div> </div>

View File

@@ -4,7 +4,7 @@
<div class="small-12 medium-9 column"> <div class="small-12 medium-9 column">
<%= link_to "&lt;&nbsp;".html_safe + t("debates.show.back_link"), debates_path, class: 'left back' %> <%= link_to "&laquo;&nbsp;".html_safe + t("debates.show.back_link"), debates_path, class: 'left back' %>
<h1><%= @debate.title %></h1> <h1><%= @debate.title %></h1>
<div class="debate-info"> <div class="debate-info">
@@ -40,6 +40,10 @@
<p class="total-votes"><%= pluralize(@debate.total_votes, t("debates.debate.vote"), t("debates.debate.votes")) %></p> <p class="total-votes"><%= pluralize(@debate.total_votes, t("debates.debate.vote"), t("debates.debate.votes")) %></p>
</div> </div>
</div> </div>
<div class="small-12 medium-3 column text-center publish-comment">
<%= link_to t("debates.show.leave_comment"), "#comments", :class => 'button radius expand' %>
</div>
</div> </div>
</section> </section>
@@ -47,7 +51,7 @@
<div class="row"> <div class="row">
<div id="comments" class="small-12 column"> <div id="comments" class="small-12 column">
<h2><%= t("debates.show.comments") %></h2> <h2><%= t("debates.show.comments") %></h2>
<div style="padding-bottom:60px"> <div>
<%= t("debates.show.leave_comment") %> <%= t("debates.show.leave_comment") %>
<%= render 'comments/form', parent: @debate %> <%= render 'comments/form', parent: @debate %>
</div> </div>