diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 7885a6c7..e1e30d57 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -708,8 +708,7 @@ a.tag:hover { .news-item { width: 100%; float: left; - margin: 1.25em 0 1.25em 0; - padding: 1em 0 0 0; + padding: 1.2em 0 1.2em 0; border-top: 1px solid #EBEBEB; } .news-item:nth-of-type(1) { @@ -749,12 +748,6 @@ a.tag:hover { } .news-item.comment .icon { background: #DAEEA5; -} -.news-item.comment.for-me .icon, .news-item.tip.for-me .icon { - -} -.news-item .icon-mini { - } .news-item.update .icon { background: #E93250; @@ -762,9 +755,6 @@ a.tag:hover { .news-item.tip .icon { background: #FFCC00; } -.news-item.follow { - margin: .3em 0 .3em 0; -} .news-item.follow .icon { background: #3399CC; } @@ -773,11 +763,16 @@ a.tag:hover { position: relative; width: 100%; float: left; + + .text { + float: left; + margin-top: .45em; + } } .news-item .date { float: right; font-size: 11px; - margin-top: .5em; + margin-top: 1.1em; } .news-item .date a { color: #aaa!important; @@ -828,18 +823,15 @@ a.tag:hover { .news-item .actions { font-size: 11px; } -.news-item > .actions { - margin-left: 61px!important; -} .news-item .actions a { margin-right: 6px; } .news-item .content { padding: 0; - margin-left: 32px; + margin-left: 61px; } -.news-item.comment .actions, .news-item.comment .content { - margin-left: 20px; +.news-item .actions, .news-item.comment .content { + margin-left: 61px; } .news-item.comment .comments .actions { margin-left: 47px; diff --git a/views/_news.erb b/views/_news.erb index 2cfe2a56..69ca1cc1 100644 --- a/views/_news.erb +++ b/views/_news.erb @@ -22,20 +22,22 @@
- <% if current_site && current_site.id == actioning_site.id %> - You - <% else %> - <% if actioning_site.supporter? %><% end %><%= actioning_site.username %> - <% end %> +
+ <% if current_site && current_site.id == actioning_site.id %> + You + <% else %> + <% if actioning_site.supporter? %><% end %><%= actioning_site.username %> + <% end %> - started following + started following - <% if current_site && event_site.id == current_site.id %> - you - <% else %> - the site of - <% if event_site.supporter? %><% end %><%= event_site.username %> - <% end %> + <% if current_site && event_site.id == current_site.id %> + you + <% else %> + the site of + <% if event_site.supporter? %><% end %><%= event_site.username %> + <% end %> +
<%= event.created_at.ago %> @@ -45,12 +47,14 @@
- <% event_site = event.site_dataset.select(:id, :username, :title, :domain).first %> - <% if current_site && event_site.id == current_site.id %> - Your site was updated. - <% else %> - <%= event_site.title.shorten(45) %> has been updated. - <% end %> +
+ <% event_site = event.site_dataset.select(:id, :username, :title, :domain).first %> + <% if current_site && event_site.id == current_site.id %> + Your site was updated. + <% else %> + <%= event_site.title.shorten(45) %> has been updated. + <% end %> +
<%= event.created_at.ago %>