v5.21 (#2860)

.github/workflows/codeql.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2

.github/workflows/codespell.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       -
         name: Spell-Checking
         uses: codespell-project/actions-codespell@master

.github/workflows/editorconfig-checker.yml

@@ -9,6 +9,6 @@ jobs:
     name: editorconfig-checker
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.0
+      - uses: actions/checkout@v4.1.1
       - uses: editorconfig-checker/action-editorconfig-checker@main
       - run: editorconfig-checker

.github/workflows/php-cs-fixer.yml

@@ -6,7 +6,7 @@ jobs:
     name: PHP-CS-Fixer
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.0
+    - uses: actions/checkout@v4.1.1
     - name: PHP-CS-Fixer
       uses: docker://oskarstark/php-cs-fixer-ga
       with:

.github/workflows/phpstan.yml

@@ -8,7 +8,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.0
+    - uses: actions/checkout@v4.1.1
 
     - name: Install composer
       uses: php-actions/composer@v6

.github/workflows/stale.yml

@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       - name: Remove 'stale' label
         run: gh issue edit ${{ github.event.issue.number }} --remove-label ${{ env.stale_label }}
         env:

.github/workflows/sync-back-to-dev.yml

@@ -11,7 +11,7 @@ jobs:
     name: Syncing branches
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       - name: Opening pull request
         run: gh pr create -B devel -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'internal'
         env:

.github/workflows/test.yml

@@ -19,10 +19,10 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3.8.1
+        uses: actions/setup-node@v4.0.0
         with:
           node-version: "16.x"
           cache: npm

package.json

@@ -28,7 +28,7 @@
     "eslint-plugin-compat": "^4.2.0",
     "postcss": "^8.4.31",
     "postcss-cli": "^10.1.0",
-    "prettier": "3.0.3",
+    "prettier": "3.1.0",
     "xo": "^0.56.0"
   },
   "browserslist": [

scripts/pi-hole/js/footer.js

@@ -143,7 +143,7 @@ function initCheckboxRadioStyle() {
   }
 
   var boxsheet = $('<link href="' + getCheckboxURL(chkboxStyle) + '" rel="stylesheet" />');
-  boxsheet.appendTo("head");
+  boxsheet.insertAfter($("link[href*='style/vendor/bootstrap/css/bootstrap.min.css']"));
 
   applyCheckboxRadioStyle(chkboxStyle);
 

scripts/pi-hole/php/header.php

@@ -41,7 +41,7 @@
 <?php } ?>
 
     <!-- Theme fonts -->
-<?php if ($theme == 'lcars') { ?>
+<?php if ($theme == 'lcars' || $theme == 'lcars-picard') { ?>
     <link rel="stylesheet" href="<?php echo fileversion('style/vendor/fonts/ubuntu-mono/ubuntu-mono.css'); ?>">
     <link rel="stylesheet" href="<?php echo fileversion('style/vendor/fonts/antonio/antonio.css'); ?>">
 <?php } else { ?>

scripts/pi-hole/php/theme.php

@@ -23,6 +23,7 @@
 // Option to have the theme go with the device dark mode setting, always set the background to black to avoid flashing
 $available_themes['default-auto'] = array('Pi-hole auto theme (light/dark)', true, 'default-auto', '#367fa9');
 $available_themes['lcars'] = array('Star Trek LCARS theme (dark)', true, 'lcars', '#4488FF');
+$available_themes['lcars-picard'] = array('Star Trek Picard LCARS theme (dark)', true, 'lcars-picard', '#53596C');
 
 $webtheme = '';
 // Try to load theme settings from setupVars.conf

style/pi-hole.css

@@ -92,6 +92,11 @@ td.lookatme {
   white-space: pre-wrap;
 }
 
+/* Client column */
+#all-queries td:nth-of-type(4) {
+  word-break: break-all;
+}
+
 /* Allow Info String to wrap (useful while filtering entries on small screen) */
 #all-queries_info {
   white-space: unset;
@@ -779,29 +784,33 @@ li:not(.menu-open) .treeview-menu .warning-count {
 }
 
 /* Domains table: filter by type - smaller icheck */
-body:not(.lcars) .filter_types [class*="icheck-"] > label {
+body:not([class*="lcars"]) .filter_types [class*="icheck-"] > label {
   padding-left: 1.5em !important;
   line-height: 1.2em;
   min-height: 1.2em;
 }
-body:not(.lcars)
+body:not([class*="lcars"])
   .filter_types
   [class*="icheck-"]
   > input:first-child
   + input[type="hidden"]
   + label::before,
-body:not(.lcars) .filter_types [class*="icheck-"] > input:first-child + label::before {
+body:not([class*="lcars"]) .filter_types [class*="icheck-"] > input:first-child + label::before {
   width: 1.2em;
   height: 1.2em;
   margin-left: -1.55em;
 }
-body:not(.lcars)
+body:not([class*="lcars"])
   .filter_types
   [class*="icheck-"]
   > input:first-child:checked
   + input[type="hidden"]
   + label::after,
-body:not(.lcars) .filter_types [class*="icheck-"] > input:first-child:checked + label::after {
+body:not([class*="lcars"])
+  .filter_types
+  [class*="icheck-"]
+  > input:first-child:checked
+  + label::after {
   width: 0.35em;
   height: 0.7em;
   top: -0.2em;