diff --git a/db_queries.php b/db_queries.php index bc883e34..776151dc 100644 --- a/db_queries.php +++ b/db_queries.php @@ -52,39 +52,21 @@ $token = $_SESSION['token'];
-
- -
-
- -
+
+
-
- -
-
- -
+
+
-
- -
-
- -
+
+
-
- -
-
- -
-
- -
+
+
+
diff --git a/debug.php b/debug.php index db721cad..116ed4ea 100644 --- a/debug.php +++ b/debug.php @@ -12,7 +12,7 @@

Generate debug log

-

Upload debug log and provide token once finished

+

Once you click this button a debug log will be generated and can automatically be uploaded if we detect a working internet connection.

diff --git a/groups-domains.php b/groups-domains.php index 9ce8e64e..9e21dab6 100644 --- a/groups-domains.php +++ b/groups-domains.php @@ -48,7 +48,7 @@ - wildcard + diff --git a/settings.php b/settings.php index bbf45513..376ba5c5 100644 --- a/settings.php +++ b/settings.php @@ -336,15 +336,8 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
-
-
- -
-
-

hidden>Make sure your router's DHCP server is disabled when using the Pi-hole DHCP server!

+ checked>
+

hidden>Make sure your router's DHCP server is disabled when using the Pi-hole DHCP server!

@@ -425,22 +418,8 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
-
-
- -
-
-
-
- -
-
+ checked disabled> 
+ checked disabled> 
@@ -579,9 +558,9 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists" - - - + + + -
- -
- + + +

Upload only Pi-hole backup files.

+ +
+ diff --git a/style/themes/default-dark.css b/style/themes/default-dark.css index fe5e259d..00764501 100644 --- a/style/themes/default-dark.css +++ b/style/themes/default-dark.css @@ -279,6 +279,8 @@ h4 { .nav-tabs-custom > .nav-tabs > li > a { color: #bec5cb; } +.form-control, +.form-group, .form-group .input-group-addon, .input-group .input-group-addon, .form-group input, @@ -300,10 +302,6 @@ h4 { .input-group .input-group-addon { border-right: 1px solid #272c30; } -.form-control { - border-color: #272c30; - background-color: #353c42; -} .select2 .select2-selection { background-color: #353c42; color: #bec5cb; @@ -476,7 +474,7 @@ fieldset[disabled] .form-control { border: 1px solid #353c42; } .table-striped > tbody > tr:nth-of-type(2n + 1) { - background-color: #3d454d; + background-color: #2d343a; } .panel, .panel-body, @@ -508,3 +506,73 @@ fieldset[disabled] .form-control { .network-gradient { background-image: linear-gradient(to right, #114100 0%, #525200 100%); } + +/* Base for label styling */ +[type="checkbox"]:not(:checked), +[type="checkbox"]:checked { + position: absolute; + left: -9999px; +} +[type="checkbox"]:not(:checked) + label, +[type="checkbox"]:checked + label { + position: relative; + padding-left: 1.95em; + cursor: pointer; +} + +/* checkbox aspect */ +[type="checkbox"]:not(:checked) + label:before, +[type="checkbox"]:checked + label:before { + content: ''; + position: absolute; + left: 0; top: 0; + width: 1.25em; height: 1.25em; + border: 1px solid #ccc; + background: #353c42; + border-radius: 4px; + box-shadow: inset 0 1px 3px rgba(0,0,0,.1); +} +/* checked mark aspect */ +[type="checkbox"]:not(:checked) + label:after, +[type="checkbox"]:checked + label:after { + content: '\2713\0020'; + position: absolute; + top: .05em; left: .22em; + font-size: 1.3em; + line-height: 0.8; + color: #4778d9; + transition: all .2s; + font-family: 'Lucida Sans Unicode', 'Arial Unicode MS', Arial; +} +/* checked mark aspect changes */ +[type="checkbox"]:not(:checked) + label:after { + opacity: 0; + transform: scale(0); +} +[type="checkbox"]:checked + label:after { + opacity: 1; + transform: scale(1); +} +/* disabled checkbox */ +[type="checkbox"]:disabled:not(:checked) + label:before, +[type="checkbox"]:disabled:checked + label:before { + box-shadow: none; + border-color: #bbb; + background-color: #ddd; +} +[type="checkbox"]:disabled:checked + label:after { + color: #999; +} +[type="checkbox"]:disabled + label { + color: #aaa; +} +/* accessibility */ +[type="checkbox"]:checked:focus + label:before, +[type="checkbox"]:not(:checked):focus + label:before { + border: 2px dotted blue; +} + +/* hover style just for information */ +label:hover:before { + border: 2px solid #4778d9!important; +} \ No newline at end of file diff --git a/style/themes/default-light.css b/style/themes/default-light.css index e6b3eebd..70ac1e3e 100644 --- a/style/themes/default-light.css +++ b/style/themes/default-light.css @@ -216,3 +216,73 @@ td.highlight { .network-gradient { background-image: linear-gradient(to right, #e7ffde 0%, #ffffdf 100%); } + +/* Base for label styling */ +[type="checkbox"]:not(:checked), +[type="checkbox"]:checked { + position: absolute; + left: -9999px; +} +[type="checkbox"]:not(:checked) + label, +[type="checkbox"]:checked + label { + position: relative; + padding-left: 1.95em; + cursor: pointer; +} + +/* checkbox aspect */ +[type="checkbox"]:not(:checked) + label:before, +[type="checkbox"]:checked + label:before { + content: ''; + position: absolute; + left: 0; top: 0; + width: 1.25em; height: 1.25em; + border: 2px solid #ccc; + background: #fff; + border-radius: 4px; + box-shadow: inset 0 1px 3px rgba(0,0,0,.1); +} +/* checked mark aspect */ +[type="checkbox"]:not(:checked) + label:after, +[type="checkbox"]:checked + label:after { + content: '\2713\0020'; + position: absolute; + top: .05em; left: .22em; + font-size: 1.3em; + line-height: 0.8; + color: #09ad7e; + transition: all .2s; + font-family: 'Lucida Sans Unicode', 'Arial Unicode MS', Arial; +} +/* checked mark aspect changes */ +[type="checkbox"]:not(:checked) + label:after { + opacity: 0; + transform: scale(0); +} +[type="checkbox"]:checked + label:after { + opacity: 1; + transform: scale(1); +} +/* disabled checkbox */ +[type="checkbox"]:disabled:not(:checked) + label:before, +[type="checkbox"]:disabled:checked + label:before { + box-shadow: none; + border-color: #bbb; + background-color: #ddd; +} +[type="checkbox"]:disabled:checked + label:after { + color: #999; +} +[type="checkbox"]:disabled + label { + color: #aaa; +} +/* accessibility */ +[type="checkbox"]:checked:focus + label:before, +[type="checkbox"]:not(:checked):focus + label:before { + border: 2px dotted blue; +} + +/* hover style just for information */ +label:hover:before { + border: 2px solid #4778d9!important; +} \ No newline at end of file diff --git a/taillog-FTL.php b/taillog-FTL.php index fd40f223..21da1e1f 100644 --- a/taillog-FTL.php +++ b/taillog-FTL.php @@ -12,9 +12,9 @@

Output the last lines of the pihole-FTL.log file (live)

-
+ 

-

+
 
 
 
diff --git a/taillog.php b/taillog.php
index a03c45dc..c920d957 100644
--- a/taillog.php
+++ b/taillog.php
@@ -12,9 +12,9 @@
     
Output the last lines of the pihole.log file (live)

 
 
-

+
 

-

+