Merge pull request #2692 from consul/admin-menu-toggle

Fixes admin menu toggle
This commit is contained in:
Alberto
2018-06-22 17:34:23 +02:00
committed by GitHub
3 changed files with 54 additions and 13 deletions

View File

@@ -61,6 +61,41 @@ $sidebar-active: #f4fcd0;
[class^="icon-"]:not(.icon-circle) { [class^="icon-"]:not(.icon-circle) {
font-size: $base-font-size; 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 { .menu .menu-text {

View File

@@ -2,11 +2,17 @@
<li> <li>
<%= link_to admin_stats_path, title: t("admin.menu.stats") do %> <%= link_to admin_stats_path, title: t("admin.menu.stats") do %>
<span class="icon-stats"></span> <span class="icon-stats"></span>
<span class="show-for-small-only">
<%= t("admin.menu.stats") %>
</span>
<% end %> <% end %>
</li> </li>
<li> <li>
<%= link_to admin_settings_path, title: t("admin.menu.settings") do %> <%= link_to admin_settings_path, title: t("admin.menu.settings") do %>
<span class="icon-settings"></span> <span class="icon-settings"></span>
<span class="show-for-small-only">
<%= t("admin.menu.settings") %>
</span>
<% end %> <% end %>
</li> </li>
<% end %> <% end %>

View File

@@ -9,20 +9,20 @@
<% if current_user.notifications.unread.count > 0 %> <% if current_user.notifications.unread.count > 0 %>
<span class="icon-circle" aria-hidden="true"></span> <span class="icon-circle" aria-hidden="true"></span>
<span class="icon-notification" aria-hidden="true" <span class="icon-notification" aria-hidden="true"
title="<%= t('layouts.header.notification_item.new_notifications', title="<%= t("layouts.header.notification_item.new_notifications",
count: current_user.notifications_count).html_safe %>"> count: current_user.notifications_count).html_safe %>">
</span> </span>
<small class="show-for-small-only"> <span class="show-for-small-only">
<%= t('layouts.header.notification_item.new_notifications', <%= t("layouts.header.notification_item.new_notifications",
count: current_user.notifications_count).html_safe %> count: current_user.notifications_count).html_safe %>
</small> </span>
<% else %> <% else %>
<span class="icon-no-notification" aria-hidden="true" <span class="icon-no-notification" aria-hidden="true"
title="<%= t('layouts.header.notification_item.no_notifications') %>"> title="<%= t("layouts.header.notification_item.no_notifications") %>">
</span>
<span class="show-for-small-only">
<%= t("layouts.header.notification_item.no_notifications") %>
</span> </span>
<small class="show-for-small-only">
<%= t('layouts.header.notification_item.no_notifications') %>
</small>
<% end %> <% end %>
<% end %> <% end %>