diff --git a/public/less/admin/header.less b/public/less/admin/header.less
index 06737fdbc5..efeffcb48a 100644
--- a/public/less/admin/header.less
+++ b/public/less/admin/header.less
@@ -10,17 +10,23 @@
list-style-type: none;
padding: 0px;
position: absolute;
- bottom: 10px;
+ bottom: -10px;
left: 50px;
> li {
float: left;
margin-right: 30px;
+ &.active {
+ border-bottom: 3px solid @brand-primary;
+ padding-bottom: 10px;
+ }
+
> a {
color: white;
text-transform: uppercase;
text-decoration: none;
+ outline: none;
}
}
}
diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js
index d2ea2a9b48..66c4bf316f 100644
--- a/public/src/admin/admin.js
+++ b/public/src/admin/admin.js
@@ -93,26 +93,20 @@
url = 'admin/general/dashboard';
}
- $('#main-menu .nav-list > li').removeClass('active').each(function() {
+ $('#main-menu li').removeClass('active');
+ $('#main-menu a').removeClass('active').each(function() {
var menu = $(this),
- category = menu.parents('.sidebar-nav'),
- href = menu.children('a').attr('href'),
+ href = menu.attr('href'),
isLink = menu.attr('data-link') === '1';
if (!isLink && href && href.slice(1) === url) {
- category.addClass('open');
- menu.addClass('active');
- modifyBreadcrumb(category.find('.nav-header').text(), menu.text());
+ menu
+ .parent().addClass('active')
+ .parents('.menu-item').addClass('active');
}
});
}
- function modifyBreadcrumb() {
- var caret = ' ';
-
- $('#breadcrumbs').html(caret + Array.prototype.slice.call(arguments).join(caret));
- }
-
function setupRestartLinks() {
$('.restart').off('click').on('click', function() {
bootbox.confirm('Are you sure you wish to restart NodeBB?', function(confirm) {
diff --git a/src/views/admin/partials/menu.tpl b/src/views/admin/partials/menu.tpl
index 984d632455..9f6b402457 100644
--- a/src/views/admin/partials/menu.tpl
+++ b/src/views/admin/partials/menu.tpl
@@ -1,9 +1,9 @@