pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

v5.21 (#2860)

Browse Source
This commit is contained in:
Adam Warner
2023-11-21 20:15:32 +00:00
committed by GitHub
parent 3dd57522e2 160ff4ed0a
commit be05b0f61d
16 changed files with 5928 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/codeql.yml
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
composer.lock
Generated
+6 -6
View File
@@ -8,16 +8,16 @@
"packages": [
{
"name": "phpstan/phpstan",
"version": "1.10.38",
"version": "1.10.42",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "5302bb402c57f00fb3c2c015bac86e0827e4b691"
"reference": "fc2316508de5453140b5cb3d3f8683a33e92f26a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/5302bb402c57f00fb3c2c015bac86e0827e4b691",
"reference": "5302bb402c57f00fb3c2c015bac86e0827e4b691",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/fc2316508de5453140b5cb3d3f8683a33e92f26a",
"reference": "fc2316508de5453140b5cb3d3f8683a33e92f26a",
"shasum": ""
},
"require": {
@@ -66,7 +66,7 @@
"type": "tidelift"
}
],
"time": "2023-10-06T14:19:14+00:00"
"time": "2023-11-17T15:26:57+00:00"
}
],
"packages-dev": [],
@@ -79,5 +79,5 @@
"php": ">=5.4"
},
"platform-dev": [],
"plugin-api-version": "2.3.0"
"plugin-api-version": "2.6.0"
}
package-lock.json
Generated
+4 -4
View File
@@ -13,7 +13,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"
}
},
@@ -4954,9 +4954,9 @@
}
},
"node_modules/prettier": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz",
"integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==",
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz",
"integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==",
"dev": true,
"bin": {
"prettier": "bin/prettier.cjs"
package.json
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -41,7 +41,7 @@ $hostname = gethostname() ? gethostname() : '';
<?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
+1
View File
@@ -23,6 +23,7 @@ $available_themes['high-contrast-dark'] = array('High contrast dark', false, 'hi
// 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
+14 -5
View File
@@ -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;
style/themes/lcars-picard.css
+5891
View File
File diff suppressed because it is too large Load Diff