makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6389 from marc1706/ticket/16405

Browse source 
[ticket/16405] Update npm dependencies
This commit is contained in:
Marc Alexander 2022-04-16 21:05:47 +02:00 • committed by GitHub
commit 7ab44b8c71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 1305 additions and 4888 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.stylelintrc
View file

@ -61,10 +61,10 @@
"declaration-empty-line-before": "never", "declaration-empty-line-before": "never",
"declaration-property-unit-blacklist": { "declaration-property-unit-disallowed-list": {
"line-height": ["rem", "em", "%"] "line-height": ["rem", "em", "%"]
}, },
"declaration-property-unit-whitelist": { "declaration-property-unit-allowed-list": {
"height": ["px", "%", "vh"], "height": ["px", "%", "vh"],
"width": ["px", "%", "vw"], "width": ["px", "%", "vw"],
"font-size": ["px", "rem", "%"], "font-size": ["px", "rem", "%"],

6141
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

20
package.json
View file

@ -94,18 +94,18 @@
}, },
"homepage": "https://www.phpbb.com", "homepage": "https://www.phpbb.com",
"devDependencies": { "devDependencies": {
"autoprefixer": "^10.2.5", "autoprefixer": "^10.4.4",
"cssnano": "^5.0.2", "cssnano": "^5.1.7",
"eslint": "^7.27.0", "eslint": "^8.13.0",
"eslint-config-xo": "^0.36.0", "eslint-config-xo": "^0.40.0",
"gulp": "^4.0.2", "gulp": "^4.0.2",
"gulp-concat-css": "^3.1.0", "gulp-concat-css": "^3.1.0",
"gulp-postcss": "^9.0.0", "gulp-postcss": "^9.0.1",
"gulp-rename": "^2.0.0", "gulp-rename": "^2.0.0",
"gulp-sourcemaps": "^2.6.5", "gulp-sourcemaps": "^3.0.0",
"postcss": "^8.2.15", "postcss": "^8.4.12",
"postcss-sorting": "^6.0.0", "postcss-sorting": "^7.0.1",
"stylelint": "^13.13.1", "stylelint": "^14.7.0",
"stylelint-order": "^4.1.0" "stylelint-order": "^5.0.0"
} }
} }

8
phpBB/adm/style/admin.css
View file

@ -11,8 +11,8 @@
/* stylelint-disable selector-max-id */ /* stylelint-disable selector-max-id */
/* stylelint-disable selector-max-compound-selectors */ /* stylelint-disable selector-max-compound-selectors */
/* stylelint-disable selector-no-qualifying-type */ /* stylelint-disable selector-no-qualifying-type */
/* stylelint-disable declaration-property-unit-blacklist */ /* stylelint-disable declaration-property-unit-disallowed-list */
/* stylelint-disable declaration-property-unit-whitelist */ /* stylelint-disable declaration-property-unit-allowed-list */
/* General markup styles /* General markup styles
---------------------------------------- */ ---------------------------------------- */
@ -3021,8 +3021,8 @@ fieldset.permissions .permissions-switch {
/* stylelint-enable selector-max-id */ /* stylelint-enable selector-max-id */
/* stylelint-enable selector-max-compound-selectors */ /* stylelint-enable selector-max-compound-selectors */
/* stylelint-enable selector-no-qualifying-type */ /* stylelint-enable selector-no-qualifying-type */
/* stylelint-enable declaration-property-unit-blacklist */ /* stylelint-enable declaration-property-unit-disallowed-list */
/* stylelint-enable declaration-property-unit-whitelist */ /* stylelint-enable declaration-property-unit-allowed-list */
.acp-icon-move-up, .acp-icon-move-up,
.acp-icon-move-down { .acp-icon-move-down {

10
phpBB/assets/javascript/mentions.js
View file

@ -194,9 +194,7 @@
}); });
// Sort names by priorities - higher values come first // Sort names by priorities - higher values come first
_results = _results.sort((a, b) => { _results = _results.sort((a, b) => b.priority - a.priority);
return b.priority - a.priority;
});
// Exact match is the most important - should come above anything else // Exact match is the most important - should come above anything else
$.each(_exactMatch, (name, value) => { $.each(_exactMatch, (name, value) => {
@ -233,9 +231,9 @@
* 2) We have enough names to display OR * 2) We have enough names to display OR
* all relevant names have been fetched from the server * all relevant names have been fetched from the server
*/ */
if (cachedNamesForQuery && if (cachedNamesForQuery
(getMatchedNames(query, cachedNamesForQuery, cachedSearchKey).length >= mentionNamesLimit || && (getMatchedNames(query, cachedNamesForQuery, cachedSearchKey).length >= mentionNamesLimit
cachedAll[cachedKeyword])) { || cachedAll[cachedKeyword])) {
callback(cachedNamesForQuery); callback(cachedNamesForQuery);
return; return;
} }

4
phpBB/styles/prosilver/theme/common.css
View file

@ -1227,14 +1227,14 @@ ul.linklist:after,
content: ""; content: "";
} }
/* stylelint-disable declaration-property-unit-whitelist */ /* stylelint-disable declaration-property-unit-allowed-list */
.emoji { .emoji {
width: 1em; width: 1em;
min-width: 18px; min-width: 18px;
height: 1em; height: 1em;
min-height: 18px; min-height: 18px;
} }
/* stylelint-enable declaration-property-unit-whitelist */ /* stylelint-enable declaration-property-unit-allowed-list */
.smilies { .smilies {
vertical-align: text-bottom; vertical-align: text-bottom;

4
phpBB/styles/prosilver/theme/print.css
View file

@ -220,13 +220,13 @@ code { display: block; }
display: none; display: none;
} }
/* stylelint-disable declaration-property-unit-whitelist */ /* stylelint-disable declaration-property-unit-allowed-list */
.emoji { .emoji {
width: 1em; width: 1em;
min-width: 18px; min-width: 18px;
height: 1em; height: 1em;
min-height: 18px; min-height: 18px;
} }
/* stylelint-enable declaration-property-unit-whitelist */ /* stylelint-enable declaration-property-unit-allowed-list */
/* stylelint-enable selector-max-compound-selectors */ /* stylelint-enable selector-max-compound-selectors */