From 8401a6149ca36a9dece68c84507f7793a7ab985e Mon Sep 17 00:00:00 2001
From: sean1138 <sean@vsxd.com>
Date: Wed, 13 Jan 2021 07:02:17 -0500
Subject: [PATCH] tweak toolbar selected style, use classes more like original
 project instead of IDs on the toolbar LIs

---
 system/includes/functions.php    | 28 ++++++++++++++--------------
 system/resources/css/toolbar.css | 37 ++++++++++++++++++-------------------
 2 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/system/includes/functions.php b/system/includes/functions.php
index a6eb2dc..a58db44 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -2767,28 +2767,28 @@ function toolbar()
     <link href="{$base}system/resources/css/toolbar.css" rel="stylesheet" />
 EOF;
     echo '<div id="toolbar"><ul>';
-    echo '<li id="lAdmin"><a href="' . $base . 'admin">' . i18n('Admin') . '</a></li>';
+    echo '<li class="tb-admin"><a href="' . $base . 'admin">' . i18n('Admin') . '</a></li>';
     if ($role === 'admin') {
-        echo '<li id="lPosts"><a href="' . $base . 'admin/posts">' . i18n('Posts') . '</a></li>';
+        echo '<li class="tb-posts"><a href="' . $base . 'admin/posts">' . i18n('Posts') . '</a></li>';
         if (config('views.counter') == 'true') {
-            echo '<li id="lPopular"><a href="' . $base . 'admin/popular">Popular</a></li>';
+            echo '<li class="tb-popular"><a href="' . $base . 'admin/popular">Popular</a></li>';
         }
     }
-    echo '<li id="lMine"><a href="' . $base . 'admin/mine">' . i18n('Mine') . '</a></li>';
-    echo '<li id="lDraft"><a href="' . $base . 'admin/draft">' . i18n('Draft') . '</a></li>';
-    echo '<li id="lAddContent"><a href="' . $base . 'admin/content">' . i18n('Add_content') . '</a></li>';
+    echo '<li class="tb-mine"><a href="' . $base . 'admin/mine">' . i18n('Mine') . '</a></li>';
+    echo '<li class="tb-draft"><a href="' . $base . 'admin/draft">' . i18n('Draft') . '</a></li>';
+    echo '<li class="tb-addcontent"><a href="' . $base . 'admin/content">' . i18n('Add_content') . '</a></li>';
     if ($role === 'admin') {
-        echo '<li id="lCategories"><a href="' . $base . 'admin/categories">' . i18n('Categories') . '</a></li>';
+        echo '<li class="tb-categories"><a href="' . $base . 'admin/categories">' . i18n('Categories') . '</a></li>';
     }
-    echo '<li id="lEditProfile"><a href="' . $base . 'edit/profile">' . i18n('Edit_profile') . '</a></li>';
-    echo '<li id="lImport"><a href="' . $base . 'admin/import">' . i18n('Import') . '</a></li>';
-    echo '<li id="lBackup"><a href="' . $base . 'admin/backup">' . i18n('Backup') . '</a></li>';
+    echo '<li class="tb-editprofile"><a href="' . $base . 'edit/profile">' . i18n('Edit_profile') . '</a></li>';
+    echo '<li class="tb-import"><a href="' . $base . 'admin/import">' . i18n('Import') . '</a></li>';
+    echo '<li class="tb-backup"><a href="' . $base . 'admin/backup">' . i18n('Backup') . '</a></li>';
     if ($role === 'admin') {
-      echo '<li id="lConfig"><a href="' . $base . 'admin/config">' . i18n('Config') . '</a></li>';
+      echo '<li class="tb-config"><a href="' . $base . 'admin/config">' . i18n('Config') . '</a></li>';
     }
-    echo '<li id="lClearCache"><a href="' . $base . 'admin/clear-cache">' . i18n('Clear_cache') . '</a></li>';
-    echo '<li id="lUpdate"><a href="' . $base . 'admin/update">' . i18n('Update') . '</a></li>';
-    echo '<li id="lLogout"><a href="' . $base . 'logout">' . i18n('Logout') . '</a></li>';
+    echo '<li class="tb-clearcache"><a href="' . $base . 'admin/clear-cache">' . i18n('Clear_cache') . '</a></li>';
+    echo '<li class="tb-update"><a href="' . $base . 'admin/update">' . i18n('Update') . '</a></li>';
+    echo '<li class="tb-logout"><a href="' . $base . 'logout">' . i18n('Logout') . '</a></li>';
 
     echo '</ul></div>';
 }
diff --git a/system/resources/css/toolbar.css b/system/resources/css/toolbar.css
index 8019015..a2c43bb 100644
--- a/system/resources/css/toolbar.css
+++ b/system/resources/css/toolbar.css
@@ -2,19 +2,19 @@ body {
     padding-top: 30px
 }
 
-.admin-front #lAdmin,
-.all-posts #lPosts,
-.admin-popular #lPopular,
-.admin-mine #lMine,
-.admin-draft #lDraft,
-.admin-content #lAddContent,
-.admin-categories #lCategories,
-.edit-profile #lEditProfile,
-.admin-import #lImport,
-.admin-backup #lBackup,
-.admin-config #lConfig,
-.admin-clear-cache #lClearCache,
-.admin-update #lUpdate {
+.admin-front .tb-admin,
+.all-posts .tb-posts,
+.admin-popular .tb-popular,
+.admin-mine .tb-mine,
+.admin-draft .tb-draft,
+.admin-content .tb-addcontent,
+.admin-categories .tb-categories,
+.edit-profile .tb-editprofile,
+.admin-import .tb-import,
+.admin-backup .tb-backup,
+.admin-config .tb-config,
+.admin-clear-cache .tb-clearcache,
+.admin-update .tb-update {
     background:#400;
 }
 
@@ -39,16 +39,16 @@ body {
 
 #toolbar ul {
     margin: 0;
-    padding-top: 5px;
-    padding-bottom: 5px;
+    padding: 0;
     padding-left: 30px;
-    float: left
 }
 
 #toolbar ul li, #toolbar ul li a {
-    float: left;
+    display:inline-block;
     list-style: none;
-    margin: 0
+    margin: 0;
+    height: 30px;
+    line-height: 30px;
 }
 
 #toolbar a {
@@ -57,7 +57,6 @@ body {
     text-decoration: none;
     border-radius: 10px;
     padding: 0 10px;
-    line-height: 1.6
 }
 
 @media all and (max-width: 550px) {