From f528829c67c5de2c0e586c7e0b2ee7033db0766c Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Sat, 13 Aug 2022 02:00:24 -0300 Subject: [PATCH 01/10] Testing a shorter main menu + top menu Signed-off-by: RD WebDesign --- scripts/pi-hole/php/header_authenticated.php | 52 ++--- scripts/pi-hole/php/sidebar.php | 214 +++++++------------ style/pi-hole.css | 54 +++-- style/themes/default-dark.css | 19 +- style/themes/default-darker.css | 20 ++ style/themes/default-light.css | 7 + 6 files changed, 195 insertions(+), 171 deletions(-) diff --git a/scripts/pi-hole/php/header_authenticated.php b/scripts/pi-hole/php/header_authenticated.php index 9d03aca42..3c1070cc6 100644 --- a/scripts/pi-hole/php/header_authenticated.php +++ b/scripts/pi-hole/php/header_authenticated.php @@ -185,8 +185,7 @@ function getTemperature()
    • diff --git a/scripts/pi-hole/php/sidebar.php b/scripts/pi-hole/php/sidebar.php index a34cdfea9..810670c3a 100644 --- a/scripts/pi-hole/php/sidebar.php +++ b/scripts/pi-hole/php/sidebar.php @@ -76,31 +76,93 @@ Dashboard - - 0 && $auth) { - ?> -
  • - - Logout + +
  • + + Tools + + + + +
    • - - - 0 && !$auth) { - ?> - class="active"> - - Login + + class="active"> + + Settings - -
  • Analysis
    • @@ -226,116 +288,6 @@ - -
  • System
    • - -
  • - - Tools - - - - - - -
    • - - class="active"> - - Settings - - - - -
  • Support
    • - -
  • - - Documentation - -
    • - -
  • - - Pi-hole Forum - -
    • - -
  • - - Donate - -
    • diff --git a/style/pi-hole.css b/style/pi-hole.css index 3eca6adce..321f8454b 100644 --- a/style/pi-hole.css +++ b/style/pi-hole.css @@ -742,31 +742,59 @@ li:not(.menu-open) .treeview-menu .warning-count { height: 50px; } -.navbar-nav > .user-menu > .dropdown-menu > .user-body a { - background: transparent !important; +.navbar-nav > .user-menu > .dropdown-menu > li.user-header { + height: auto; + padding: 15px 15px 5px; +} + +.navbar-nav > .user-menu > .dropdown-menu > li.user-header > img { + height: 50px; + width: 50px; + border: none; +} + +.navbar-nav > .user-menu > .dropdown-menu > .user-body { + border-radius: 0; + border-color: #fff; } /*** Donate button - navbar ***/ -.main-header .navbar-custom-menu .user-footer .donate { - margin: 15px; +.navbar-nav > .user-menu > .dropdown-menu > .user-body a.donate { + margin: 0; padding: 0.8em 1em; - width: calc(100% - 30px); - color: #fff; + width: 100%; + color: #fff !important; background: #96060c; border: none; border-radius: 6px; } -.main-header .navbar-custom-menu .user-footer .donate:hover, -.main-header .navbar-custom-menu .user-footer .donate:active, -.main-header .navbar-custom-menu .user-footer .donate:active:hover, -.main-header .navbar-custom-menu .user-footer .donate:focus, -.main-header .navbar-custom-menu .user-footer .donate:active:focus { +.navbar-nav > .user-menu > .dropdown-menu > .user-body a.donate:hover, +.navbar-nav > .user-menu > .dropdown-menu > .user-body a.donate:active, +.navbar-nav > .user-menu > .dropdown-menu > .user-body a.donate:active:hover, +.navbar-nav > .user-menu > .dropdown-menu > .user-body a.donate:focus, +.navbar-nav > .user-menu > .dropdown-menu > .user-body a.donate:active:focus { background: #f60d1a; } -.navbar-custom-menu > .navbar-nav > li:nth-child(1) { - padding: 0 10px 0 0; +.navbar-nav > .user-menu > .dropdown-menu > .user-footer { + padding: 10px 15px; + background: #fff; +} + +.navbar-nav > .user-menu > .dropdown-menu > .user-footer a { + background: transparent !important; + color: #000 !important; + padding: 6px 0; +} + +.navbar-nav > .user-menu > .dropdown-menu { + width: 240px; +} + +.user-menu hr { + margin: 5px 0; + opacity: 0.5; } #apiTokenIframe { diff --git a/style/themes/default-dark.css b/style/themes/default-dark.css index 56363758b..ac54dd81f 100644 --- a/style/themes/default-dark.css +++ b/style/themes/default-dark.css @@ -503,16 +503,33 @@ fieldset[disabled] .form-control { background-color: #353c42; opacity: 1; } + .dropdown-menu { background-color: #22282d; color: #bec5cb; border: 1px solid #4c5761; } .navbar-custom-menu > .navbar-nav > li > .dropdown-menu { - background-color: #4c5761; + background-color: #30383f; color: #bec5cb; border: 1px solid #171c20; } +.navbar-nav > .user-menu > .dropdown-menu > .user-body { + border-color: #bec5cb; +} +.navbar-nav > .user-menu > .dropdown-menu > .user-footer { + background-color: #272c30; +} +.navbar-nav > .user-menu > .dropdown-menu > .user-footer a { + color: #bec5cb !important; +} +.navbar-nav > .user-menu > .dropdown-menu > .user-footer a:hover { + color: #fff !important; +} +.user-menu hr { + border-color: #bec5cb; +} + .table-striped > tbody > tr:nth-of-type(2n + 1) { background-color: #2d343a; } diff --git a/style/themes/default-darker.css b/style/themes/default-darker.css index 8243ccfe7..301e512e2 100644 --- a/style/themes/default-darker.css +++ b/style/themes/default-darker.css @@ -5500,6 +5500,26 @@ link-muted { .content-header { background-color: transparent; } + +.navbar-custom-menu > .navbar-nav > li > .dropdown-menu { + background-color: #30383f; +} +.navbar-nav > .user-menu > .dropdown-menu > .user-body { + border-color: #bec5cb; +} +.navbar-nav > .user-menu > .dropdown-menu > .user-footer { + background-color: #272c30; +} +.navbar-nav > .user-menu > .dropdown-menu > .user-footer a { + color: #bec5cb !important; +} +.navbar-nav > .user-menu > .dropdown-menu > .user-footer a:hover { + color: #fff !important; +} +.user-menu hr { + border-color: #bec5cb; +} + .wrapper, .main-sidebar, .left-side { diff --git a/style/themes/default-light.css b/style/themes/default-light.css index c808eee1a..4371a09c5 100644 --- a/style/themes/default-light.css +++ b/style/themes/default-light.css @@ -54,6 +54,13 @@ .content-header { background-color: transparent; } +.navbar-nav > .user-menu > .dropdown-menu > .user-body { + background: #e4e8f0; +} +.navbar-nav > .user-menu > .dropdown-menu > .user-footer a:hover { + color: #367fa9 !important; +} + .wrapper, .main-sidebar, .left-side { From 46874762d055a210ac7d1eaedf5bd682e2fe44ae Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Sat, 13 Aug 2022 02:05:13 -0300 Subject: [PATCH 02/10] Different order Signed-off-by: RD WebDesign --- scripts/pi-hole/php/sidebar.php | 114 ++++++++++++++++---------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/scripts/pi-hole/php/sidebar.php b/scripts/pi-hole/php/sidebar.php index 810670c3a..93ec701de 100644 --- a/scripts/pi-hole/php/sidebar.php +++ b/scripts/pi-hole/php/sidebar.php @@ -164,63 +164,6 @@ -
  • Analysis
    • - - class="active"> - - Query Log - - - -
  • - - Long-term Data - - - - - -
    • - -
  • Group Management
    • - - class="active"> - - Groups - - - class="active"> - - Clients - - - class="active"> - - Domains - - - class="active"> - - Adlists - - -
  • DNS Control
  • hidden> @@ -288,6 +231,63 @@
    • + +
  • Analysis
    • + + class="active"> + + Query Log + + + +
  • + + Long-term Data + + + + + +
    • + +
  • Group Management
    • + + class="active"> + + Groups + + + class="active"> + + Clients + + + class="active"> + + Domains + + + class="active"> + + Adlists + + From 836b7ab7be460b85e7bb7af17dee3fa5706d2fa6 Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Sat, 13 Aug 2022 02:07:14 -0300 Subject: [PATCH 03/10] Fix logout link Signed-off-by: RD WebDesign --- scripts/pi-hole/php/header_authenticated.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pi-hole/php/header_authenticated.php b/scripts/pi-hole/php/header_authenticated.php index 3c1070cc6..dc44001c4 100644 --- a/scripts/pi-hole/php/header_authenticated.php +++ b/scripts/pi-hole/php/header_authenticated.php @@ -227,7 +227,7 @@ function getTemperature() Pi-hole Forum GitHub
    - Log out + Log out From 17857841abc032ea60cdeda5a26001083ae06c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Sat, 13 Aug 2022 11:14:51 +0200 Subject: [PATCH 04/10] Change left hamburger menu icon to arrows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- scripts/pi-hole/php/header_authenticated.php | 2 +- style/pi-hole.css | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/scripts/pi-hole/php/header_authenticated.php b/scripts/pi-hole/php/header_authenticated.php index dc44001c4..5905ba4f6 100644 --- a/scripts/pi-hole/php/header_authenticated.php +++ b/scripts/pi-hole/php/header_authenticated.php @@ -171,7 +171,7 @@ function getTemperature()