From 8db0957a284caaec65b8d85f4e847a9768367047 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 11 May 2020 16:08:09 +0300 Subject: [PATCH] Minor tweaks * use the background-color property instead of the background shorthand * add multiple classes with one `addClass` call * rename `underline` to `text-underline` * use the CSS class `pointer` instead of adding CSS via JS * change `border-color: transparent` to `border: 0` in the navbar right dropdown image * add image dimensions in the dropdown donate image * remove the obsolete and unneeded `center` element from network.php * remove commented out PHP code from header.php * fix wrong `form-control` class used in buttons Signed-off-by: XhmikosR --- network.php | 10 +++++----- scripts/pi-hole/js/queries.js | 9 ++++----- scripts/pi-hole/php/header.php | 24 ++++-------------------- scripts/pi-hole/php/loginpage.php | 4 ++-- settings.php | 14 +++++++------- style/pi-hole.css | 15 +++++++-------- 6 files changed, 29 insertions(+), 47 deletions(-) diff --git a/network.php b/network.php index 7c1f9b02..7a96eceb 100644 --- a/network.php +++ b/network.php @@ -53,11 +53,11 @@ $token = $_SESSION['token']; - - - - - + + + + +
just now
... to ...
24 hours ago> 24 hours agoDevice does not use Pi-holejust now... to ...24 hours ago> 24 hours agoDevice does not use Pi-hole
diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js index d000e6f1..14c46de7 100644 --- a/scripts/pi-hole/js/queries.js +++ b/scripts/pi-hole/js/queries.js @@ -283,8 +283,7 @@ $(document).ready(function () { new_tab.focus(); } }); - $("td:eq(4)", row).addClass("underline"); - $("td:eq(4)", row).addClass("pointer"); + $("td:eq(4)", row).addClass("text-underline pointer"); } // Substitute domain by "." if empty @@ -447,7 +446,7 @@ $(document).ready(function () { this.style.color = ""; } ); - api.$("td:eq(1)").css("cursor", "pointer"); + api.$("td:eq(1)").addClass("pointer"); // Domain api.$("td:eq(2)").click(function () { if (autofilter()) { @@ -471,7 +470,7 @@ $(document).ready(function () { this.style.color = ""; } ); - api.$("td:eq(2)").css("cursor", "pointer"); + api.$("td:eq(2)").addClass("pointer"); // Client api.$("td:eq(3)").click(function () { if (autofilter()) { @@ -493,7 +492,7 @@ $(document).ready(function () { this.style.color = ""; } ); - api.$("td:eq(3)").css("cursor", "pointer"); + api.$("td:eq(3)").addClass("pointer"); } }); diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php index 7b5832ee..fcf94274 100644 --- a/scripts/pi-hole/php/header.php +++ b/scripts/pi-hole/php/header.php @@ -271,13 +271,13 @@ if($auth) {
  • - Pi-hole logo + Pi-hole logo
    • - User Image + Pi-hole Logo

      Open Source Ad Blocker Designed For Raspberry Pi @@ -300,26 +300,10 @@ if($auth) {

    • - - hidden-md hidden-lg"> - Pi-hole Version (".$core_branch.", ".$core_commit.")"; } - if($core_update){ ?> (Update available!)
      - Web Interface Version (".$web_branch.", ".$web_commit.")"; } - if($web_update){ ?> (Update available!)
      - FTL Version (Update available!)

      - - */ ?>
      - - Donate + + Donate
      • diff --git a/scripts/pi-hole/php/loginpage.php b/scripts/pi-hole/php/loginpage.php index 9c32f713..a7c98cb2 100644 --- a/scripts/pi-hole/php/loginpage.php +++ b/scripts/pi-hole/php/loginpage.php @@ -10,7 +10,7 @@
      - + Pi-hole logo

      @@ -26,7 +26,7 @@
      -
      +
      diff --git a/settings.php b/settings.php index 280008f1..a7378fa3 100644 --- a/settings.php +++ b/settings.php @@ -1292,37 +1292,37 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
      - + - +
      - +
      - +

      - +
      - +
      - +
      diff --git a/style/pi-hole.css b/style/pi-hole.css index 65c68eee..1fc738a0 100644 --- a/style/pi-hole.css +++ b/style/pi-hole.css @@ -261,6 +261,10 @@ } /* Utilities */ +.text-underline { + text-decoration: underline; +} + .text-black { color: #000 !important; } @@ -286,11 +290,10 @@ } td.highlight { - background-color: yellow; + background-color: #ff0 !important; } -code.breakall -{ +code.breakall { white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; @@ -299,10 +302,6 @@ code.breakall word-wrap: break-word; /* Internet Explorer 5.5+ */ } -.underline { - text-decoration: underline; -} - .pointer { cursor: pointer; } @@ -310,4 +309,4 @@ code.breakall .bootstrap-select.bs-container.align-right { left: unset !important; right: 10px; -} \ No newline at end of file +}