From c60cbce14ae8b2df696a2faab5c5bb7e0c5202cf Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 26 Sep 2014 15:46:00 -0400 Subject: [PATCH] acp menu - theming completified --- public/less/admin/admin.less | 11 +++---- public/src/forum/admin/footer.js | 4 +-- src/views/admin/header.tpl | 50 +++++++++++++++++++++++--------- 3 files changed, 45 insertions(+), 20 deletions(-) diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less index e394587e4b..6ea7af16c4 100644 --- a/public/less/admin/admin.less +++ b/public/less/admin/admin.less @@ -30,13 +30,13 @@ .sidebar-nav { margin-top: 1px; overflow: hidden; - .transition(.4s ease-in-out height); - height: 250px; + .transition(.4s ease-in-out max-height); max-height: 100%; cursor: pointer; - - &.closed { - height: 38px; + max-height: 38px; + + &.open { + max-height: 500px; } .nav-header { @@ -46,6 +46,7 @@ background-color: #272727; text-shadow: 0px 0px 2px #111; padding: 10px; + .user-select(none); } .nav-list { diff --git a/public/src/forum/admin/footer.js b/public/src/forum/admin/footer.js index c5fc327d72..dbdb4a55e0 100644 --- a/public/src/forum/admin/footer.js +++ b/public/src/forum/admin/footer.js @@ -31,8 +31,8 @@ define('forum/admin/footer', ['forum/admin/settings'], function(Settings) { }); function setupMainMenu() { - $('.sidebar-nav').on('click', function() { - $(this).toggleClass('closed'); + $('.sidebar-nav .nav-header').on('click', function() { + $(this).toggleClass('open'); }); } diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tpl index 226ebab7c2..75f24e4705 100644 --- a/src/views/admin/header.tpl +++ b/src/views/admin/header.tpl @@ -103,33 +103,57 @@