Change the load order of some CSS files to fix a few visual issues (#2616)

This commit is contained in:
DL6ER
2023-07-06 19:27:53 +02:00
committed by GitHub
2 changed files with 15 additions and 9 deletions
+15 -6
View File
@@ -43,6 +43,9 @@ end
-- a reverse proxy (e.g. Traefik)
is_secure = mg.request_info.https or pihole.rev_proxy()
-- Variable to check if user is already authenticated
is_authenticated = mg.request_info.is_authenticated
?>
<html lang="en">
<head>
@@ -86,15 +89,21 @@ is_secure = mg.request_info.https or pihole.rev_proxy()
<!-- Common styles -->
<link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/bootstrap/css/bootstrap.min.css')?>">
<link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/AdminLTE.min.css')?>">
<link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/select2.min.css')?>">
<? if startsWith(scriptname, 'groups') then ?>
<!-- Group management styles -->
<?
if startsWith(scriptname, 'groups') then
-- Group management styles
?>
<link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/animate.min.css')?>">
<link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/bootstrap-select.min.css')?>">
<link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/bootstrap-toggle.min.css')?>">
<? end ?>
<? end ?>
<? if is_authenticated then ?>
<link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/datatables.min.css')?>">
<link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/datatables_extensions.min.css')?>">
<link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/daterangepicker.min.css')?>">
<? end ?>
<link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/select2.min.css')?>">
<link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/AdminLTE.min.css')?>">
<!-- Theme styles -->
<link rel="stylesheet" href="<?=pihole.fileversion('style/pi-hole.css')?>">
@@ -9,9 +9,6 @@
]]--
mg.include('header.lp','r')
?>
<link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/datatables.min.css')?>">
<link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/datatables_extensions.min.css')?>">
<link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/daterangepicker.min.css')?>">
<script src="<?=pihole.fileversion('scripts/vendor/select2.min.js')?>"></script>
<script src="<?=pihole.fileversion('scripts/vendor/datatables.min.js')?>"></script>
<script src="<?=pihole.fileversion('scripts/vendor/datatables.select.min.js')?>"></script>