Bump AdminLTE which brings back AdminLTE colors

This commit is contained in:
johnnyq
2026-08-18 12:24:31 -04:00
parent ba319a8f25
commit 858acbcd30
9 changed files with 1626 additions and 45 deletions

View File

@@ -290,7 +290,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>"> <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-hover mb-0"> <table class="table table-hover mb-0">
<thead class="<?php if ($num_rows[0] == 0) { echo "d-none"; } ?> bg-light"> <thead class="<?php if ($num_rows[0] == 0) { echo "d-none"; } ?> table-light">
<tr> <tr>
<td class="checkbox-column"> <td class="checkbox-column">
<div class="form-check"> <div class="form-check">

View File

@@ -388,7 +388,7 @@ if (isset($_GET['invoice_id'])) {
<div class="card"> <div class="card">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-hover mb-0" id="items"> <table class="table table-hover mb-0" id="items">
<thead class="bg-light"> <thead class="table-light">
<tr> <tr>
<th class="d-print-none"></th> <th class="d-print-none"></th>
<th>Item</th> <th>Item</th>

View File

@@ -28,6 +28,11 @@ header("X-Frame-Options: DENY"); // Legacy
<!-- Theme style --> <!-- Theme style -->
<link rel="stylesheet" href="/libs/adminlte/css/adminlte.min.css"> <link rel="stylesheet" href="/libs/adminlte/css/adminlte.min.css">
<?php /* Opt-in AdminLTE 3 palette, new in v4.5.0. Supplies the
--bs-<colour> tokens plus .text-bg-* / .card-* / .callout-*
/ .bg-gradient-* families. Loads BEFORE itflow_custom.css so
our own .bg-<colour> box colours still win. */ ?>
<link rel="stylesheet" href="/libs/adminlte/css/adminlte-colors-v3.css">
<link rel="stylesheet" href="/libs/sweetalert2/css/sweetalert2.min.css"> <link rel="stylesheet" href="/libs/sweetalert2/css/sweetalert2.min.css">
<!-- ITFlow style: the AdminLTE 3 compatibility layer and the theme colours. Must load <!-- ITFlow style: the AdminLTE 3 compatibility layer and the theme colours. Must load

View File

@@ -122,23 +122,25 @@
/* one accent per theme - v3 used the same hex for navbar, links and /* one accent per theme - v3 used the same hex for navbar, links and
the active sidebar item */ the active sidebar item */
/* black has no upstream token - AdminLTE calls its darkest neutral
gray-dark (#343a40), which is a different colour */
.theme-black { --itflow-accent: #000000; } .theme-black { --itflow-accent: #000000; }
.theme-blue { --itflow-accent: #007bff; } .theme-blue { --itflow-accent: var(--bs-blue, #007bff); }
.theme-cyan { --itflow-accent: #17a2b8; } .theme-cyan { --itflow-accent: var(--bs-cyan, #17a2b8); }
.theme-fuchsia { --itflow-accent: #f012be; } .theme-fuchsia { --itflow-accent: var(--bs-fuchsia, #f012be); }
.theme-gray { --itflow-accent: #6c757d; } .theme-gray { --itflow-accent: var(--bs-gray, #6c757d); }
.theme-green { --itflow-accent: #28a745; } .theme-green { --itflow-accent: var(--bs-green, #28a745); }
.theme-indigo { --itflow-accent: #6610f2; } .theme-indigo { --itflow-accent: var(--bs-indigo, #6610f2); }
.theme-lightblue { --itflow-accent: #3c8dbc; } .theme-lightblue { --itflow-accent: var(--bs-lightblue, #3c8dbc); }
.theme-maroon { --itflow-accent: #d81b60; } .theme-maroon { --itflow-accent: var(--bs-maroon, #d81b60); }
.theme-navy { --itflow-accent: #001f3f; } .theme-navy { --itflow-accent: var(--bs-navy, #001f3f); }
.theme-olive { --itflow-accent: #3d9970; } .theme-olive { --itflow-accent: var(--bs-olive, #3d9970); }
.theme-orange { --itflow-accent: #fd7e14; } .theme-orange { --itflow-accent: var(--bs-orange, #fd7e14); }
.theme-pink { --itflow-accent: #e83e8c; } .theme-pink { --itflow-accent: var(--bs-pink, #e83e8c); }
.theme-purple { --itflow-accent: #6f42c1; } .theme-purple { --itflow-accent: var(--bs-purple, #6f42c1); }
.theme-red { --itflow-accent: #dc3545; } .theme-red { --itflow-accent: var(--bs-red, #dc3545); }
.theme-teal { --itflow-accent: #20c997; } .theme-teal { --itflow-accent: var(--bs-teal, #20c997); }
.theme-yellow { --itflow-accent: #ffc107; } .theme-yellow { --itflow-accent: var(--bs-yellow, #ffc107); }
/* top navbar takes the theme colour */ /* top navbar takes the theme colour */
.app-header.navbar { .app-header.navbar {
@@ -620,28 +622,6 @@ a:not(.dropdown-item):not(.btn-app):not(.nav-link):not(.brand-link):not(.page-li
--bs-nav-pills-link-active-color: #000; --bs-nav-pills-link-active-color: #000;
} }
/* --- Theme swatch colours -----------------------------------------------
admin/settings_theme.php renders each choice as <i class="fa-circle
text-<colour>">. AdminLTE 3 defined those; v4 does not, so every swatch
on the theme picker rendered with no colour at all - you could not see
what you were selecting. Same accent hexes the themes themselves use. */
.text-black { color: #000000 !important; }
.text-blue { color: #007bff !important; }
.text-cyan { color: #17a2b8 !important; }
.text-fuchsia { color: #f012be !important; }
.text-gray { color: #6c757d !important; }
.text-green { color: #28a745 !important; }
.text-indigo { color: #6610f2 !important; }
.text-lightblue { color: #3c8dbc !important; }
.text-maroon { color: #d81b60 !important; }
.text-navy { color: #001f3f !important; }
.text-olive { color: #3d9970 !important; }
.text-orange { color: #fd7e14 !important; }
.text-pink { color: #e83e8c !important; }
.text-purple { color: #6f42c1 !important; }
.text-red { color: #dc3545 !important; }
.text-teal { color: #20c997 !important; }
.text-yellow { color: #ffc107 !important; }
/* --- Theme picker (admin/settings_theme.php) ----------------------------- /* --- Theme picker (admin/settings_theme.php) -----------------------------
Keeps the coloured circles - the radio button beside each one is what was Keeps the coloured circles - the radio button beside each one is what was

View File

@@ -20,6 +20,11 @@
<link rel="stylesheet" href="/libs/fontawesome-free/css/all.min.css"> <link rel="stylesheet" href="/libs/fontawesome-free/css/all.min.css">
<!-- Theme style --> <!-- Theme style -->
<link rel="stylesheet" href="/libs/adminlte/css/adminlte.min.css"> <link rel="stylesheet" href="/libs/adminlte/css/adminlte.min.css">
<?php /* Opt-in AdminLTE 3 palette, new in v4.5.0. Supplies the
--bs-<colour> tokens plus .text-bg-* / .card-* / .callout-*
/ .bg-gradient-* families. Loads BEFORE itflow_custom.css so
our own .bg-<colour> box colours still win. */ ?>
<link rel="stylesheet" href="/libs/adminlte/css/adminlte-colors-v3.css">
<!-- Custom Style Sheet --> <!-- Custom Style Sheet -->
<link rel="stylesheet" href="/libs/flatpickr/css/flatpickr.min.css"> <link rel="stylesheet" href="/libs/flatpickr/css/flatpickr.min.css">

View File

@@ -35,6 +35,11 @@ header("X-Frame-Options: DENY");
<link rel="stylesheet" href="/libs/DataTables/datatables.min.css"> <link rel="stylesheet" href="/libs/DataTables/datatables.min.css">
<link rel="stylesheet" href="/libs/intl-tel-input/css/intlTelInput.min.css"> <link rel="stylesheet" href="/libs/intl-tel-input/css/intlTelInput.min.css">
<link rel="stylesheet" href="/libs/adminlte/css/adminlte.min.css"> <link rel="stylesheet" href="/libs/adminlte/css/adminlte.min.css">
<?php /* Opt-in AdminLTE 3 palette, new in v4.5.0. Supplies the
--bs-<colour> tokens plus .text-bg-* / .card-* / .callout-*
/ .bg-gradient-* families. Loads BEFORE itflow_custom.css so
our own .bg-<colour> box colours still win. */ ?>
<link rel="stylesheet" href="/libs/adminlte/css/adminlte-colors-v3.css">
<link rel="stylesheet" href="/css/itflow_custom.css"> <link rel="stylesheet" href="/css/itflow_custom.css">
<!-- Scripts --> <!-- Scripts -->

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long