diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 351859ae0..56f9a8106 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -61,6 +61,41 @@ $sidebar-active: #f4fcd0; [class^="icon-"]:not(.icon-circle) { font-size: $base-font-size; } + + @include breakpoint(small only) { + + .top-bar-left ul { + display: inline-block; + } + + .top-bar-right { + + .submenu { + border: 0; + display: block; + margin-top: 0; + position: initial; + width: 100%; + } + + .is-active { + font-weight: normal; + text-decoration: none; + } + + .is-submenu-item { + padding: $line-height / 2 0; + } + + a { + font-weight: normal !important; + } + } + + [class^="icon-"] { + display: none; + } + } } .menu .menu-text { diff --git a/app/views/admin/shared/_admin_shortcuts.html.erb b/app/views/admin/shared/_admin_shortcuts.html.erb index 8a292d6bb..5371cd27e 100644 --- a/app/views/admin/shared/_admin_shortcuts.html.erb +++ b/app/views/admin/shared/_admin_shortcuts.html.erb @@ -2,11 +2,17 @@
  • <%= link_to admin_stats_path, title: t("admin.menu.stats") do %> + + <%= t("admin.menu.stats") %> + <% end %>
  • <%= link_to admin_settings_path, title: t("admin.menu.settings") do %> + + <%= t("admin.menu.settings") %> + <% end %>
  • <% end %> \ No newline at end of file diff --git a/app/views/layouts/_notification_item.html.erb b/app/views/layouts/_notification_item.html.erb index 034726ea9..5e2d6060c 100644 --- a/app/views/layouts/_notification_item.html.erb +++ b/app/views/layouts/_notification_item.html.erb @@ -1,28 +1,28 @@ <% if user_signed_in? %>
  • - <%= link_to notifications_path, rel: "nofollow", + <%= link_to notifications_path, rel: "nofollow", class: "notifications" do %> <%= t("layouts.header.notification_item.notifications") %> - + <% if current_user.notifications.unread.count > 0 %> - - - <%= t('layouts.header.notification_item.new_notifications', + + <%= t("layouts.header.notification_item.new_notifications", count: current_user.notifications_count).html_safe %> - - <% else %> - - - <%= t('layouts.header.notification_item.no_notifications') %> - + <% else %> + + + <%= t("layouts.header.notification_item.no_notifications") %> + <% end %> <% end %>