diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index e1aa572b8..7bb363f70 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -79,16 +79,16 @@ table { #count-notifications { background-color: $color-theme-primary; + border-radius: 5px; color: $color-wild-sand; font-size: 12px; font-weight: bold; - z-index: 999999; - position: fixed; - margin-top: -10px; margin-left: 10px; + margin-top: -10px; padding-left: 4px; padding-right: 4px; - border-radius: 5px; + position: fixed; + z-index: 999999; } } @@ -99,11 +99,26 @@ table { margin-top: 10px !important; } } + .dropdown-notifications { min-width: 450px; padding-bottom: 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 { background-color: $color-theme-primary; color: $color-wild-sand; diff --git a/app/views/user_notifications/_recent_notifications.html.erb b/app/views/user_notifications/_recent_notifications.html.erb index 07fb24fb3..ed57ce053 100644 --- a/app/views/user_notifications/_recent_notifications.html.erb +++ b/app/views/user_notifications/_recent_notifications.html.erb @@ -2,13 +2,20 @@
  • - <% byebug %> - <% if notification.type_of == :assignment %> + <% if notification.type_of == 'recent_changes' %> +
    <%= image_tag avatar_path(notification.generator_user, :icon_small), class: "avatar" %> +
    + <% end %> + <% if notification.type_of == 'assignment' %> +
    + <%= fa_icon 'newspaper-o' %> +
    <% end %>
    - <%= notification.title %>
    <%= notification.message %><%= notification.title %>
    + <%= l(notification.created_at, format: :full) %> | <%= notification.message %>