diff --git a/app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco b/app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco index d676c2a52..4683ac703 100644 --- a/app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco +++ b/app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco @@ -1,9 +1,15 @@ -
-

<%- @T( @head ) %>

-
- <% for item in @items: %> -
"<%= item.created_by.displayName() %>"
-
<%- @T( item.type ) %> <%= item.object_name %><% if item.title: %> (<%= item.title %>)<% end %> ? <%- @T('ago') %>.
- <% end %> -
+

<%- @T( @head ) %>

+<% for item in @items: %> +
+
+
+
+ <%= item.created_by.displayName() %> <%- @T( item.type ) %> <%= item.object_name %><% if item.title: %> (<%= item.title %>)<% end %> +
?
+
+
+ +
+
+<% end %> diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 6c9c6604d..1804f6d3f 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -1,6 +1,6 @@ body { font-family: "Fira Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; - line-height: 1.7; + line-height: 1.45; font-weight: normal; background: #2c2d36; } @@ -435,7 +435,7 @@ h1 { h2, h2.popover-title { - font-size: 19px; + font-size: 22px; line-height: 25px; color: rgba(0,8,14,.73); } @@ -2098,9 +2098,38 @@ footer { } .activity.sidebar { + width: 370px; + padding: 0 26px 0 14px; border-left: 1px solid #e8e8e8; } + .activity h2 { + margin-left: 5px; + margin-bottom: 15px; + } + + .activity-entry { + padding-top: 16px; + } + + .activity-body { + padding: 0 0 12px 14px; + border-bottom: 1px solid #f2f2f3; + } + + .activity-message { + padding-right: 20px; + } + + .activity-time { + margin-top: 2px; + color: #a1a4a7; + } + + .activity .priority.icon:after { + background: white; + } + /* ----------------