Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-02-21 18:26:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,257 Commits 27 Branches 113 Tags
effcd907cd55aef870e29c4eae0dc4ade13c0aee
Commit Graph

237 Commits

Author SHA1 Message Date
a1346054
26f0203137 Trim excess whitespace 
Signed-off-by: a1346054 <36859588+a1346054@users.noreply.github.com>
 2021-09-15 21:23:01 +00:00
Kenneth Chew
2f3f4e6056 Adapt theme-color and background-color for different themes 
Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>
 2021-06-19 01:02:53 -04:00
Michael Howell
5624834175 Switch from fontawesome webfonts to SVG + JS 
https://discourse.pi-hole.net/t/use-svg-for-icons-instead-of-font/40166

Signed-off-by: Michael Howell <michael@notriddle.com>
 2020-11-05 16:49:22 -07:00
Dan Schaper
aa42450ea9 Merge pull request #1489 from pi-hole/XhmikosR-patch-1 
Fix HTML validation errors in header.php
 2020-10-14 04:13:59 -07:00
XhmikosR
dbff9360f2 Update scripts/pi-hole/php/header.php 
Co-authored-by: cleroux <leroux.cedric@gmail.com>
 2020-10-14 13:22:58 +03:00
Tony Jeffree
b7244ad56a Merge branch 'devel' of https://github.com/pi-hole/AdminLTE into devel 
Signed-off-by: Tony Jeffree <tjeffree@gmail.com>
 2020-09-14 11:11:27 +01:00
DL6ER
0c102fc1d3 Merge branch 'devel' into new/mac_clients 2020-08-19 22:11:43 +02:00
Tony Jeffree
d47dee7937 Use last modified time 
Signed-off-by: Tony Jeffree <tjeffree@gmail.com>
 2020-08-17 08:30:00 +01:00
Tony
0a4ebe14e3 Add cache busting to all custom scripts and common css 
Signed-off-by: Tony Jeffree <tjeffree@gmail.com>
 2020-08-17 08:30:00 +01:00
Tony
2495ffc313 Add cache busting variable to Pi-hole js/css 
Signed-off-by: Tony <tjeffree@gmail.com>
 2020-08-17 08:28:28 +01:00
