Merge branch 'devel' into dependabot/npm_and_yarn/devel/prettier-2.6.1

scripts/pi-hole/php/debug.php

@@ -50,9 +50,9 @@ function echoEvent($datatext) {
 }
 
 if (isset($_GET["upload"])) {
-    $proc = popen("sudo pihole -d -a -w", "r");
+    $proc = popen("export TERM=dumb && sudo pihole -d -a -w", "r");
 } else {
-    $proc = popen("sudo pihole -d -w", "r");
+    $proc = popen("export TERM=dumb && sudo pihole -d -w", "r");
 }
 
 while (!feof($proc)) {

scripts/pi-hole/php/header.php

@@ -313,10 +313,10 @@ if($auth) {
                             </li>
                             <!-- Menu Footer -->
                             <li class="user-footer">
-                                <!-- PayPal -->
+                                <!-- Donate Button -->
                                 <div class="text-center">
-                                    <a href="https://pi-hole.net/donate/" rel="noopener" target="_blank">
-                                        <img src="img/donate.gif" alt="Donate" width="147" height="47">
+                                    <a class="btn btn-primary btn-lg donate" href="https://pi-hole.net/donate/" rel="noopener" target="_blank">
+                                        <i class="fas fa-fw menu-icon fa-donate"></i> Donate
                                     </a>
                                 </div>
                             </li>

style/pi-hole.css

@@ -667,6 +667,33 @@ td.details-control {
   height: 50px;
 }
 
+.navbar-nav > .user-menu > .dropdown-menu > .user-body a {
+  background: transparent !important;
+}
+
+/*** Donate button - navbar ***/
+.main-header .navbar-custom-menu .user-footer .donate {
+  margin: 15px;
+  padding: 0.8em 1em;
+  width: calc(100% - 30px);
+  color: #fff;
+  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 {
+  background: #f60d1a;
+}
+
+.navbar-custom-menu > .navbar-nav > li:nth-child(2) {
+  padding: 0 5px;
+}
+
 #apiTokenIframe {
   width: 100%;
   border: 0;

style/themes/default-dark.css

@@ -503,7 +503,7 @@ fieldset[disabled] .form-control {
   background-color: #353c42;
   opacity: 1;
 }
-.dropdown-menu {
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
   background-color: #4c5761;
   color: #bec5cb;
   border: 1px solid #171c20;

style/themes/lcars.css

@@ -505,6 +505,10 @@ p.login-box-msg,
   box-shadow: 0 0 0 100vmax rgba(0, 0, 0, 0.6);
 }
 
+.dropdown-toggle {
+  z-index: 2000;
+}
+
 .dropdown-menu > li > a {
   color: inherit;
 }