scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix activity card visuals

Browse source
This commit is contained in:
Mojca Lorber 2019-04-10 12:37:13 +02:00
parent 0fb745a38c
commit c8ddae4d1e
2 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/assets/stylesheets/global_activities.scss
View file

@ -69,8 +69,9 @@
.activity-card {
border-radius: 5px;
margin-right: 10px;
padding: 5px;
margin-right: 20px;
padding: 10px;
padding-left: 40px;
&:hover {
background-color: $brand-primary-light;
@ -89,6 +90,15 @@
margin-left: 15px;
}
}
p {
margin-bottom: 3px;
text-indent: -35px;
}
.atwho-user-img-popover {
margin: -5px 0;
}
}
.no-activities-message {

36
app/views/global_activities/_activity.html.erb
View file

@ -1,22 +1,20 @@
<div class="activity-card">
<div class="row">
<div class="col-xs-12">
<% if activity.old_activity? %>
<%= sanitize_input(activity.message) %>
<% else %>
<%= generate_activity_content(activity) %>
<% end %>
</div>
</div>
<div class="pull-left activity-timestamp">
<%= activity.created_at.strftime('%H:%M') %>
</div>
<div class="row navigational-breadcrumbs">
<% unless activity.old_activity? %>
<% if activity.subject_type.present? %>
<%= render partial: "global_activities/references/#{activity.subject_type.underscore}.html.erb",
locals: { team: activity.team, subject: activity.subject, breadcrumbs: activity.breadcrumbs } %>
<div class="row">
<div class="col-xs-12">
<% if activity.old_activity? %>
<%= sanitize_input(activity.message) %>
<% else %>
<%= generate_activity_content(activity) %>
<% end %>
<% end %>
</div>
</div>
<div class="pull-left activity-timestamp">
<%= activity.created_at.strftime('%H:%M') %>
</div>
<div class="row navigational-breadcrumbs">
<% unless activity.old_activity? %>
<% if activity.subject_type.present? %>
<%= render partial: "global_activities/references/#{activity.subject_type.underscore}.html.erb",
locals: { team: activity.team, subject: activity.subject, breadcrumbs: activity.breadcrumbs } %>
<% end %>
<% end %>
</div>