DL6ER
1b129bcad0 Merge branch 'release/v5.2' into new/mac_clients 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-30 21:56:21 +02:00
yubiuser
1fce1f6fa0 Fix sidebar animation angle for Local DNS Records (#1507) 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2020-07-18 06:51:49 +03:00
yubiuser
018d047de7 Remove duplicated sidebar entry for Local DNS Records 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2020-07-16 23:39:53 +02:00
XhmikosR
085a0e2e99 Fix HTML validation errors in header.php 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-07-16 08:11:53 +03:00
marank
b597a0fcbb Merge branch 'devel' into devel 2020-06-21 12:20:33 +02:00
XhmikosR
1bef0bb17b Tweak CSP (#1445) 
Switch to `default-src` `'none'` and specify the directives we were missing that were being inherited.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-07 14:20:45 +03:00
DL6ER
a901489a96 Merge branch 'devel' into new/mac_clients 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-05 22:24:17 +02:00
XhmikosR
9aa11ec6aa Fix typo "Long term" -> "Long-term" 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-04 19:01:10 +03:00
XhmikosR
a9cee0039a Improve CSP config (#1377) 
* Remove `'unsafe-eval'`; this was needed in the past for Chart.js.
* Remove `https://api.github.com` since we don't make any requests to this domain client-side
* Specify more directives which are not inherited by `default-src`

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-04 17:40:39 +03:00
DL6ER
c6abbac3e1 Unlike the standard PHP engine, others might actually be case-sensitive. (#1428) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-04 15:13:15 +03:00
DL6ER
a4a678b584 Revert "Add per-browser boxed layout setting" 
This reverts commit c2683fb87bc50369753b279e179e7b5d0d1e60a9.

Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:20:51 +01:00
DL6ER
51dc473278 Remove saving backend for settings moved into local storage. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:20:51 +01:00
DL6ER
2e0a261c47 No not use per-browser settings for the theme to avoid flashing pages on navigation. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:20:51 +01:00
DL6ER
3c793581b7 Add per-browser temp unit selection 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:19:00 +01:00
DL6ER
6e52ee4307 Add per-browser theme selection 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:18:36 +01:00
DL6ER
7ff5764f95 Add per-browser boxed layout setting 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:17:28 +01:00
DL6ER
0e4d1e4e7f Implement per-browser checkbox and radio button styling using icheck-material. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-02 16:17:28 +01:00
Chris Coffin
4cca206810 Change "Permanently" toggle to "Indefinitely" (#1416) 
* Changing "Permanently" toggle to "Indefinitely"

Signed-off-by: Chris Coffin <me@chriscoffin.org>

* Updating ID name in footer.js

Signed-off-by: Chris Coffin <me@chriscoffin.org>

Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-01 21:47:33 +03:00
XhmikosR
e9fc5a20ca Revert "header: Move license header at the top" 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-31 15:56:10 +03:00
Adam Warner
89ce5d139b Merge pull request #1405 from pi-hole/fix-sidebar 
Fix sidebar docs link
 2020-05-30 15:36:18 +01:00
Adam Warner
be54d1563d Merge pull request #1402 from pi-hole/XhmikosR-patch-3 
Move animate.min.css style in the pages that use it
 2020-05-30 15:35:09 +01:00
XhmikosR
ee40ea3d36 Fix sidebar docs link 
Also work around us using Font Awesome 5.x with AdminLTE 2.x.

We should fix the FA classes later.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-30 10:16:09 +03:00
XhmikosR
4e5cc31134 Move animate.min.css style in the pages that use it 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-30 08:28:45 +03:00
XhmikosR
876e7d8bd9 Use minified daterangepicker builds. 
The official distribution doesn't include minified files, so just minify the files ourselves.

It's in maintenance mode anyway.

Commands for future reference:

* cleancss --compatibility ie9 -O1 specialComments:0 -o daterangepicker.min.css daterangepicker.css
* terser daterangepicker.js --compress typeofs=false --mangle --source-map url=daterangepicker.min.js.map -o daterangepicker.min.js

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-30 08:26:44 +03:00
Adam Warner
a284f71bd7 Merge pull request #1389 from pi-hole/js-move 
Move JS files where they are used.
 2020-05-29 23:39:51 +01:00
DL6ER
7abeb2b434 Merge pull request #1404 from pi-hole/been-a-while-since-we-touched-this 
remove outdated local help page, link to docs instead
 2020-05-29 23:15:58 +02:00
Adam Warner
0d7040921e Merge pull request #1361 from pi-hole:rm-jquery-ui 
Remove the unused jQuery UI.
 2020-05-29 21:42:16 +01:00
Adam Warner
1390a6dd5a remove outdated local help page, link to docs instead 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-29 21:41:11 +01:00
DL6ER
e213dce308 Merge pull request #1394 from pi-hole/ren-fa-folder 
Remove version number from the Font Awesome folder.
 2020-05-29 22:10:25 +02:00
XhmikosR
2b93d569dd Move the gethostname() call to a variable. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 09:49:51 +03:00
XhmikosR
f1eb744ff5 Guard gethostname() calls 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 09:24:07 +03:00
XhmikosR
95219703a1 Remove the unused jQuery UI. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 08:31:06 +03:00
XhmikosR
469d491260 Move JS files where they are used. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-29 07:43:13 +03:00
XhmikosR
f5d68ffd88 Remove version number from the Font Awesome folder. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-27 09:22:37 +03:00
XhmikosR
30776108ee Use fa5 class on the sidebar toggle 
This was added in AdminLTE v2.4.13.

Also, remove unneeded related custom CSS while at it.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-24 21:12:15 +03:00
XhmikosR
b20b6797c1 HTML hidden attribute does not need a value. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-23 19:03:02 +03:00
XhmikosR
e70e108cce Use .hidden/.show for showing/hiding the reset buttons 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-23 13:04:13 +03:00
Adam Warner
71547422ec Merge pull request #1347 from pi-hole/improve-user-info-markup 
Improve user info markup
 2020-05-23 08:49:36 +01:00
Adam Warner
8c3ad9a1b9 Merge pull request #1335 from pi-hole/datatables 
Load the built DataTables bundle
 2020-05-23 08:08:17 +01:00
XhmikosR
442201d613 Improve user info markup 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-22 11:21:43 +03:00