Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v5.21 #2860

Merged
merged 22 commits into from
Nov 21, 2023
Merged

v5.21 #2860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ff77b8f
Sync master back into development (#2734)
PromoFaux Oct 11, 2023
e5f4f37
Insert icheck CSS right after Bootstrap
rdwebdesign Oct 15, 2023
099f2bc
Exclude any theme containing "lcars" on the name
rdwebdesign Oct 15, 2023
ea74a78
Insert icheck CSS right after bootstrap file. (#2752)
rdwebdesign Oct 16, 2023
2c40ec6
Bump phpstan/phpstan from 1.10.38 to 1.10.39
dependabot[bot] Oct 21, 2023
96b11dc
Bump actions/checkout from 4.1.0 to 4.1.1
dependabot[bot] Oct 21, 2023
2124716
Bump actions/checkout from 4.1.0 to 4.1.1 (#2768)
yubiuser Oct 21, 2023
765c5ca
Bump phpstan/phpstan from 1.10.38 to 1.10.39 (#2766)
yubiuser Oct 21, 2023
607b976
Bump actions/setup-node from 3.8.1 to 4.0.0
dependabot[bot] Oct 28, 2023
0f0db85
Bump actions/setup-node from 3.8.1 to 4.0.0 (#2788)
yubiuser Oct 28, 2023
070ccb5
Added new LCARS theme
MichalSvatos Sep 19, 2023
e38522b
New theme LCARS-Picard (#2709)
rdwebdesign Nov 1, 2023
c968fb0
Bump phpstan/phpstan from 1.10.39 to 1.10.40
dependabot[bot] Nov 4, 2023
a8b946a
Bump phpstan/phpstan from 1.10.39 to 1.10.40 (#2804)
yubiuser Nov 4, 2023
7696e31
Bump phpstan/phpstan from 1.10.40 to 1.10.41
dependabot[bot] Nov 11, 2023
4364c04
Bump phpstan/phpstan from 1.10.40 to 1.10.41 (#2816)
yubiuser Nov 11, 2023
d64d2ba
Add word break for clients column, to avoid horizintal scrollbar
rdwebdesign Nov 15, 2023
503315d
Add word break for clients column to avoid horizontal scrollbar (#2838)
rdwebdesign Nov 15, 2023
ba57c01
Bump prettier from 3.0.3 to 3.1.0
dependabot[bot] Nov 18, 2023
2d0bc06
Bump phpstan/phpstan from 1.10.41 to 1.10.42
dependabot[bot] Nov 18, 2023
04c617c
Bump phpstan/phpstan from 1.10.41 to 1.10.42 (#2849)
yubiuser Nov 18, 2023
160ff4e
Bump prettier from 3.0.3 to 3.1.0 (#2848)
yubiuser Nov 18, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].1
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
-
name: Checkout repository
uses: actions/[email protected].0
uses: actions/[email protected].1
-
name: Spell-Checking
uses: codespell-project/actions-codespell@master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/editorconfig-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ jobs:
name: editorconfig-checker
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
- uses: editorconfig-checker/action-editorconfig-checker@main
- run: editorconfig-checker
2 changes: 1 addition & 1 deletion .github/workflows/php-cs-fixer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
name: PHP-CS-Fixer
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1
- name: PHP-CS-Fixer
uses: docker://oskarstark/php-cs-fixer-ga
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].0
- uses: actions/[email protected].1

- name: Install composer
uses: php-actions/composer@v6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/[email protected].0
uses: actions/[email protected].1
- name: Remove 'stale' label
run: gh issue edit ${{ github.event.issue.number }} --remove-label ${{ env.stale_label }}
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-back-to-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: Syncing branches
steps:
- name: Checkout
uses: actions/[email protected].0
uses: actions/[email protected].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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:

steps:
- name: Clone repository
uses: actions/[email protected].0
uses: actions/[email protected].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
Expand Down
12 changes: 6 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion scripts/pi-hole/js/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion scripts/pi-hole/php/header.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 { ?>
Expand Down
1 change: 1 addition & 0 deletions scripts/pi-hole/php/theme.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 14 additions & 5 deletions style/pi-hole.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Loading