From 30fa0c947429fd144e62da84d721b7e31bf82557 Mon Sep 17 00:00:00 2001 From: Michael Miday Date: Sat, 2 Sep 2017 15:44:47 -0400 Subject: [PATCH] [ticket/15344] update stylelint and fix issues PHPBB3-15344 --- .stylelintrc | 2 +- package.json | 2 +- phpBB/adm/style/admin.css | 14 +++++++------- .../styles/prosilver/template/memberlist_team.html | 2 +- phpBB/styles/prosilver/theme/content.css | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.stylelintrc b/.stylelintrc index 4740068395..a58e7ab8da 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -161,7 +161,7 @@ "selector-type-no-unknown": true, "selector-descendant-combinator-no-non-space": true, - "selector-no-id": true, + "selector-max-id": 0, "selector-no-qualifying-type": [ true, { "ignore": ["attribute"] diff --git a/package.json b/package.json index e97fc5cc78..151535c826 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ }, "homepage": "https://www.phpbb.com", "devDependencies": { - "stylelint": "7.8.0", + "stylelint": "8.0.0", "stylelint-order": "0.3.0" } } diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 6e736ee6d2..b93318e7eb 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -8,7 +8,7 @@ ------------------------------------------------------------------------ */ -/* stylelint-disable selector-no-id */ +/* stylelint-disable selector-max-id */ /* stylelint-disable selector-max-compound-selectors */ /* stylelint-disable selector-no-qualifying-type */ /* stylelint-disable declaration-property-unit-blacklist */ @@ -2966,15 +2966,15 @@ fieldset.permissions .permissions-switch { min-height: 18px; } -/* stylelint-enable selector-no-id */ -/* stylelint-enable selector-max-compound-selectors */ -/* stylelint-enable selector-no-qualifying-type */ -/* stylelint-enable declaration-property-unit-blacklist */ -/* stylelint-enable declaration-property-unit-whitelist */ - .console-output { font-family: monospace; background-color: #2a2a2a; color: #f1f1f1; overflow-x: scroll; } + +/* stylelint-enable selector-max-id */ +/* stylelint-enable selector-max-compound-selectors */ +/* stylelint-enable selector-no-qualifying-type */ +/* stylelint-enable declaration-property-unit-blacklist */ +/* stylelint-enable declaration-property-unit-whitelist */ diff --git a/phpBB/styles/prosilver/template/memberlist_team.html b/phpBB/styles/prosilver/template/memberlist_team.html index 59041fbac0..9dca281b73 100644 --- a/phpBB/styles/prosilver/template/memberlist_team.html +++ b/phpBB/styles/prosilver/template/memberlist_team.html @@ -8,7 +8,7 @@
- +
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index d4c8ea730b..dc04e8ffea 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -882,8 +882,8 @@ table.fixed-width-table { /* Factor out this ID */ /* stylelint-disable selector-no-id */ -#memberlist tr.inactive, -#team tr.inactive { +.memberlist tr.inactive, +.team tr.inactive { font-style: italic; } /* stylelint-enable selector-no-id */
{L_RANK} {group.GROUP_NAME}{group.GROUP_NAME}