Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

style activity stream

Browse source
This commit is contained in:
Felix Niklas 2014-07-24 00:13:40 +02:00
parent 820935be3f
commit a647e4f5d4
2 changed files with 45 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco
View file

@ -1,9 +1,15 @@
<div class="span3"> <h2 class="can-move"><%- @T( @head ) %></h2>
<h2 class="can-move"><%- @T( @head ) %></h2> <% for item in @items: %>
<dl> <div class="level-1 activity-entry horizontal">
<% for item in @items: %> <div class="avatar" style="background-image: url(https://pbs.twimg.com/profile_images/3510491848/156dbaec406561cb3e680dc3795b0f86.jpeg)"></div>
<dt><span class="user-popover" data-id="<%= item.created_by_id %>">"<%= item.created_by.displayName() %>"</span></dt> <div class="activity-body flex horizontal">
<dd><%- @T( item.type ) %> <a href="<%- item.link %>"><%= item.object_name %><% if item.title: %> (<%= item.title %>)<% end %></a> <span class="humanTimeFromNow" data-time="<%- item.created_at %>">?</span> <%- @T('ago') %>.</dd> <div class="activity-message flex">
<% end %> <span class="user-popover" data-id="<%= item.created_by_id %>"><%= item.created_by.displayName() %></span> <%- @T( item.type ) %> <a href="<%- item.link %>"><%= item.object_name %><% if item.title: %> (<%= item.title %>)<% end %></a>
</dl> <div class="activity-time humanTimeFromNow" data-time="<%- item.created_at %>">?</div>
</div>
<div class="activity-icon">
<span class="priority icon"></span>
</div>
</div>
</div> </div>
<% end %>

33
app/assets/stylesheets/zzz.css.erb
View file

@ -1,6 +1,6 @@
body { body {
font-family: "Fira Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Fira Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
line-height: 1.7; line-height: 1.45;
font-weight: normal; font-weight: normal;
background: #2c2d36; background: #2c2d36;
} }
@ -435,7 +435,7 @@ h1 {
h2, h2,
h2.popover-title { h2.popover-title {
font-size: 19px; font-size: 22px;
line-height: 25px; line-height: 25px;
color: rgba(0,8,14,.73); color: rgba(0,8,14,.73);
} }
@ -2098,9 +2098,38 @@ footer {
} }
.activity.sidebar { .activity.sidebar {
width: 370px;
padding: 0 26px 0 14px;
border-left: 1px solid #e8e8e8; 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;
}
/* /*
---------------- ----------------