scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-28 09:43:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

added assignment image

Browse source
This commit is contained in:
zmagod 2016-09-29 16:05:43 +02:00
parent e1a1b93d44
commit 60a503f115
2 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/assets/stylesheets/themes/scinote.scss
View file

@ -79,16 +79,16 @@ table {
#count-notifications { #count-notifications {
background-color: $color-theme-primary; background-color: $color-theme-primary;
border-radius: 5px;
color: $color-wild-sand; color: $color-wild-sand;
font-size: 12px; font-size: 12px;
font-weight: bold; font-weight: bold;
z-index: 999999;
position: fixed;
margin-top: -10px;
margin-left: 10px; margin-left: 10px;
margin-top: -10px;
padding-left: 4px; padding-left: 4px;
padding-right: 4px; padding-right: 4px;
border-radius: 5px; position: fixed;
z-index: 999999;
} }
} }
@ -99,11 +99,26 @@ table {
margin-top: 10px !important; margin-top: 10px !important;
} }
} }
.dropdown-notifications { .dropdown-notifications {
min-width: 450px; min-width: 450px;
padding-bottom: 0; padding-bottom: 0;
padding-top: 0; padding-top: 0;
.notification {
border-bottom: 1px solid $color-alto;
padding-bottom: 10px;
padding-top: 10px;
}
.text-center {
padding-top: 10px;
}
.assignment {
}
.notifications-dropdown-header { .notifications-dropdown-header {
background-color: $color-theme-primary; background-color: $color-theme-primary;
color: $color-wild-sand; color: $color-wild-sand;

13
app/views/user_notifications/_recent_notifications.html.erb
View file

@ -2,13 +2,20 @@
<li class="notification"> <li class="notification">
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<% byebug %> <% if notification.type_of == 'recent_changes' %>
<% if notification.type_of == :assignment %> <div class="text-center">
<%= image_tag avatar_path(notification.generator_user, :icon_small), class: "avatar" %> <%= image_tag avatar_path(notification.generator_user, :icon_small), class: "avatar" %>
</div>
<% end %>
<% if notification.type_of == 'assignment' %>
<div class="text-center">
<span class="assignment"><%= fa_icon 'newspaper-o' %></span>
</div>
<% end %> <% end %>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<strong><%= notification.title %></strong> <br> <%= notification.message %></ <strong><%= notification.title %></strong> <br>
<%= l(notification.created_at, format: :full) %> | <%= notification.message %>
</div> </div>
</div> </div>
<li> <li>