From d091729de3145b931b86049b6ea6bd6cf30662b3 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 20 Aug 2015 19:39:44 -0400 Subject: [PATCH] search bar and restart menu completed --- public/less/admin/admin.less | 24 -------- public/less/admin/header.less | 27 ++++++++- public/src/admin/modules/search.js | 6 -- src/views/admin/header.tpl | 91 ------------------------------ src/views/admin/partials/menu.tpl | 13 +++-- 5 files changed, 34 insertions(+), 127 deletions(-) diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less index 21d53cd28d..72a81751bb 100644 --- a/public/less/admin/admin.less +++ b/public/less/admin/admin.less @@ -155,30 +155,6 @@ } } - #acp-search { - input { - background: black; - border: 0; - color: white; - box-shadow: none; - .transition(.4s ease width); - font-family: @font-family-monospace; - width: 30px; - height: 30px; - vertical-align: -30%; - border-radius: 0; - - &:focus { - width: 200px; - } - } - - .search-match { - font-weight: 700; - color: black; - } - } - #taskbar { display: none; /* not sure why I have to do this, but it only seems to show up on prod */ } diff --git a/public/less/admin/header.less b/public/less/admin/header.less index 95088412fc..78fce4afcc 100644 --- a/public/less/admin/header.less +++ b/public/less/admin/header.less @@ -19,12 +19,37 @@ position: absolute; right: 30px; bottom: 0px; - + #user_dropdown { font-size: 25px; } } + #acp-search { + margin-top: 2px; + margin-right: 20px; + + input { + padding: 10px 20px; + width: 250px; + height: 44px; + background-color: rgba(0, 0, 0, 0.2); + border-radius: 3px; + box-shadow: none; + .transition(.4s ease background-color); + + &:focus { + background-color: #eee; + color: #333; + } + } + + .search-match { + font-weight: 700; + color: black; + } + } + > ul { list-style-type: none; padding: 0px; diff --git a/public/src/admin/modules/search.js b/public/src/admin/modules/search.js index 781f4ade9e..aafecc9b6d 100644 --- a/public/src/admin/modules/search.js +++ b/public/src/admin/modules/search.js @@ -54,10 +54,6 @@ define(function() { routes.push($(link).attr('href')); }); - input.on('blur', function() { - $(this).val('').attr('placeholder', '/'); - }); - input.on('keyup focus', function() { var $input = $(this), value = $input.val().toLowerCase(), @@ -67,8 +63,6 @@ define(function() { return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase(); } - $input.attr('placeholder', ''); - firstResult = null; if (value.length >= 3) { diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tpl index 60c32d5026..11fd6bbd93 100644 --- a/src/views/admin/header.tpl +++ b/src/views/admin/header.tpl @@ -61,96 +61,5 @@ - - - -
\ No newline at end of file diff --git a/src/views/admin/partials/menu.tpl b/src/views/admin/partials/menu.tpl index a831c10d9e..51e1f3e36f 100644 --- a/src/views/admin/partials/menu.tpl +++ b/src/views/admin/partials/menu.tpl @@ -111,11 +111,6 @@ View Forum -
  • - - View Profile - -
  • @@ -133,5 +128,13 @@
    • + \ No newline at end of file