| | |
| 3 | 3 | <div id="recent_comments"> |
| 4 | 4 | <h2>Recent comments on your commits</h2> |
| 5 | 5 | <% @recent_comments.each do |comment| -%> |
| 6 | | <div class="comment"> |
| 7 | | <div class="body"><%= simple_format(sanitize(comment.body)) -%></div> |
| 6 | <div class="comment excerpt"> |
| 8 | 7 | <p class="byline hint"> |
| 9 | | on <%= link_to h(comment.repository.name), project_repository_comments_path(comment.project, comment.repository, :anchor => dom_id(comment)) -%> |
| 8 | <%= link_to(h(comment.user.login), comment.user) -%> |
| 9 | on <%= link_to h(comment.project.title), comment.project -%>/<%= link_to h(comment.repository.name), project_repository_comments_path(comment.project, comment.repository, :anchor => dom_id(comment)) -%> |
| 10 | 10 | <% unless comment.sha1.blank? -%> |
| 11 | 11 | (<%= link_to h(comment.sha1[0..6]), project_repository_commit_path(comment.project, comment.repository, comment.sha1) -%>) |
| 12 | 12 | <% end -%> |
| 13 | | in <%= link_to h(comment.project.title), comment.project -%> by |
| 14 | | <%= link_to(h(comment.user.login), comment.user) -%> |
| 13 | </p> |
| 14 | <p class="body"><%= truncate(strip_tags(comment.body), 65) -%></p> |
| 15 | <p class="byline hint"> |
| 15 | 16 | <%= time_ago_in_words(comment.created_at) -%> ago |
| 16 | 17 | </p> |
| 17 | 18 | </div> |
| … | … | |
| 23 | 23 | </div> |
| 24 | 24 | |
| 25 | 25 | <div id="clone_list"> |
| 26 | | <h2>Clones of your project repositories</h2> |
| 26 | <h2>Activity in clones of your projects</h2> |
| 27 | 27 | <ul> |
| 28 | 28 | <% @repository_clones.each do |repos| -%> |
| 29 | 29 | <li class="repos"> |
| toggle raw diff |
--- a/app/views/site/dashboard.html.erb
+++ b/app/views/site/dashboard.html.erb
@@ -3,15 +3,16 @@
<div id="recent_comments">
<h2>Recent comments on your commits</h2>
<% @recent_comments.each do |comment| -%>
- <div class="comment">
- <div class="body"><%= simple_format(sanitize(comment.body)) -%></div>
+ <div class="comment excerpt">
<p class="byline hint">
- on <%= link_to h(comment.repository.name), project_repository_comments_path(comment.project, comment.repository, :anchor => dom_id(comment)) -%>
+ <%= link_to(h(comment.user.login), comment.user) -%>
+ on <%= link_to h(comment.project.title), comment.project -%>/<%= link_to h(comment.repository.name), project_repository_comments_path(comment.project, comment.repository, :anchor => dom_id(comment)) -%>
<% unless comment.sha1.blank? -%>
(<%= link_to h(comment.sha1[0..6]), project_repository_commit_path(comment.project, comment.repository, comment.sha1) -%>)
<% end -%>
- in <%= link_to h(comment.project.title), comment.project -%> by
- <%= link_to(h(comment.user.login), comment.user) -%>
+ </p>
+ <p class="body"><%= truncate(strip_tags(comment.body), 65) -%></p>
+ <p class="byline hint">
<%= time_ago_in_words(comment.created_at) -%> ago
</p>
</div>
@@ -22,7 +23,7 @@
</div>
<div id="clone_list">
- <h2>Clones of your project repositories</h2>
+ <h2>Activity in clones of your projects</h2>
<ul>
<% @repository_clones.each do |repos| -%>
<li class="repos"> |
| | |
| 668 | 668 | |
| 669 | 669 | div.comment { |
| 670 | 670 | border-bottom: 1px solid #ccc; |
| 671 | | margin-bottom: 1em; |
| 671 | margin-bottom: 10px; |
| 672 | padding-bottom: 10px; |
| 672 | 673 | width: 63%; |
| 673 | 674 | } |
| 674 | 675 | div.comment .body { |
| … | … | |
| 677 | 677 | } |
| 678 | 678 | |
| 679 | 679 | p.byline { |
| 680 | | font-size: 85%; |
| 680 | font-size: 10px; |
| 681 | 681 | } |
| 682 | 682 | |
| 683 | 683 | .hint { |
| … | … | |
| 864 | 864 | padding-right: 10px; |
| 865 | 865 | border-right: 1px dotted #dedede; |
| 866 | 866 | } |
| 867 | #site #recent_comments p { margin-bottom: 0; } |
| 867 | 868 | #site #recent_comments .comment { width: 100%;} |
| 868 | 869 | #site #recent_comments .comment .body { |
| 869 | | font-size: 90%; |
| 870 | font-size: 12px; |
| 870 | 871 | } |
| 871 | 872 | |
| 872 | 873 | #site #clone_list { |
| toggle raw diff |
--- a/public/stylesheets/base.css
+++ b/public/stylesheets/base.css
@@ -668,7 +668,8 @@ ul.tab_menu li.selected {
div.comment {
border-bottom: 1px solid #ccc;
- margin-bottom: 1em;
+ margin-bottom: 10px;
+ padding-bottom: 10px;
width: 63%;
}
div.comment .body {
@@ -676,7 +677,7 @@ div.comment .body {
}
p.byline {
- font-size: 85%;
+ font-size: 10px;
}
.hint {
@@ -863,9 +864,10 @@ ul.diff_stats small.deletions { color: #DC0000; }
padding-right: 10px;
border-right: 1px dotted #dedede;
}
+#site #recent_comments p { margin-bottom: 0; }
#site #recent_comments .comment { width: 100%;}
#site #recent_comments .comment .body {
- font-size: 90%;
+ font-size: 12px;
}
#site #clone_list { |
