Commit Graph

3520 Commits

Author SHA1 Message Date
Adam Warner
ee0f9fdf68 Merge pull request #1310 from pi-hole/XhmikosR-patch-2
Improve user-menu markup
2020-05-17 13:23:32 +01:00
Adam Warner
61715ffcc2 Merge pull request #1304 from pi-hole/XhmikosR-patch-8
header: fix `aria-expanded` for user-menu dropdown
2020-05-17 13:16:36 +01:00
Adam Warner
457ffb2a5d Merge pull request #1302 from pi-hole/xmr-update-fa
Update Font Awesome to v5.13.0
2020-05-17 13:12:49 +01:00
Adam Warner
ed3864b4d7 Merge pull request #1116 from pi-hole/update-datatables
Update DataTables to v1.10.21
2020-05-17 13:07:37 +01:00
Adam Warner
7e8f526893 Merge pull request #1281 from pi-hole/revert-1267-XhmikosR-patch-4
Revert "Delete the unused mstile-150x150.png"
2020-05-17 13:07:06 +01:00
Adam Warner
f4722cf2a9 Merge pull request #1263 from pi-hole/xmr-animate-min
Use the minified animate.css file.
2020-05-17 13:05:38 +01:00
XhmikosR
36b1344afe Update DataTables to v1.10.21
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-17 15:00:08 +03:00
Adam Warner
aec571579d Merge pull request #1312 from pi-hole/tweak/fix_summary
Fix summary header
2020-05-17 12:46:24 +01:00
Adam Warner
1e639e9dc5 Merge pull request #1306 from pi-hole/xmr-network
network: use Font Awesome
2020-05-17 11:54:29 +01:00
Adam Warner
dcf3c42924 flip null check on elName. === null was not working
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-05-17 11:46:50 +01:00
Adam Warner
0bf2f4e4cc Merge pull request #1300 from pi-hole/XhmikosR-patch-7
header: Move license header at the top
2020-05-17 11:16:08 +01:00
Adam Warner
34c9514e07 Merge pull request #1311 from pi-hole/XhmikosR-patch-11
header: add X-UA-Compatible meta tag
2020-05-17 11:11:11 +01:00
Adam Warner
404f2c2c45 Merge pull request #1307 from pi-hole/XhmikosR-patch-9
Rename variable to camelcase.
2020-05-17 11:11:02 +01:00
Adam Warner
11ee4630ea Merge pull request #1303 from pi-hole/xmr-sidebar
Improve sidebar
2020-05-17 11:10:51 +01:00
XhmikosR
acbe0edbd4 header: add X-UA-Compatible meta tag
For consistency with Bootstrap 3.x.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-17 11:52:52 +03:00
XhmikosR
725334c93e Improve user-menu markup
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-17 11:28:21 +03:00
XhmikosR
f3f98c79da Revert "Delete the unused mstile-150x150.png"
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-17 11:01:26 +03:00
XhmikosR
f2b11caf58 Rename variable to camelcase.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-17 08:53:53 +03:00
XhmikosR
0b3371030f network: use Font Awesome
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-17 08:51:07 +03:00
XhmikosR
d062cb0423 header: fix aria-expanded for user-menu dropdown
It's not expanded by default, so it needs `aria-expanded="false"`

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-16 19:53:44 +03:00
XhmikosR
f6bd1a28a2 Use fa-angle-left to see if sidebar transition works
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-16 19:44:55 +03:00
XhmikosR
8283f63c41 Simplify sidebar markup per the latest AdminLTE 2.x demo
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-16 19:44:05 +03:00
XhmikosR
db878379ea Update Font Awesome to v5.13.0
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-16 19:23:34 +03:00
XhmikosR
b416075cdc header: Move license header at the top
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-16 19:16:44 +03:00
Adam Warner
910fac125b Merge pull request #1296 from pi-hole/tweak/el_names
Lessen chance of elements being blocked by browser blockers
2020-05-15 16:21:47 +01:00
Adam Warner
b351f45cb2 Change the names of the info elements without changing the property names of the API
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-05-15 09:25:01 +01:00
DL6ER
6634fb6856 Merge pull request #1288 from pi-hole/tweak/add_domain_behaviour1
Also do this from the query log page
2020-05-15 01:18:33 +02:00
DL6ER
2809d389af Merge pull request #1294 from pi-hole/fix/teleporter_minor_changes
Minor teleporter improvement
2020-05-15 01:17:48 +02:00
DL6ER
3b43fc6f36 Fix a small glitch and rename Blocklists to Adlists
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-14 18:32:16 +02:00
DL6ER
a3df25c845 Merge pull request #1293 from jacklul/patch-2
Trim user input where applicable
2020-05-14 18:22:18 +02:00
DL6ER
9a13d6731e Merge pull request #1291 from jacklul/patch-1
Make sure #ip-custom field is editable (PARSE_ARP_CACHE=false)
2020-05-14 18:06:50 +02:00
Jack'lul
e12ebcbd08 Trim user input where applicable
Signed-off-by: Jack'lul <jacklulcat@gmail.com>
2020-05-14 18:01:36 +02:00
Jack'lul
9b92548ae1 Make sure ip-custom field is editable when no suggestions are available
Signed-off-by: Jack'lul <jacklulcat@gmail.com>
2020-05-14 17:38:49 +02:00
Adam Warner
c53436ab3f Also do this from the query log page
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-05-13 23:38:43 +01:00
DL6ER
56990c5c34 Merge pull request #1287 from pi-hole/fix/autocomplete_bug
Fix autocomplete bug on group pages
2020-05-13 23:59:59 +02:00
DL6ER
6b8e12a0d1 Fix autocomplete bug on group pages.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-13 23:54:22 +02:00
DL6ER
0f966e5533 Merge pull request #1286 from pi-hole/tweak/add_domain_behaviour1
Use REPLACE into instead of INSERT into when adding a black/whitelist item
2020-05-13 23:48:16 +02:00
Adam Warner
ef13e69125 Use REPLACE into instead of INSERT into. This allows for a domain's white/blacklist status to be toggled
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-05-13 22:01:58 +01:00
XhmikosR
76d50c1897 Use the minified animate.css file.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-13 07:34:16 +03:00
Adam Warner
9c6a582cb2 Merge pull request #1280 from graysky2/devel
remove executable flag from css and font files
2020-05-12 23:29:45 +01:00
graysky
e568ec03b2 remove executable flag from css and font files
Signed-off-by: graysky <graysky@archlinux.us>
2020-05-12 17:58:04 -04:00
DL6ER
7bfb90f9b3 Merge pull request #1253 from pi-hole/new/dark
Add theme support for Pi-hole
2020-05-12 23:19:44 +02:00
DL6ER
1fe6d18838 Fix failed auto-merge.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-12 22:52:18 +02:00
DL6ER
b7d74ff772 Reinstall loading overlay on long-term graphs page (shown only if data has been requested).
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-12 22:50:29 +02:00
DL6ER
fe5ea63fce Improve charts overlay in dark mode
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-12 22:50:29 +02:00
DL6ER
eefbef678c Suppress white 'flashing' on page reloading in dark mode.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-12 22:50:29 +02:00
DL6ER
b5e64653db Update network colors
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-12 22:50:29 +02:00
DL6ER
fb213b6ded Make text-green brighter for better contrast with the dark background.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-12 22:50:29 +02:00
DL6ER
ec53843379 Restore coloring of the entire rows in the Query Log
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-12 22:50:29 +02:00
DL6ER
05d5f02a36 Add theme chooser to Setting -> Web interface.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-12 22:50:29 +02:00