diff --git a/scripts/pi-hole/js/settings-advanced.js b/scripts/pi-hole/js/settings-advanced.js index 5aad6bb6..d56c56ea 100644 --- a/scripts/pi-hole/js/settings-advanced.js +++ b/scripts/pi-hole/js/settings-advanced.js @@ -322,11 +322,6 @@ function createDynamicConfigTabs() { }); $("#advanced-overlay").hide(); - $("#advanced-content").append( - '
' + - '' + - "
" - ); $("button[id='save']").on("click", function () { saveSettings(); }); diff --git a/settings-all.lp b/settings-all.lp index 210cf0c4..0a690bbd 100644 --- a/settings-all.lp +++ b/settings-all.lp @@ -18,7 +18,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
-
+
diff --git a/settings-api.lp b/settings-api.lp index 0aa107cf..6448ddf9 100644 --- a/settings-api.lp +++ b/settings-api.lp @@ -177,7 +177,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r') -
+
diff --git a/settings-dhcp.lp b/settings-dhcp.lp index 5636fe72..fd0a3b84 100644 --- a/settings-dhcp.lp +++ b/settings-dhcp.lp @@ -200,7 +200,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r') -
+
diff --git a/settings-dns.lp b/settings-dns.lp index 5250df9e..7cc058dc 100644 --- a/settings-dns.lp +++ b/settings-dns.lp @@ -258,7 +258,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r') -
+
diff --git a/settings-privacy.lp b/settings-privacy.lp index f2aeed7b..cb18256f 100644 --- a/settings-privacy.lp +++ b/settings-privacy.lp @@ -103,7 +103,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r') -
+
diff --git a/style/pi-hole.css b/style/pi-hole.css index 393738f5..27e3c2e3 100644 --- a/style/pi-hole.css +++ b/style/pi-hole.css @@ -5,6 +5,14 @@ * This file is copyright under the latest version of the EUPL. * Please see LICENSE file for your rights under this license. */ +:root { + /* Datatables Select - bgcolor */ + --datatable-bgcolor: #e0e8ee; + + /* Used in settings save button */ + --overlay-bgcolor: rgba(212, 220, 232, 0.55); +} + .layout-boxed { background: url("../img/boxed-bg.png") repeat fixed; } @@ -1012,11 +1020,6 @@ body:not(.lcars) .filter_types [class*="icheck-"] > input:first-child:checked + margin-right: 0.5em; } -/* Datatables Select - bgcolor */ -:root { - --datatable-bgcolor: #e0e8ee; -} - div.dt-buttons { margin: 2px 0 5px; } @@ -1161,11 +1164,23 @@ table.dataTable tbody > tr > .selected { opacity: 0.1; } -.save-button { +.save-button-container { position: fixed; - bottom: 2%; - right: 2%; + bottom: 1.2em; + right: 0.6em; z-index: 10; + background: var(--overlay-bgcolor); + width: fit-content; + border-radius: 0.5em; + padding: 0; +} +.save-button { + margin: 1.2em; +} +@media (min-width: 1250px) { + .layout-boxed .save-button-container { + right: calc((100% - 1250px) / 2 + 1.2em); + } } .settings-level-0 { diff --git a/style/themes/default-dark.css b/style/themes/default-dark.css index 636a1233..6da9b731 100644 --- a/style/themes/default-dark.css +++ b/style/themes/default-dark.css @@ -10,6 +10,7 @@ :root { --datatable-bgcolor: rgba(64, 76, 88, 0.8); + --overlay-bgcolor: var(--datatable-bgcolor); } /* fix #2554: browser not detecting dark mode */ diff --git a/style/themes/default-darker.css b/style/themes/default-darker.css index feceffcf..02039895 100644 --- a/style/themes/default-darker.css +++ b/style/themes/default-darker.css @@ -109,6 +109,7 @@ select:-webkit-autofill { --darkreader-selection-background: #004daa; --darkreader-selection-text: #e8e6e3; --datatable-bgcolor: rgb(35, 47, 52); + --overlay-bgcolor: rgba(35, 47, 52, 0.7); } /* Modified CSS */ diff --git a/style/themes/high-contrast-dark.css b/style/themes/high-contrast-dark.css index 354eb8f4..978c864a 100644 --- a/style/themes/high-contrast-dark.css +++ b/style/themes/high-contrast-dark.css @@ -29,6 +29,7 @@ --blocked-color: var(--danger-color); --datatable-bgcolor: rgba(18, 44, 68, 0.3); + --overlay-bgcolor: rgba(24, 28, 32, 0.8); } /* removing transition for every element, to avoid unnecessary movement */ diff --git a/style/themes/high-contrast.css b/style/themes/high-contrast.css index b1b16655..690f57f4 100644 --- a/style/themes/high-contrast.css +++ b/style/themes/high-contrast.css @@ -25,6 +25,8 @@ --allowed-color: #3c7; --blocked-color: var(--danger-color); + + --overlay-bgcolor: rgba(255, 255, 255, 0.8); } /* removing transition for every element, to avoid unnecessary movement */ diff --git a/style/themes/lcars.css b/style/themes/lcars.css index 0691048e..dd55ff1c 100644 --- a/style/themes/lcars.css +++ b/style/themes/lcars.css @@ -2123,8 +2123,25 @@ td.highlight { } /*** add style to the information/about dropdown ***/ - .navbar-nav > .user-menu > .dropdown-menu > .user-header, .navbar-nav > .user-menu > .dropdown-menu > .user-footer { background-color: #111111; } + +.save-button-container { + border-radius: 50px; + background: none; + box-shadow: + 0 0 10px -1px #000, + 0 0 20px 2px #000; + bottom: 2em; + right: 1.7em; +} +.save-button { + margin: 0; +} +@media (min-width: 1320px) { + .layout-boxed .save-button-container { + right: calc((100% - 1320px) / 2 + 0.85em); + } +}