From dc574490413407063c50bc0b0bc2480b61f5281f Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 2 Jan 2023 13:11:07 +0100 Subject: [PATCH 001/124] Localisation updates from https://translatewiki.net. --- i18n/ko.json | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/i18n/ko.json b/i18n/ko.json index c66f270e..831c0667 100644 --- a/i18n/ko.json +++ b/i18n/ko.json @@ -2,10 +2,15 @@ "@metadata": { "authors": [ "Alistair3149", - "Ykhwong" + "Ykhwong", + "렌즈" ] }, + "citizen.css": "/* 여기의 모든 CSS는 시티즌 스킨을 사용하는 사용자에게 로드됩니다 */", + "citizen.js": "/* 여기의 모든 자바스크립트는 시티즌 스킨을 사용하는 사용자에게 로드됩니다 */", + "citizen-drawer-toggle": "메뉴 여닫기", "citizen-usermenu-toggle": "개인 메뉴 토글", + "citizen-search-toggle": "검색 여닫기", "citizen-languages-toggle": "기타 언어", "citizen-actions-more-toggle": "다른 명령", "citizen-sitestats-articles-label": "문서", @@ -15,9 +20,22 @@ "citizen-page-info-copyright": "저작권", "citizen-page-info-credits": "제작진", "citizen-page-info-lastmod": "마지막 수정", + "citizen-footer-desc": "[[MediaWiki:Citizen-footer-desc]]에서 이 문장을 편집할 수 있습니다.", + "citizen-footer-tagline": "[[MediaWiki:Citizen-footer-tagline]]에서 이 문장을 편집할 수 있습니다.", "citizen-action-addsection": "주제 추가", "citizen-jumptotop": "맨 위로 돌아가기", + "citizen-search-fulltext": "$1 포함된 문서 검색", + "citizen-search-mediasearch": "$1 관련 미디어 검색", "citizen-search-empty-desc": "검색을 시작하려면 입력하세요", + "citizen-search-noresults-title": "저런! $1 관련 결과가 없습니다", + "citizen-search-noresults-desc": "아래 옵션을 시도해 볼까요?", + "citizen-tagline-ns-talk": "{{SUBJECTPAGENAME}}의 토론 문서", + "citizen-tagline-ns-project": "{{SITENAME}}에 대한 정보", + "citizen-tagline-ns-file": "{{SITENAME}}의 파일", + "citizen-tagline-ns-mediawiki": "미디어위키 인터페이스 문서", + "citizen-tagline-ns-template": "틀 문서", + "citizen-tagline-ns-help": "도움말 문서", + "citizen-tagline-ns-category": "분류 문서", "prefs-citizen-theme-label": "테마", "prefs-citizen-theme-option-auto": "자동", "prefs-citizen-theme-option-light": "밝음", From 8c4bd54d32b149398f956d53741aaa63d352b32c Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Tue, 3 Jan 2023 19:26:33 -0500 Subject: [PATCH 002/124] =?UTF-8?q?feat(core):=20=E2=9C=A8=20only=20add=20?= =?UTF-8?q?upload=20link=20when=20it=20is=20enabled?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Citizen should not add upload link to drawer when $wgEnableUploads is false. --- includes/Partials/Drawer.php | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/includes/Partials/Drawer.php b/includes/Partials/Drawer.php index a19f3dad..56df012e 100644 --- a/includes/Partials/Drawer.php +++ b/includes/Partials/Drawer.php @@ -103,18 +103,22 @@ final class Drawer extends Partial { 'id' => 't-specialpages' ] ); + // Upload file - if ( ExtensionRegistry::getInstance()->isLoaded( 'Upload Wizard' ) ) { - // Link to Upload Wizard if present - $uploadHref = SpecialPage::getTitleFor( 'UploadWizard' )->getLocalURL(); - } else { - // Link to old upload form - $uploadHref = Skin::makeSpecialUrl( 'Upload' ); + // Only add upload file link when $wgEnableUploads is true + if ( $this->getConfigValue( 'EnableUploads' ) === true ) { + if ( ExtensionRegistry::getInstance()->isLoaded( 'Upload Wizard' ) ) { + // Link to Upload Wizard if present + $uploadHref = SpecialPage::getTitleFor( 'UploadWizard' )->getLocalURL(); + } else { + // Link to old upload form + $uploadHref = Skin::makeSpecialUrl( 'Upload' ); + } + $html .= $skin->makeListItem( 'upload', [ + 'href' => $uploadHref, + 'id' => 't-upload' + ] ); } - $html .= $skin->makeListItem( 'upload', [ - 'href' => $uploadHref, - 'id' => 't-upload' - ] ); return $html; } From aacf10b20c860adbca5c5d4213d42234f61c3f4f Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 4 Jan 2023 00:28:23 +0000 Subject: [PATCH 003/124] =?UTF-8?q?ci:=20=F0=9F=91=B7=20lint=20code=20to?= =?UTF-8?q?=20MediaWiki=20standards?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Check commit and GitHub actions for more details --- includes/Partials/Drawer.php | 1 - 1 file changed, 1 deletion(-) diff --git a/includes/Partials/Drawer.php b/includes/Partials/Drawer.php index 56df012e..c65f1ddf 100644 --- a/includes/Partials/Drawer.php +++ b/includes/Partials/Drawer.php @@ -103,7 +103,6 @@ final class Drawer extends Partial { 'id' => 't-specialpages' ] ); - // Upload file // Only add upload file link when $wgEnableUploads is true if ( $this->getConfigValue( 'EnableUploads' ) === true ) { From 93514f7f5fc90acb824a9106662d155723d6994f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Jan 2023 19:50:13 -0500 Subject: [PATCH 004/124] chore(deps-dev): bump husky from 8.0.2 to 8.0.3 (#562) Bumps [husky](https://github.com/typicode/husky) from 8.0.2 to 8.0.3. - [Release notes](https://github.com/typicode/husky/releases) - [Commits](https://github.com/typicode/husky/compare/v8.0.2...v8.0.3) --- updated-dependencies: - dependency-name: husky dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index f4976a8d..8bcdac11 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "devmoji": "^2.3.0", "eslint-config-wikimedia": "0.23.0", "grunt-banana-checker": "0.10.0", - "husky": "^8.0.2", + "husky": "^8.0.3", "jsdoc": "4.0.0", "jsdoc-wmf-theme": "0.0.5", "standard-version": "^9.5.0", @@ -3267,9 +3267,9 @@ } }, "node_modules/husky": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.2.tgz", - "integrity": "sha512-Tkv80jtvbnkK3mYWxPZePGFpQ/tT3HNSs/sasF9P2YfkMezDl3ON37YN6jUUI4eTg5LcyVynlb6r4eyvOmspvg==", + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz", + "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==", "dev": true, "bin": { "husky": "lib/bin.js" @@ -8523,9 +8523,9 @@ "dev": true }, "husky": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.2.tgz", - "integrity": "sha512-Tkv80jtvbnkK3mYWxPZePGFpQ/tT3HNSs/sasF9P2YfkMezDl3ON37YN6jUUI4eTg5LcyVynlb6r4eyvOmspvg==", + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz", + "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==", "dev": true }, "ignore": { diff --git a/package.json b/package.json index 60c6c84d..d955e606 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "devmoji": "^2.3.0", "eslint-config-wikimedia": "0.23.0", "grunt-banana-checker": "0.10.0", - "husky": "^8.0.2", + "husky": "^8.0.3", "jsdoc": "4.0.0", "jsdoc-wmf-theme": "0.0.5", "standard-version": "^9.5.0", From 286f4f2f1d77f2c3c3d1b97d54a0cb5e7fa36f33 Mon Sep 17 00:00:00 2001 From: "H. C. Kruse" <6594492+octfx@users.noreply.github.com> Date: Wed, 4 Jan 2023 03:00:48 +0100 Subject: [PATCH 005/124] feat(ReplaceText): add ReplaceText styles (#561) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: Add ReplaceText styles * ci: 👷 lint code to MediaWiki standards Check commit and GitHub actions for more details * docs: 📚️ add missing documentation Co-authored-by: github-actions Co-authored-by: alistair3149 --- README.md | 1 + skin.json | 1 + .../ReplaceText/ext.ReplaceTextStyles.less | 22 +++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 skinStyles/extensions/ReplaceText/ext.ReplaceTextStyles.less diff --git a/README.md b/README.md index 0de78a6a..c5bdf77b 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,7 @@ Name | Grade | Version | Last updated [Popups](https://www.mediawiki.org/wiki/Extension:Popups) | A | REL1_39 `a40ebc1` | 2022-11-28 [PortableInfobox](https://www.mediawiki.org/wiki/Extension:PortableInfobox) | B | 0.6 `16a77dc` | 2022-04-14 [RelatedArticles](https://www.mediawiki.org/wiki/Extension:RelatedArticles) | A | REL1_39 `f513e5c` | 2022-11-16 +[ReplaceText](https://www.mediawiki.org/wiki/Extension:ReplaceText) | B | REL1_39 `af4840a` | 2023-01-03 [RevisionSlider](https://www.mediawiki.org/wiki/Extension:RevisionSlider) | B | REL1_35 `4c4e368` | 2022-06-02 [Semantic MediaWiki](https://www.mediawiki.org/wiki/Extension:Semantic_MediaWiki) | A | 4.0.2 `0fcdfce` | 2022-10-21 [Semantic Result Formats](https://www.mediawiki.org/wiki/Extension:Semantic_Result_Formats) | E | N/A | N/A diff --git a/skin.json b/skin.json index 10dcd6b0..37980b67 100644 --- a/skin.json +++ b/skin.json @@ -326,6 +326,7 @@ "+ext.MsUpload": "skinStyles/extensions/MsUpload/ext.MsUpload.less", "+ext.relatedArticles.styles": "skinStyles/extensions/RelatedArticles/ext.relatedArticles.styles.less", "+ext.relatedArticles.readMore": "skinStyles/extensions/RelatedArticles/ext.relatedArticles.readMore.less", + "+ext.ReplaceTextStyles": "skinStyles/extensions/ReplaceText/ext.ReplaceTextStyles.less", "+ext.RevisionSlider.lazyCss": "skinStyles/extensions/RevisionSlider/ext.RevisionSlider.lazyCss.less", "+ext.RevisionSlider.init": "skinStyles/extensions/RevisionSlider/ext.RevisionSlider.init.less", "+ext.jquery.atwho": "skinStyles/extensions/SemanticMediaWiki/ext.jquery.atwho.less", diff --git a/skinStyles/extensions/ReplaceText/ext.ReplaceTextStyles.less b/skinStyles/extensions/ReplaceText/ext.ReplaceTextStyles.less new file mode 100644 index 00000000..ce8a509b --- /dev/null +++ b/skinStyles/extensions/ReplaceText/ext.ReplaceTextStyles.less @@ -0,0 +1,22 @@ +/* + * Citizen + * + * SkinStyles for Extension:ReplaceText + * Module: ext.ReplaceTextStyles + * Version: REL1_39 (af4840a) + * + * Date: 2023-01-03 +*/ + +.ext-replacetext-searchmatch { + font-weight: 600; +} + +.ext-replacetext-searchoptions { + border: 1px solid var( --border-color-base ); + background-color: var( --color-surface-2 ); + + .ext-replacetext-divider { + border-bottom: 1px solid var( --border-color-base ); + } +} From a017bae502b99daf19f8bd8f5694fce133deb858 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Tue, 3 Jan 2023 22:47:51 -0500 Subject: [PATCH 006/124] =?UTF-8?q?feat(Cargo):=20=E2=9C=A8=20update=20par?= =?UTF-8?q?tial=20Cargo=20styles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cargo is massive so it might have to be broken down into several commits --- README.md | 2 +- skin.json | 11 + .../extensions/Cargo/ext.cargo.bpmn.less | 9 + .../extensions/Cargo/ext.cargo.calendar.less | 9 + .../Cargo/ext.cargo.cargotables.less | 18 ++ .../Cargo/ext.cargo.datatables.less | 263 ++++++++++++++++++ .../extensions/Cargo/ext.cargo.diagram.less | 9 + .../extensions/Cargo/ext.cargo.drilldown.less | 9 + .../extensions/Cargo/ext.cargo.gantt.less | 9 + .../extensions/Cargo/ext.cargo.main.less | 73 +++-- .../Cargo/ext.cargo.pagevalues.less | 31 +++ .../extensions/Cargo/ext.cargo.slick.less | 9 + .../extensions/Cargo/ext.cargo.timeline.less | 9 + .../extensions/Cargo/ext.cargo.zip.less | 9 + .../ReplaceText/ext.ReplaceTextStyles.less | 5 +- .../datatables/ext.srf.datatables.basic.less | 2 +- 16 files changed, 449 insertions(+), 28 deletions(-) create mode 100644 skinStyles/extensions/Cargo/ext.cargo.bpmn.less create mode 100644 skinStyles/extensions/Cargo/ext.cargo.calendar.less create mode 100644 skinStyles/extensions/Cargo/ext.cargo.cargotables.less create mode 100644 skinStyles/extensions/Cargo/ext.cargo.datatables.less create mode 100644 skinStyles/extensions/Cargo/ext.cargo.diagram.less create mode 100644 skinStyles/extensions/Cargo/ext.cargo.drilldown.less create mode 100644 skinStyles/extensions/Cargo/ext.cargo.gantt.less create mode 100644 skinStyles/extensions/Cargo/ext.cargo.pagevalues.less create mode 100644 skinStyles/extensions/Cargo/ext.cargo.slick.less create mode 100644 skinStyles/extensions/Cargo/ext.cargo.timeline.less create mode 100644 skinStyles/extensions/Cargo/ext.cargo.zip.less diff --git a/README.md b/README.md index c5bdf77b..46f20e76 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Name | Grade | Version | Last updated [ApprovedRevs](https://www.mediawiki.org/wiki/Extension:Approved_Revs) | B | N/A | N/A [Babel](https://www.mediawiki.org/wiki/Extension:Babel) | B | MLEB 2021.07 | 2021-07-29 [Capiunto](https://www.mediawiki.org/wiki/Extension:Capiunto) | B | REL1_35 `30049a7` | 2021-08-26 -[Cargo](https://www.mediawiki.org/wiki/Extension:Cargo) | B | REL1_35 `df13273` | 2021-08-31 +[Cargo](https://www.mediawiki.org/wiki/Extension:Cargo) | B | REL1_39 `b4c6314` | 2023-01-03 [CategoryTree](https://www.mediawiki.org/wiki/Extension:CategoryTree) | B | N/A | N/A [CentralNotice](https://www.mediawiki.org/wiki/Extension:CentralNotice) | B | REL1_35 `4aa2a8f` | 2022-06-16 [Cite](https://www.mediawiki.org/wiki/Extension:Cite) | A | N/A | N/A diff --git a/skin.json b/skin.json index 37980b67..7b24e9bf 100644 --- a/skin.json +++ b/skin.json @@ -287,6 +287,17 @@ "+ext.ApprovedRevs": "skinStyles/extensions/ApprovedRevs/ext.ApprovedRevs.less", "+ext.babel": "skinStyles/extensions/Babel/ext.babel.less", "+ext.cargo.main": "skinStyles/extensions/Cargo/ext.cargo.main.less", + "+ext.cargo.pagevalues": "skinStyles/extensions/Cargo/ext.cargo.pagevalues.less", + "+ext.cargo.cargotables": "skinStyles/extensions/Cargo/ext.cargo.cargotables.less", + "+ext.cargo.calendar": "skinStyles/extensions/Cargo/ext.cargo.calendar.less", + "+ext.cargo.gantt": "skinStyles/extensions/Cargo/ext.cargo.gantt.less", + "+ext.cargo.zip": "skinStyles/extensions/Cargo/ext.cargo.zip.less", + "+ext.cargo.bpmn": "skinStyles/extensions/Cargo/ext.cargo.bpmn.less", + "+ext.cargo.timeline": "skinStyles/extensions/Cargo/ext.cargo.timeline.less", + "+ext.cargo.datatables": "skinStyles/extensions/Cargo/ext.cargo.datatables.less", + "+ext.cargo.slick": "skinStyles/extensions/Cargo/ext.cargo.slick.less", + "+ext.cargo.diagram": "skinStyles/extensions/Cargo/ext.cargo.diagram.less", + "+ext.cargo.drilldown": "skinStyles/extensions/Cargo/ext.cargo.drilldown.less", "+ext.categoryTree.css": "skinStyles/extensions/CategoryTree/ext.categoryTree.css.less", "+ext.centralNotice.display": "skinStyles/extensions/CentralNotice/ext.centralNotice.display.less", "+ext.cite.styles": "skinStyles/extensions/Cite/ext.cite.styles.less", diff --git a/skinStyles/extensions/Cargo/ext.cargo.bpmn.less b/skinStyles/extensions/Cargo/ext.cargo.bpmn.less new file mode 100644 index 00000000..fc6d1430 --- /dev/null +++ b/skinStyles/extensions/Cargo/ext.cargo.bpmn.less @@ -0,0 +1,9 @@ +/* + * Citizen + * + * SkinStyles for Extension:Cargo + * Module: ext.cargo.bpmn + * Version: REL1_39 b4c6314 + * + * Date: 2023-01-03 +*/ diff --git a/skinStyles/extensions/Cargo/ext.cargo.calendar.less b/skinStyles/extensions/Cargo/ext.cargo.calendar.less new file mode 100644 index 00000000..c187ad34 --- /dev/null +++ b/skinStyles/extensions/Cargo/ext.cargo.calendar.less @@ -0,0 +1,9 @@ +/* + * Citizen + * + * SkinStyles for Extension:Cargo + * Module: ext.cargo.calendar + * Version: REL1_39 b4c6314 + * + * Date: 2023-01-03 +*/ diff --git a/skinStyles/extensions/Cargo/ext.cargo.cargotables.less b/skinStyles/extensions/Cargo/ext.cargo.cargotables.less new file mode 100644 index 00000000..ffe47a69 --- /dev/null +++ b/skinStyles/extensions/Cargo/ext.cargo.cargotables.less @@ -0,0 +1,18 @@ +/* + * Citizen + * + * SkinStyles for Extension:Cargo + * Module: ext.cargo.cargotables + * Version: REL1_39 b4c6314 + * + * Date: 2023-01-03 +*/ + +table.cargo-tablelist.mw-datatable tr.cargo-tablelist-replacement-row:hover td, +table.cargo-tablelist.mw-datatable tr.cargo-tablelist-replacement-row > td { + background-color: var( --background-color-quiet--hover ); +} + +.cargo-tablelist-template-declaring { + font-weight: var( --font-weight-semibold ); +} diff --git a/skinStyles/extensions/Cargo/ext.cargo.datatables.less b/skinStyles/extensions/Cargo/ext.cargo.datatables.less new file mode 100644 index 00000000..d90a25f3 --- /dev/null +++ b/skinStyles/extensions/Cargo/ext.cargo.datatables.less @@ -0,0 +1,263 @@ +/* + * Citizen + * + * SkinStyles for Extension:Cargo + * Module: ext.cargo.datatables + * Version: REL1_39 b4c6314 + * + * Date: 2023-01-03 +*/ + +/* jquery.dataTables.css */ +table.dataTable thead th, +table.dataTable tfoot th { + font-weight: var( --font-weight-semibold ); +} + +table.dataTable thead th, +table.dataTable thead td { + padding: var( --space-xs ) var( --space-sm ); + border-bottom-color: var( --border-color-base ); + color: var( --color-base--subtle ); + font-size: 0.8125rem; + font-weight: var( --font-weight-normal ); + letter-spacing: 0.05em; + text-align: start; +} + +table.dataTable tfoot th, +table.dataTable tfoot td { + border-top-color: var( --border-color-base ); +} + +table.dataTable thead .sorting, +table.dataTable thead .sorting_asc, +table.dataTable thead .sorting_desc { + border-radius: var( --border-radius--small ); + + &:hover { + background-color: var( --background-color-quiet--hover ); + } + + &:active { + background-color: var( --background-color-quiet--active ); + } +} + +table.dataTable thead .sorting, +table.dataTable thead .sorting_asc, +table.dataTable thead .sorting_desc, +table.dataTable thead .sorting_asc_disabled, +table.dataTable thead .sorting_desc_disabled { + // 19px is the icon size + padding-right: ~'calc( 19px + var( --space-sm ) )'; + background-position-x: ~'calc( 100% - var( --space-xs ) )'; +} + +table.dataTable tbody tr { + background-color: var( --color-surface-0 ); +} + +table.dataTable tbody tr.selected { + background-color: var( --background-color-quiet--hover ); +} + +table.dataTable tbody th, +table.dataTable tbody td { + padding: var( --space-xs ) var( --space-sm ); +} + +table.dataTable.row-border tbody th, +table.dataTable.row-border tbody td, +table.dataTable.display tbody th, +table.dataTable.display tbody td { + border-top-color: var( --border-color-base ); +} + +table.dataTable.cell-border tbody th, +table.dataTable.cell-border tbody td { + border-top-color: var( --border-color-base ); + border-right-color: var( --border-color-base ); +} + +table.dataTable.cell-border tbody tr th:first-child, +table.dataTable.cell-border tbody tr td:first-child { + border-left-color: var( --border-color-base ); +} + +table.dataTable.stripe tbody tr.odd, +table.dataTable.display tbody tr.odd { + background-color: var( --color-surface-2 ); +} + +table.dataTable.stripe tbody tr.odd.selected, +table.dataTable.display tbody tr.odd.selected { + background-color: var( --background-color-quiet--hover ); +} + +table.dataTable.hover tbody tr:hover.selected, +table.dataTable.display tbody tr:hover.selected { + background-color: var( --background-color-quiet--hover ); +} + +table.dataTable.order-column tbody tr > .sorting_1, +table.dataTable.order-column tbody tr > .sorting_2, +table.dataTable.order-column tbody tr > .sorting_3, +table.dataTable.display tbody tr > .sorting_1, +table.dataTable.display tbody tr > .sorting_2, +table.dataTable.display tbody tr > .sorting_3 { + background-color: var( --color-surface-3 ); +} + +table.dataTable.order-column tbody tr.selected > .sorting_1, +table.dataTable.order-column tbody tr.selected > .sorting_2, +table.dataTable.order-column tbody tr.selected > .sorting_3, +table.dataTable.display tbody tr.selected > .sorting_1, +table.dataTable.display tbody tr.selected > .sorting_2, +table.dataTable.display tbody tr.selected > .sorting_3 { + background-color: var( --color-surface-3 ); +} + +table.dataTable.display tbody tr.odd > .sorting_1, +table.dataTable.order-column.stripe tbody tr.odd > .sorting_1 { + background-color: var( --color-surface-3 ); +} + +table.dataTable.display tbody tr.odd > .sorting_2, +table.dataTable.order-column.stripe tbody tr.odd > .sorting_2 { + background-color: var( --color-surface-3 ); +} + +table.dataTable.display tbody tr.odd > .sorting_3, +table.dataTable.order-column.stripe tbody tr.odd > .sorting_3 { + background-color: var( --color-surface-3 ); +} + +table.dataTable.display tbody tr.odd.selected > .sorting_1, +table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_1 { + background-color: var( --color-surface-3 ); +} + +table.dataTable.display tbody tr.odd.selected > .sorting_2, +table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_2 { + background-color: var( --color-surface-3 ); +} + +table.dataTable.display tbody tr.odd.selected > .sorting_3, +table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_3 { + background-color: var( --color-surface-3 ); +} + +table.dataTable.display tbody tr.even > .sorting_1, +table.dataTable.order-column.stripe tbody tr.even > .sorting_1 { + background-color: var( --color-surface-3 ); +} + +table.dataTable.display tbody tr.even > .sorting_2, +table.dataTable.order-column.stripe tbody tr.even > .sorting_2 { + background-color: var( --color-surface-3 ); +} + +table.dataTable.display tbody tr.even > .sorting_3, +table.dataTable.order-column.stripe tbody tr.even > .sorting_3 { + background-color: var( --color-surface-3 ); +} + +table.dataTable.display tbody tr.even.selected > .sorting_1, +table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_1 { + background-color: var( --color-surface-3 ); +} + +table.dataTable.display tbody tr.even.selected > .sorting_2, +table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_2 { + background-color: var( --color-surface-3 ); +} + +table.dataTable.display tbody tr.even.selected > .sorting_3, +table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_3 { + background-color: var( --color-surface-3 ); +} + +table.dataTable.display tbody tr:hover > .sorting_1, +table.dataTable.order-column.hover tbody tr:hover > .sorting_1 { + background-color: var( --color-surface-3 ); +} + +table.dataTable.display tbody tr:hover > .sorting_2, +table.dataTable.order-column.hover tbody tr:hover > .sorting_2 { + background-color: var( --color-surface-3 ); +} + +table.dataTable.display tbody tr:hover > .sorting_3, +table.dataTable.order-column.hover tbody tr:hover > .sorting_3 { + background-color: var( --color-surface-3 ); +} + +table.dataTable.display tbody tr:hover.selected > .sorting_1, +table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_1 { + background-color: var( --color-surface-3 ); +} + +table.dataTable.display tbody tr:hover.selected > .sorting_2, +table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_2 { + background-color: var( --color-surface-3 ); +} + +table.dataTable.display tbody tr:hover.selected > .sorting_3, +table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_3 { + background-color: var( --color-surface-3 ); +} + +table.dataTable.no-footer { + border-bottom-color: var( --border-color-base ); +} + +.dataTables_wrapper .dataTables_paginate .paginate_button { + border-radius: var( --border-radius--small ); + color: var( --color-base--emphasized ) !important; + font-weight: var( --font-weight-medium ); +} + +.dataTables_wrapper .dataTables_paginate .paginate_button.current, +.dataTables_wrapper .dataTables_paginate .paginate_button.current:hover { + border-color: transparent; + background: var( --background-color-primary--active ); + color: var( --color-base--emphasized ) !important; +} + +.dataTables_wrapper .dataTables_paginate .paginate_button.disabled, +.dataTables_wrapper .dataTables_paginate .paginate_button.disabled:hover, +.dataTables_wrapper .dataTables_paginate .paginate_button.disabled:active { + color: var( --color-base--subtle ) !important; +} + +.dataTables_wrapper .dataTables_paginate .paginate_button:hover { + border-color: transparent; + background: var( --background-color-quiet--hover ); + color: var( --color-base--emphasized ) !important; +} + +.dataTables_wrapper .dataTables_paginate .paginate_button:active { + background: var( --background-color-quiet--active ); + box-shadow: none; +} + +.dataTables_wrapper .dataTables_length, +.dataTables_wrapper .dataTables_filter { + // Add some space + margin: var( --space-xs ) 0; +} + +.dataTables_wrapper .dataTables_length, +.dataTables_wrapper .dataTables_filter, +.dataTables_wrapper .dataTables_info, +.dataTables_wrapper .dataTables_processing, +.dataTables_wrapper .dataTables_paginate { + color: var( --color-base ); + font-size: 0.875rem; +} + +.dataTables_wrapper .dataTables_filter + .dataTable { + // Add top border as divider if there are filter on top + border-top: 1px solid var( --border-color-base ); +} diff --git a/skinStyles/extensions/Cargo/ext.cargo.diagram.less b/skinStyles/extensions/Cargo/ext.cargo.diagram.less new file mode 100644 index 00000000..d32fc3ef --- /dev/null +++ b/skinStyles/extensions/Cargo/ext.cargo.diagram.less @@ -0,0 +1,9 @@ +/* + * Citizen + * + * SkinStyles for Extension:Cargo + * Module: ext.cargo.diagram + * Version: REL1_39 b4c6314 + * + * Date: 2023-01-03 +*/ diff --git a/skinStyles/extensions/Cargo/ext.cargo.drilldown.less b/skinStyles/extensions/Cargo/ext.cargo.drilldown.less new file mode 100644 index 00000000..a1ca0572 --- /dev/null +++ b/skinStyles/extensions/Cargo/ext.cargo.drilldown.less @@ -0,0 +1,9 @@ +/* + * Citizen + * + * SkinStyles for Extension:Cargo + * Module: ext.cargo.drilldown + * Version: REL1_39 b4c6314 + * + * Date: 2023-01-03 +*/ diff --git a/skinStyles/extensions/Cargo/ext.cargo.gantt.less b/skinStyles/extensions/Cargo/ext.cargo.gantt.less new file mode 100644 index 00000000..b94efc98 --- /dev/null +++ b/skinStyles/extensions/Cargo/ext.cargo.gantt.less @@ -0,0 +1,9 @@ +/* + * Citizen + * + * SkinStyles for Extension:Cargo + * Module: ext.cargo.gantt + * Version: REL1_39 b4c6314 + * + * Date: 2023-01-03 +*/ diff --git a/skinStyles/extensions/Cargo/ext.cargo.main.less b/skinStyles/extensions/Cargo/ext.cargo.main.less index 54a610ae..338cbbcb 100644 --- a/skinStyles/extensions/Cargo/ext.cargo.main.less +++ b/skinStyles/extensions/Cargo/ext.cargo.main.less @@ -3,9 +3,9 @@ * * SkinStyles for Extension:Cargo * Module: ext.cargo.main - * Version: REL1_35 df13273 + * Version: REL1_39 b4c6314 * - * Date: 2021-08-31 + * Date: 2023-01-03 */ span.cargoFieldName { @@ -13,23 +13,52 @@ span.cargoFieldName { } table.cargoTable.noMerge tr:nth-child( odd ) { - background: transparent; + background: var( --color-surface-0 ); } table.cargoTable.noMerge tr:nth-child( even ) { - background: var( --background-color-quiet--hover ); + background: var( --color-surface-2 ); } table.cargoTable.mergeSimilarCells td.odd { - background: transparent; + background: var( --color-surface-0 ); } table.cargoTable.mergeSimilarCells td.even { - background: var( --background-color-quiet--hover ); + background: var( --color-surface-2 ); +} + +table.cargoTable thead tr { + border-bottom: 1px solid var( --border-color-base ); +} + +table.cargoTable tr + tr { + border-top: 1px solid var( --border-color-base ); +} + +table.cargoTable th, +table.cargoTable td { + /* Sync with wikitable */ + padding: var( --space-xs ) var( --space-sm ); +} + +table.cargoTable th { + /* Sync with wikitable */ + color: var( --color-base--subtle ); + font-size: 0.8125rem; + font-weight: var( --font-weight-normal ); + letter-spacing: 0.05em; + text-align: start; } table.cargoTable td { - border-color: var( --border-color-base ); + /* Border handled by tr */ + border: 0; +} + +span.searchmatch { + color: var( --color-base--emphasized ); + font-weight: var( --font-weight-semibold ); } div.cargoReplacementTableInfo { @@ -37,14 +66,20 @@ div.cargoReplacementTableInfo { background: var( --color-surface-3 ); } -.addButton { - border-color: var( --border-color-base ); - background-color: var( --color-surface-2 ); -} - +.addButton, .deleteButton { border-color: var( --border-color-base ); - background-color: var( --color-surface-2 ); + /* BG color does not like filter */ + background-color: transparent; +} + +/* Flip icons in dark mode */ +.skin-citizen-dark { + .cargoQueryTooltipIcon, + .addButton, + .deleteButton { + filter: invert( 1 ) hue-rotate( 180deg ); + } } div.specialCargoQuery-extraPane { @@ -58,15 +93,5 @@ div.specialCargoQuery-extraPane { .ui-menu .ui-menu-item a { color: var( --color-base--emphasized ); -} - -table.cargo-tablelist.mw-datatable tr.cargo-tablelist-replacement-row:hover td, -.cargo-tablelist-replacement-row > td { - background-color: var( --background-color-quiet--hover ); -} - -.skin-citizen-dark { - .cargoQueryTooltipIcon { - filter: invert( 1 ) hue-rotate( 180deg ); - } + font-family: var( --font-family-base ); } diff --git a/skinStyles/extensions/Cargo/ext.cargo.pagevalues.less b/skinStyles/extensions/Cargo/ext.cargo.pagevalues.less new file mode 100644 index 00000000..f7144bb3 --- /dev/null +++ b/skinStyles/extensions/Cargo/ext.cargo.pagevalues.less @@ -0,0 +1,31 @@ +/* + * Citizen + * + * SkinStyles for Extension:Cargo + * Module: ext.cargo.pagevalues + * Version: REL1_39 b4c6314 + * + * Date: 2023-01-03 +*/ + +@import '../../../resources/mixins.less'; + +// Disable sticky header since it collides with cargo sticky header +#citizen-body-header-sticky-sentinel { + display: none; +} + +// Apply Citizen sticky header styles +.cargo-pagevalues-tableinfo { + padding: var( --space-md ) 0; + background-color: transparent; + color: var( --color-base--subtle ); + font-size: 0.875rem; + .citizen-sticky-header; + + // Tweak size to look more like other sticky header + h2 { + margin: 0; + font-size: var( --font-size-h3 ); + } +} diff --git a/skinStyles/extensions/Cargo/ext.cargo.slick.less b/skinStyles/extensions/Cargo/ext.cargo.slick.less new file mode 100644 index 00000000..47a5e8f1 --- /dev/null +++ b/skinStyles/extensions/Cargo/ext.cargo.slick.less @@ -0,0 +1,9 @@ +/* + * Citizen + * + * SkinStyles for Extension:Cargo + * Module: ext.cargo.slick + * Version: REL1_39 b4c6314 + * + * Date: 2023-01-03 +*/ diff --git a/skinStyles/extensions/Cargo/ext.cargo.timeline.less b/skinStyles/extensions/Cargo/ext.cargo.timeline.less new file mode 100644 index 00000000..c9f3bcca --- /dev/null +++ b/skinStyles/extensions/Cargo/ext.cargo.timeline.less @@ -0,0 +1,9 @@ +/* + * Citizen + * + * SkinStyles for Extension:Cargo + * Module: ext.cargo.timeline + * Version: REL1_39 b4c6314 + * + * Date: 2023-01-03 +*/ diff --git a/skinStyles/extensions/Cargo/ext.cargo.zip.less b/skinStyles/extensions/Cargo/ext.cargo.zip.less new file mode 100644 index 00000000..44506d16 --- /dev/null +++ b/skinStyles/extensions/Cargo/ext.cargo.zip.less @@ -0,0 +1,9 @@ +/* + * Citizen + * + * SkinStyles for Extension:Cargo + * Module: ext.cargo.zip + * Version: REL1_39 b4c6314 + * + * Date: 2023-01-03 +*/ diff --git a/skinStyles/extensions/ReplaceText/ext.ReplaceTextStyles.less b/skinStyles/extensions/ReplaceText/ext.ReplaceTextStyles.less index ce8a509b..92015744 100644 --- a/skinStyles/extensions/ReplaceText/ext.ReplaceTextStyles.less +++ b/skinStyles/extensions/ReplaceText/ext.ReplaceTextStyles.less @@ -3,13 +3,14 @@ * * SkinStyles for Extension:ReplaceText * Module: ext.ReplaceTextStyles - * Version: REL1_39 (af4840a) + * Version: REL1_39 af4840a * * Date: 2023-01-03 */ .ext-replacetext-searchmatch { - font-weight: 600; + color: var( --color-base--emphasized ); + font-weight: var( --font-weight-semibold ); } .ext-replacetext-searchoptions { diff --git a/skinStyles/extensions/SemanticResultFormats/datatables/ext.srf.datatables.basic.less b/skinStyles/extensions/SemanticResultFormats/datatables/ext.srf.datatables.basic.less index b0932bb9..63904fd5 100644 --- a/skinStyles/extensions/SemanticResultFormats/datatables/ext.srf.datatables.basic.less +++ b/skinStyles/extensions/SemanticResultFormats/datatables/ext.srf.datatables.basic.less @@ -16,7 +16,7 @@ table.dataTable tr.odd { } table.dataTable tr.even { - background-color: var( --color-surface-1 ); + background-color: var( --color-surface-0 ); } table.dataTable tr.odd td.sorting_1 { From 8adf25e350e78f6d12b4533b97371809e6971015 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Tue, 3 Jan 2023 22:49:08 -0500 Subject: [PATCH 007/124] =?UTF-8?q?fix(Cargo):=20=F0=9F=90=9B=20add=20data?= =?UTF-8?q?table=20odd=20row=20hover=20styles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skinStyles/extensions/Cargo/ext.cargo.datatables.less | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/skinStyles/extensions/Cargo/ext.cargo.datatables.less b/skinStyles/extensions/Cargo/ext.cargo.datatables.less index d90a25f3..81e1256d 100644 --- a/skinStyles/extensions/Cargo/ext.cargo.datatables.less +++ b/skinStyles/extensions/Cargo/ext.cargo.datatables.less @@ -88,6 +88,11 @@ table.dataTable.cell-border tbody tr td:first-child { table.dataTable.stripe tbody tr.odd, table.dataTable.display tbody tr.odd { background-color: var( --color-surface-2 ); + + &:hover { + // Added hover styles + background-color: var( --background-color-quiet--hover ); + } } table.dataTable.stripe tbody tr.odd.selected, From 4f0286aa7c9a309e1950d30ffea5206107915289 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 4 Jan 2023 03:50:03 +0000 Subject: [PATCH 008/124] =?UTF-8?q?ci:=20=F0=9F=91=B7=20lint=20code=20to?= =?UTF-8?q?=20MediaWiki=20standards?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Check commit and GitHub actions for more details --- skinStyles/extensions/Cargo/ext.cargo.datatables.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/skinStyles/extensions/Cargo/ext.cargo.datatables.less b/skinStyles/extensions/Cargo/ext.cargo.datatables.less index 81e1256d..7c73911b 100644 --- a/skinStyles/extensions/Cargo/ext.cargo.datatables.less +++ b/skinStyles/extensions/Cargo/ext.cargo.datatables.less @@ -89,10 +89,10 @@ table.dataTable.stripe tbody tr.odd, table.dataTable.display tbody tr.odd { background-color: var( --color-surface-2 ); - &:hover { - // Added hover styles - background-color: var( --background-color-quiet--hover ); - } + &:hover { + // Added hover styles + background-color: var( --background-color-quiet--hover ); + } } table.dataTable.stripe tbody tr.odd.selected, From dd7f21bc8e966bf4dc2a1f553704b4892585001c Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Tue, 3 Jan 2023 22:52:15 -0500 Subject: [PATCH 009/124] =?UTF-8?q?feat(Cargo):=20=E2=9C=A8=20add=20respon?= =?UTF-8?q?sive=20support=20for=20datatable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skinStyles/extensions/Cargo/ext.cargo.datatables.less | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/skinStyles/extensions/Cargo/ext.cargo.datatables.less b/skinStyles/extensions/Cargo/ext.cargo.datatables.less index 7c73911b..24094bb3 100644 --- a/skinStyles/extensions/Cargo/ext.cargo.datatables.less +++ b/skinStyles/extensions/Cargo/ext.cargo.datatables.less @@ -9,6 +9,13 @@ */ /* jquery.dataTables.css */ +table.dataTable { + /* FIXME: Better handling of responsive table */ + display: block; + overflow: auto; + max-width: 100%; +} + table.dataTable thead th, table.dataTable tfoot th { font-weight: var( --font-weight-semibold ); From 1dcb37a4675ee1d75a4a2a6f15da62bc1d419d47 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Tue, 3 Jan 2023 22:57:04 -0500 Subject: [PATCH 010/124] =?UTF-8?q?feat(Cargo):=20=E2=9C=A8=20datatable=20?= =?UTF-8?q?should=20have=20reduced=20font=20size?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skinStyles/extensions/Cargo/ext.cargo.datatables.less | 1 + 1 file changed, 1 insertion(+) diff --git a/skinStyles/extensions/Cargo/ext.cargo.datatables.less b/skinStyles/extensions/Cargo/ext.cargo.datatables.less index 24094bb3..d79a4f3b 100644 --- a/skinStyles/extensions/Cargo/ext.cargo.datatables.less +++ b/skinStyles/extensions/Cargo/ext.cargo.datatables.less @@ -14,6 +14,7 @@ table.dataTable { display: block; overflow: auto; max-width: 100%; + font-size: 0.875rem; } table.dataTable thead th, From 5db562008e51a727ead340fce6505affb0d5ef4d Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Tue, 3 Jan 2023 22:58:17 -0500 Subject: [PATCH 011/124] =?UTF-8?q?feat(Cargo):=20=E2=9C=A8=20cargo=20tabl?= =?UTF-8?q?e=20should=20have=20reduced=20font=20size?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skinStyles/extensions/Cargo/ext.cargo.main.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/skinStyles/extensions/Cargo/ext.cargo.main.less b/skinStyles/extensions/Cargo/ext.cargo.main.less index 338cbbcb..e49be443 100644 --- a/skinStyles/extensions/Cargo/ext.cargo.main.less +++ b/skinStyles/extensions/Cargo/ext.cargo.main.less @@ -28,6 +28,10 @@ table.cargoTable.mergeSimilarCells td.even { background: var( --color-surface-2 ); } +table.cargoTable { + font-size: 0.875rem; +} + table.cargoTable thead tr { border-bottom: 1px solid var( --border-color-base ); } From 9497163637e124ff3124504ed331a6b28f572b92 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 4 Jan 2023 03:59:38 +0000 Subject: [PATCH 012/124] =?UTF-8?q?ci:=20=F0=9F=91=B7=20lint=20code=20to?= =?UTF-8?q?=20MediaWiki=20standards?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Check commit and GitHub actions for more details --- skinStyles/extensions/Cargo/ext.cargo.main.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skinStyles/extensions/Cargo/ext.cargo.main.less b/skinStyles/extensions/Cargo/ext.cargo.main.less index e49be443..f914acaa 100644 --- a/skinStyles/extensions/Cargo/ext.cargo.main.less +++ b/skinStyles/extensions/Cargo/ext.cargo.main.less @@ -29,7 +29,7 @@ table.cargoTable.mergeSimilarCells td.even { } table.cargoTable { - font-size: 0.875rem; + font-size: 0.875rem; } table.cargoTable thead tr { From dbf926e1c1257ec77018bb0a66161cf960b6b982 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 00:33:19 -0500 Subject: [PATCH 013/124] chore(deps-dev): bump @commitlint/config-conventional (#564) Bumps [@commitlint/config-conventional](https://github.com/conventional-changelog/commitlint/tree/HEAD/@commitlint/config-conventional) from 17.3.0 to 17.4.0. - [Release notes](https://github.com/conventional-changelog/commitlint/releases) - [Changelog](https://github.com/conventional-changelog/commitlint/blob/master/@commitlint/config-conventional/CHANGELOG.md) - [Commits](https://github.com/conventional-changelog/commitlint/commits/v17.4.0/@commitlint/config-conventional) --- updated-dependencies: - dependency-name: "@commitlint/config-conventional" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8bcdac11..33ad9a62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "version": "2.3.0", "devDependencies": { "@commitlint/cli": "^17.3.0", - "@commitlint/config-conventional": "^17.3.0", + "@commitlint/config-conventional": "^17.4.0", "devmoji": "^2.3.0", "eslint-config-wikimedia": "0.23.0", "grunt-banana-checker": "0.10.0", @@ -164,9 +164,9 @@ } }, "node_modules/@commitlint/config-conventional": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-17.3.0.tgz", - "integrity": "sha512-hgI+fN5xF8nhS9uG/V06xyT0nlcyvHHMkq0kwRSr96vl5BFlRGaL2C0/YY4kQagfU087tmj01bJkG9Ek98Wllw==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-17.4.0.tgz", + "integrity": "sha512-G4XBf45J4ZMspO4NwBFzY3g/1Kb+B42BcIxeikF8wucQxcyxcmhRdjeQpRpS1XEcBq5pdtEEQFipuB9IuiNFhw==", "dev": true, "dependencies": { "conventional-changelog-conventionalcommits": "^5.0.0" @@ -6135,9 +6135,9 @@ } }, "@commitlint/config-conventional": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-17.3.0.tgz", - "integrity": "sha512-hgI+fN5xF8nhS9uG/V06xyT0nlcyvHHMkq0kwRSr96vl5BFlRGaL2C0/YY4kQagfU087tmj01bJkG9Ek98Wllw==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-17.4.0.tgz", + "integrity": "sha512-G4XBf45J4ZMspO4NwBFzY3g/1Kb+B42BcIxeikF8wucQxcyxcmhRdjeQpRpS1XEcBq5pdtEEQFipuB9IuiNFhw==", "dev": true, "requires": { "conventional-changelog-conventionalcommits": "^5.0.0" diff --git a/package.json b/package.json index d955e606..1a382f4c 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ }, "devDependencies": { "@commitlint/cli": "^17.3.0", - "@commitlint/config-conventional": "^17.3.0", + "@commitlint/config-conventional": "^17.4.0", "devmoji": "^2.3.0", "eslint-config-wikimedia": "0.23.0", "grunt-banana-checker": "0.10.0", From 25d451f575b5aa7309b1765a86bb1df11eda32a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 00:34:25 -0500 Subject: [PATCH 014/124] chore(deps-dev): bump @commitlint/cli from 17.3.0 to 17.4.0 (#563) Bumps [@commitlint/cli](https://github.com/conventional-changelog/commitlint/tree/HEAD/@commitlint/cli) from 17.3.0 to 17.4.0. - [Release notes](https://github.com/conventional-changelog/commitlint/releases) - [Changelog](https://github.com/conventional-changelog/commitlint/blob/master/@commitlint/cli/CHANGELOG.md) - [Commits](https://github.com/conventional-changelog/commitlint/commits/v17.4.0/@commitlint/cli) --- updated-dependencies: - dependency-name: "@commitlint/cli" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 421 +++++++++++++++++++++++++--------------------- package.json | 2 +- 2 files changed, 226 insertions(+), 197 deletions(-) diff --git a/package-lock.json b/package-lock.json index 33ad9a62..208f2972 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,7 @@ "": { "version": "2.3.0", "devDependencies": { - "@commitlint/cli": "^17.3.0", + "@commitlint/cli": "^17.4.0", "@commitlint/config-conventional": "^17.4.0", "devmoji": "^2.3.0", "eslint-config-wikimedia": "0.23.0", @@ -140,16 +140,16 @@ } }, "node_modules/@commitlint/cli": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-17.3.0.tgz", - "integrity": "sha512-/H0md7TsKflKzVPz226VfXzVafJFO1f9+r2KcFvmBu08V0T56lZU1s8WL7/xlxqLMqBTVaBf7Ixtc4bskdEEZg==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-17.4.0.tgz", + "integrity": "sha512-SEY4sYe8yVlgxPP7X0wJb96DBAGBPsCsy6QbqJt/UECbIAjDeDV5xXBV4jnS7T/qMC10sk6Ub9kDhEX0VWvblw==", "dev": true, "dependencies": { - "@commitlint/format": "^17.0.0", - "@commitlint/lint": "^17.3.0", - "@commitlint/load": "^17.3.0", - "@commitlint/read": "^17.2.0", - "@commitlint/types": "^17.0.0", + "@commitlint/format": "^17.4.0", + "@commitlint/lint": "^17.4.0", + "@commitlint/load": "^17.4.0", + "@commitlint/read": "^17.4.0", + "@commitlint/types": "^17.4.0", "execa": "^5.0.0", "lodash.isfunction": "^3.0.9", "resolve-from": "5.0.0", @@ -190,12 +190,12 @@ } }, "node_modules/@commitlint/config-validator": { - "version": "17.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-17.1.0.tgz", - "integrity": "sha512-Q1rRRSU09ngrTgeTXHq6ePJs2KrI+axPTgkNYDWSJIuS1Op4w3J30vUfSXjwn5YEJHklK3fSqWNHmBhmTR7Vdg==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-17.4.0.tgz", + "integrity": "sha512-Sa/+8KNpDXz4zT4bVbz2fpFjvgkPO6u2V2fP4TKgt6FjmOw2z3eEX859vtfeaTav/ukBw0/0jr+5ZTZp9zCBhA==", "dev": true, "dependencies": { - "@commitlint/types": "^17.0.0", + "@commitlint/types": "^17.4.0", "ajv": "^8.11.0" }, "engines": { @@ -203,9 +203,9 @@ } }, "node_modules/@commitlint/config-validator/node_modules/ajv": { - "version": "8.11.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz", - "integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", "dev": true, "dependencies": { "fast-deep-equal": "^3.1.1", @@ -225,12 +225,12 @@ "dev": true }, "node_modules/@commitlint/ensure": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-17.3.0.tgz", - "integrity": "sha512-kWbrQHDoW5veIUQx30gXoLOCjWvwC6OOEofhPCLl5ytRPBDAQObMbxTha1Bt2aSyNE/IrJ0s0xkdZ1Gi3wJwQg==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-17.4.0.tgz", + "integrity": "sha512-7oAxt25je0jeQ/E0O/M8L3ADb1Cvweu/5lc/kYF8g/kXatI0wxGE5La52onnAUAWeWlsuvBNar15WcrmDmr5Mw==", "dev": true, "dependencies": { - "@commitlint/types": "^17.0.0", + "@commitlint/types": "^17.4.0", "lodash.camelcase": "^4.3.0", "lodash.kebabcase": "^4.1.1", "lodash.snakecase": "^4.1.1", @@ -242,21 +242,21 @@ } }, "node_modules/@commitlint/execute-rule": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-17.0.0.tgz", - "integrity": "sha512-nVjL/w/zuqjCqSJm8UfpNaw66V9WzuJtQvEnCrK4jDw6qKTmZB+1JQ8m6BQVZbNBcwfYdDNKnhIhqI0Rk7lgpQ==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-17.4.0.tgz", + "integrity": "sha512-LIgYXuCSO5Gvtc0t9bebAMSwd68ewzmqLypqI2Kke1rqOqqDbMpYcYfoPfFlv9eyLIh4jocHWwCK5FS7z9icUA==", "dev": true, "engines": { "node": ">=v14" } }, "node_modules/@commitlint/format": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-17.0.0.tgz", - "integrity": "sha512-MZzJv7rBp/r6ZQJDEodoZvdRM0vXu1PfQvMTNWFb8jFraxnISMTnPBWMMjr2G/puoMashwaNM//fl7j8gGV5lA==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-17.4.0.tgz", + "integrity": "sha512-Z2bWAU5+f1YZh9W76c84J8iLIWIvvm+mzqogTz0Nsc1x6EHW0Z2gI38g5HAjB0r0I3ZjR15IDEJKhsxyblcyhA==", "dev": true, "dependencies": { - "@commitlint/types": "^17.0.0", + "@commitlint/types": "^17.4.0", "chalk": "^4.1.0" }, "engines": { @@ -264,22 +264,22 @@ } }, "node_modules/@commitlint/is-ignored": { - "version": "17.2.0", - "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-17.2.0.tgz", - "integrity": "sha512-rgUPUQraHxoMLxiE8GK430HA7/R2vXyLcOT4fQooNrZq9ERutNrP6dw3gdKLkq22Nede3+gEHQYUzL4Wu75ndg==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-17.4.0.tgz", + "integrity": "sha512-mkRuBlPUaBimvSvJyIHEHEW1/jP1SqEI7NOoaO9/eyJkMbsaiv5b1QgDYL4ZXlHdS64RMV7Y21MVVzuIceImDA==", "dev": true, "dependencies": { - "@commitlint/types": "^17.0.0", - "semver": "7.3.7" + "@commitlint/types": "^17.4.0", + "semver": "7.3.8" }, "engines": { "node": ">=v14" } }, "node_modules/@commitlint/is-ignored/node_modules/semver": { - "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -292,33 +292,32 @@ } }, "node_modules/@commitlint/lint": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-17.3.0.tgz", - "integrity": "sha512-VilOTPg0i9A7CCWM49E9bl5jytfTvfTxf9iwbWAWNjxJ/A5mhPKbm3sHuAdwJ87tDk1k4j8vomYfH23iaY+1Rw==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-17.4.0.tgz", + "integrity": "sha512-HG2YT4TUbQKs9v8QvpQjJ6OK+fhflsDB8M+D5tLrY79hbQOWA9mDKdRkABsW/AAhpNI9+zeGUWF3jj245jSHKw==", "dev": true, "dependencies": { - "@commitlint/is-ignored": "^17.2.0", - "@commitlint/parse": "^17.2.0", - "@commitlint/rules": "^17.3.0", - "@commitlint/types": "^17.0.0" + "@commitlint/is-ignored": "^17.4.0", + "@commitlint/parse": "^17.4.0", + "@commitlint/rules": "^17.4.0", + "@commitlint/types": "^17.4.0" }, "engines": { "node": ">=v14" } }, "node_modules/@commitlint/load": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-17.3.0.tgz", - "integrity": "sha512-u/pV6rCAJrCUN+HylBHLzZ4qj1Ew3+eN9GBPhNi9otGxtOfA8b+8nJSxaNbcC23Ins/kcpjGf9zPSVW7628Umw==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-17.4.0.tgz", + "integrity": "sha512-wDKNvAJqukqZqKmhRlf3KNo/12QGo1AQcd80EbV01SxtGvyHOsJ/g+/IbrZpopZv8rvzmEVktcpfDYH6ITepFA==", "dev": true, "dependencies": { - "@commitlint/config-validator": "^17.1.0", - "@commitlint/execute-rule": "^17.0.0", - "@commitlint/resolve-extends": "^17.3.0", - "@commitlint/types": "^17.0.0", - "@types/node": "^14.0.0", + "@commitlint/config-validator": "^17.4.0", + "@commitlint/execute-rule": "^17.4.0", + "@commitlint/resolve-extends": "^17.4.0", + "@commitlint/types": "^17.4.0", "chalk": "^4.1.0", - "cosmiconfig": "^7.0.0", + "cosmiconfig": "^8.0.0", "cosmiconfig-typescript-loader": "^4.0.0", "lodash.isplainobject": "^4.0.6", "lodash.merge": "^4.6.2", @@ -331,22 +330,37 @@ "node": ">=v14" } }, + "node_modules/@commitlint/load/node_modules/cosmiconfig": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.0.0.tgz", + "integrity": "sha512-da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ==", + "dev": true, + "dependencies": { + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "parse-json": "^5.0.0", + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=14" + } + }, "node_modules/@commitlint/message": { - "version": "17.2.0", - "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-17.2.0.tgz", - "integrity": "sha512-/4l2KFKxBOuoEn1YAuuNNlAU05Zt7sNsC9H0mPdPm3chOrT4rcX0pOqrQcLtdMrMkJz0gC7b3SF80q2+LtdL9Q==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-17.4.0.tgz", + "integrity": "sha512-USGJDU9PPxcgQjKXCzvPUal65KAhxWq3hp+MrU1pNCN2itWM654CLIoY2LMIQ7rScTli9B5dTLH3vXhzbItmzA==", "dev": true, "engines": { "node": ">=v14" } }, "node_modules/@commitlint/parse": { - "version": "17.2.0", - "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-17.2.0.tgz", - "integrity": "sha512-vLzLznK9Y21zQ6F9hf8D6kcIJRb2haAK5T/Vt1uW2CbHYOIfNsR/hJs0XnF/J9ctM20Tfsqv4zBitbYvVw7F6Q==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-17.4.0.tgz", + "integrity": "sha512-x8opKc5p+Hgs+CrMbq3VAnW2L2foPAX6arW8u9c8nTzksldGgFsENT+XVyPmpSMLlVBswZ1tndcz1xyKiY9TJA==", "dev": true, "dependencies": { - "@commitlint/types": "^17.0.0", + "@commitlint/types": "^17.4.0", "conventional-changelog-angular": "^5.0.11", "conventional-commits-parser": "^3.2.2" }, @@ -355,14 +369,14 @@ } }, "node_modules/@commitlint/read": { - "version": "17.2.0", - "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-17.2.0.tgz", - "integrity": "sha512-bbblBhrHkjxra3ptJNm0abxu7yeAaxumQ8ZtD6GIVqzURCETCP7Dm0tlVvGRDyXBuqX6lIJxh3W7oyKqllDsHQ==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-17.4.0.tgz", + "integrity": "sha512-pGDeZpbkyvhxK8ZoCDUacPPRpauKPWF3n2XpDBEnuGreqUF2clq2PVJpwMMaNN5cHW8iFKCbcoOjXhD01sln0A==", "dev": true, "dependencies": { - "@commitlint/top-level": "^17.0.0", - "@commitlint/types": "^17.0.0", - "fs-extra": "^10.0.0", + "@commitlint/top-level": "^17.4.0", + "@commitlint/types": "^17.4.0", + "fs-extra": "^11.0.0", "git-raw-commits": "^2.0.0", "minimist": "^1.2.6" }, @@ -371,13 +385,13 @@ } }, "node_modules/@commitlint/resolve-extends": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-17.3.0.tgz", - "integrity": "sha512-Lf3JufJlc5yVEtJWC8o4IAZaB8FQAUaVlhlAHRACd0TTFizV2Lk2VH70et23KgvbQNf7kQzHs/2B4QZalBv6Cg==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-17.4.0.tgz", + "integrity": "sha512-3JsmwkrCzoK8sO22AzLBvNEvC1Pmdn/65RKXzEtQMy6oYMl0Snrq97a5bQQEFETF0VsvbtUuKttLqqgn99OXRQ==", "dev": true, "dependencies": { - "@commitlint/config-validator": "^17.1.0", - "@commitlint/types": "^17.0.0", + "@commitlint/config-validator": "^17.4.0", + "@commitlint/types": "^17.4.0", "import-fresh": "^3.0.0", "lodash.mergewith": "^4.6.2", "resolve-from": "^5.0.0", @@ -388,15 +402,15 @@ } }, "node_modules/@commitlint/rules": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-17.3.0.tgz", - "integrity": "sha512-s2UhDjC5yP2utx3WWqsnZRzjgzAX8BMwr1nltC0u0p8T/nzpkx4TojEfhlsOUj1t7efxzZRjUAV0NxNwdJyk+g==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-17.4.0.tgz", + "integrity": "sha512-lz3i1jet2NNjTWpAMwjjQjMZCPWBIHK1Kkja9o09UmUtMjRdALTb8uMLe8gCyeq3DiiZ5lLYOhbsoPK56xGQKA==", "dev": true, "dependencies": { - "@commitlint/ensure": "^17.3.0", - "@commitlint/message": "^17.2.0", - "@commitlint/to-lines": "^17.0.0", - "@commitlint/types": "^17.0.0", + "@commitlint/ensure": "^17.4.0", + "@commitlint/message": "^17.4.0", + "@commitlint/to-lines": "^17.4.0", + "@commitlint/types": "^17.4.0", "execa": "^5.0.0" }, "engines": { @@ -404,18 +418,18 @@ } }, "node_modules/@commitlint/to-lines": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-17.0.0.tgz", - "integrity": "sha512-nEi4YEz04Rf2upFbpnEorG8iymyH7o9jYIVFBG1QdzebbIFET3ir+8kQvCZuBE5pKCtViE4XBUsRZz139uFrRQ==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-17.4.0.tgz", + "integrity": "sha512-LcIy/6ZZolsfwDUWfN1mJ+co09soSuNASfKEU5sCmgFCvX5iHwRYLiIuoqXzOVDYOy7E7IcHilr/KS0e5T+0Hg==", "dev": true, "engines": { "node": ">=v14" } }, "node_modules/@commitlint/top-level": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-17.0.0.tgz", - "integrity": "sha512-dZrEP1PBJvodNWYPOYiLWf6XZergdksKQaT6i1KSROLdjf5Ai0brLOv5/P+CPxBeoj3vBxK4Ax8H1Pg9t7sHIQ==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-17.4.0.tgz", + "integrity": "sha512-/1loE/g+dTTQgHnjoCy0AexKAEFyHsR2zRB4NWrZ6lZSMIxAhBJnmCqwao7b4H8888PsfoTBCLBYIw8vGnej8g==", "dev": true, "dependencies": { "find-up": "^5.0.0" @@ -425,9 +439,9 @@ } }, "node_modules/@commitlint/types": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-17.0.0.tgz", - "integrity": "sha512-hBAw6U+SkAT5h47zDMeOu3HSiD0SODw4Aq7rRNh1ceUmL7GyLKYhPbUvlRWqZ65XjBLPHZhFyQlRaPNz8qvUyQ==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-17.4.0.tgz", + "integrity": "sha512-2NjAnq5IcxY9kXtUeO2Ac0aPpvkuOmwbH/BxIm36XXK5LtWFObWJWjXOA+kcaABMrthjWu6la+FUpyYFMHRvbA==", "dev": true, "dependencies": { "chalk": "^4.1.0" @@ -657,10 +671,11 @@ "dev": true }, "node_modules/@types/node": { - "version": "14.18.33", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.33.tgz", - "integrity": "sha512-qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg==", - "dev": true + "version": "18.11.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", + "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==", + "dev": true, + "peer": true }, "node_modules/@types/normalize-package-data": { "version": "2.4.1", @@ -1542,9 +1557,9 @@ } }, "node_modules/cosmiconfig-typescript-loader": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.2.0.tgz", - "integrity": "sha512-NkANeMnaHrlaSSlpKGyvn2R4rqUDeE/9E5YHx+b4nwo0R8dZyAqcih8/gxpCZvqWP9Vf6xuLpMSzSgdVEIM78g==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.3.0.tgz", + "integrity": "sha512-NTxV1MFfZDLPiBMjxbHRwSh5LaLcPMwNdCutmnHJCKoVnlvldPWlllonKwrsRJ5pYZBIBGRWWU2tfvzxgeSW5Q==", "dev": true, "engines": { "node": ">=12", @@ -2798,9 +2813,9 @@ "dev": true }, "node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz", + "integrity": "sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==", "dev": true, "dependencies": { "graceful-fs": "^4.2.0", @@ -2808,7 +2823,7 @@ "universalify": "^2.0.0" }, "engines": { - "node": ">=12" + "node": ">=14.14" } }, "node_modules/fs.realpath": { @@ -5731,9 +5746,9 @@ "dev": true }, "node_modules/typescript": { - "version": "4.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz", - "integrity": "sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==", + "version": "4.9.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", + "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -6117,16 +6132,16 @@ "dev": true }, "@commitlint/cli": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-17.3.0.tgz", - "integrity": "sha512-/H0md7TsKflKzVPz226VfXzVafJFO1f9+r2KcFvmBu08V0T56lZU1s8WL7/xlxqLMqBTVaBf7Ixtc4bskdEEZg==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-17.4.0.tgz", + "integrity": "sha512-SEY4sYe8yVlgxPP7X0wJb96DBAGBPsCsy6QbqJt/UECbIAjDeDV5xXBV4jnS7T/qMC10sk6Ub9kDhEX0VWvblw==", "dev": true, "requires": { - "@commitlint/format": "^17.0.0", - "@commitlint/lint": "^17.3.0", - "@commitlint/load": "^17.3.0", - "@commitlint/read": "^17.2.0", - "@commitlint/types": "^17.0.0", + "@commitlint/format": "^17.4.0", + "@commitlint/lint": "^17.4.0", + "@commitlint/load": "^17.4.0", + "@commitlint/read": "^17.4.0", + "@commitlint/types": "^17.4.0", "execa": "^5.0.0", "lodash.isfunction": "^3.0.9", "resolve-from": "5.0.0", @@ -6157,19 +6172,19 @@ } }, "@commitlint/config-validator": { - "version": "17.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-17.1.0.tgz", - "integrity": "sha512-Q1rRRSU09ngrTgeTXHq6ePJs2KrI+axPTgkNYDWSJIuS1Op4w3J30vUfSXjwn5YEJHklK3fSqWNHmBhmTR7Vdg==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-17.4.0.tgz", + "integrity": "sha512-Sa/+8KNpDXz4zT4bVbz2fpFjvgkPO6u2V2fP4TKgt6FjmOw2z3eEX859vtfeaTav/ukBw0/0jr+5ZTZp9zCBhA==", "dev": true, "requires": { - "@commitlint/types": "^17.0.0", + "@commitlint/types": "^17.4.0", "ajv": "^8.11.0" }, "dependencies": { "ajv": { - "version": "8.11.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz", - "integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -6187,12 +6202,12 @@ } }, "@commitlint/ensure": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-17.3.0.tgz", - "integrity": "sha512-kWbrQHDoW5veIUQx30gXoLOCjWvwC6OOEofhPCLl5ytRPBDAQObMbxTha1Bt2aSyNE/IrJ0s0xkdZ1Gi3wJwQg==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-17.4.0.tgz", + "integrity": "sha512-7oAxt25je0jeQ/E0O/M8L3ADb1Cvweu/5lc/kYF8g/kXatI0wxGE5La52onnAUAWeWlsuvBNar15WcrmDmr5Mw==", "dev": true, "requires": { - "@commitlint/types": "^17.0.0", + "@commitlint/types": "^17.4.0", "lodash.camelcase": "^4.3.0", "lodash.kebabcase": "^4.1.1", "lodash.snakecase": "^4.1.1", @@ -6201,35 +6216,35 @@ } }, "@commitlint/execute-rule": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-17.0.0.tgz", - "integrity": "sha512-nVjL/w/zuqjCqSJm8UfpNaw66V9WzuJtQvEnCrK4jDw6qKTmZB+1JQ8m6BQVZbNBcwfYdDNKnhIhqI0Rk7lgpQ==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-17.4.0.tgz", + "integrity": "sha512-LIgYXuCSO5Gvtc0t9bebAMSwd68ewzmqLypqI2Kke1rqOqqDbMpYcYfoPfFlv9eyLIh4jocHWwCK5FS7z9icUA==", "dev": true }, "@commitlint/format": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-17.0.0.tgz", - "integrity": "sha512-MZzJv7rBp/r6ZQJDEodoZvdRM0vXu1PfQvMTNWFb8jFraxnISMTnPBWMMjr2G/puoMashwaNM//fl7j8gGV5lA==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-17.4.0.tgz", + "integrity": "sha512-Z2bWAU5+f1YZh9W76c84J8iLIWIvvm+mzqogTz0Nsc1x6EHW0Z2gI38g5HAjB0r0I3ZjR15IDEJKhsxyblcyhA==", "dev": true, "requires": { - "@commitlint/types": "^17.0.0", + "@commitlint/types": "^17.4.0", "chalk": "^4.1.0" } }, "@commitlint/is-ignored": { - "version": "17.2.0", - "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-17.2.0.tgz", - "integrity": "sha512-rgUPUQraHxoMLxiE8GK430HA7/R2vXyLcOT4fQooNrZq9ERutNrP6dw3gdKLkq22Nede3+gEHQYUzL4Wu75ndg==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-17.4.0.tgz", + "integrity": "sha512-mkRuBlPUaBimvSvJyIHEHEW1/jP1SqEI7NOoaO9/eyJkMbsaiv5b1QgDYL4ZXlHdS64RMV7Y21MVVzuIceImDA==", "dev": true, "requires": { - "@commitlint/types": "^17.0.0", - "semver": "7.3.7" + "@commitlint/types": "^17.4.0", + "semver": "7.3.8" }, "dependencies": { "semver": { - "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -6238,30 +6253,29 @@ } }, "@commitlint/lint": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-17.3.0.tgz", - "integrity": "sha512-VilOTPg0i9A7CCWM49E9bl5jytfTvfTxf9iwbWAWNjxJ/A5mhPKbm3sHuAdwJ87tDk1k4j8vomYfH23iaY+1Rw==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-17.4.0.tgz", + "integrity": "sha512-HG2YT4TUbQKs9v8QvpQjJ6OK+fhflsDB8M+D5tLrY79hbQOWA9mDKdRkABsW/AAhpNI9+zeGUWF3jj245jSHKw==", "dev": true, "requires": { - "@commitlint/is-ignored": "^17.2.0", - "@commitlint/parse": "^17.2.0", - "@commitlint/rules": "^17.3.0", - "@commitlint/types": "^17.0.0" + "@commitlint/is-ignored": "^17.4.0", + "@commitlint/parse": "^17.4.0", + "@commitlint/rules": "^17.4.0", + "@commitlint/types": "^17.4.0" } }, "@commitlint/load": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-17.3.0.tgz", - "integrity": "sha512-u/pV6rCAJrCUN+HylBHLzZ4qj1Ew3+eN9GBPhNi9otGxtOfA8b+8nJSxaNbcC23Ins/kcpjGf9zPSVW7628Umw==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-17.4.0.tgz", + "integrity": "sha512-wDKNvAJqukqZqKmhRlf3KNo/12QGo1AQcd80EbV01SxtGvyHOsJ/g+/IbrZpopZv8rvzmEVktcpfDYH6ITepFA==", "dev": true, "requires": { - "@commitlint/config-validator": "^17.1.0", - "@commitlint/execute-rule": "^17.0.0", - "@commitlint/resolve-extends": "^17.3.0", - "@commitlint/types": "^17.0.0", - "@types/node": "^14.0.0", + "@commitlint/config-validator": "^17.4.0", + "@commitlint/execute-rule": "^17.4.0", + "@commitlint/resolve-extends": "^17.4.0", + "@commitlint/types": "^17.4.0", "chalk": "^4.1.0", - "cosmiconfig": "^7.0.0", + "cosmiconfig": "^8.0.0", "cosmiconfig-typescript-loader": "^4.0.0", "lodash.isplainobject": "^4.0.6", "lodash.merge": "^4.6.2", @@ -6269,46 +6283,60 @@ "resolve-from": "^5.0.0", "ts-node": "^10.8.1", "typescript": "^4.6.4" + }, + "dependencies": { + "cosmiconfig": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.0.0.tgz", + "integrity": "sha512-da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ==", + "dev": true, + "requires": { + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "parse-json": "^5.0.0", + "path-type": "^4.0.0" + } + } } }, "@commitlint/message": { - "version": "17.2.0", - "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-17.2.0.tgz", - "integrity": "sha512-/4l2KFKxBOuoEn1YAuuNNlAU05Zt7sNsC9H0mPdPm3chOrT4rcX0pOqrQcLtdMrMkJz0gC7b3SF80q2+LtdL9Q==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-17.4.0.tgz", + "integrity": "sha512-USGJDU9PPxcgQjKXCzvPUal65KAhxWq3hp+MrU1pNCN2itWM654CLIoY2LMIQ7rScTli9B5dTLH3vXhzbItmzA==", "dev": true }, "@commitlint/parse": { - "version": "17.2.0", - "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-17.2.0.tgz", - "integrity": "sha512-vLzLznK9Y21zQ6F9hf8D6kcIJRb2haAK5T/Vt1uW2CbHYOIfNsR/hJs0XnF/J9ctM20Tfsqv4zBitbYvVw7F6Q==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-17.4.0.tgz", + "integrity": "sha512-x8opKc5p+Hgs+CrMbq3VAnW2L2foPAX6arW8u9c8nTzksldGgFsENT+XVyPmpSMLlVBswZ1tndcz1xyKiY9TJA==", "dev": true, "requires": { - "@commitlint/types": "^17.0.0", + "@commitlint/types": "^17.4.0", "conventional-changelog-angular": "^5.0.11", "conventional-commits-parser": "^3.2.2" } }, "@commitlint/read": { - "version": "17.2.0", - "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-17.2.0.tgz", - "integrity": "sha512-bbblBhrHkjxra3ptJNm0abxu7yeAaxumQ8ZtD6GIVqzURCETCP7Dm0tlVvGRDyXBuqX6lIJxh3W7oyKqllDsHQ==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-17.4.0.tgz", + "integrity": "sha512-pGDeZpbkyvhxK8ZoCDUacPPRpauKPWF3n2XpDBEnuGreqUF2clq2PVJpwMMaNN5cHW8iFKCbcoOjXhD01sln0A==", "dev": true, "requires": { - "@commitlint/top-level": "^17.0.0", - "@commitlint/types": "^17.0.0", - "fs-extra": "^10.0.0", + "@commitlint/top-level": "^17.4.0", + "@commitlint/types": "^17.4.0", + "fs-extra": "^11.0.0", "git-raw-commits": "^2.0.0", "minimist": "^1.2.6" } }, "@commitlint/resolve-extends": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-17.3.0.tgz", - "integrity": "sha512-Lf3JufJlc5yVEtJWC8o4IAZaB8FQAUaVlhlAHRACd0TTFizV2Lk2VH70et23KgvbQNf7kQzHs/2B4QZalBv6Cg==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-17.4.0.tgz", + "integrity": "sha512-3JsmwkrCzoK8sO22AzLBvNEvC1Pmdn/65RKXzEtQMy6oYMl0Snrq97a5bQQEFETF0VsvbtUuKttLqqgn99OXRQ==", "dev": true, "requires": { - "@commitlint/config-validator": "^17.1.0", - "@commitlint/types": "^17.0.0", + "@commitlint/config-validator": "^17.4.0", + "@commitlint/types": "^17.4.0", "import-fresh": "^3.0.0", "lodash.mergewith": "^4.6.2", "resolve-from": "^5.0.0", @@ -6316,37 +6344,37 @@ } }, "@commitlint/rules": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-17.3.0.tgz", - "integrity": "sha512-s2UhDjC5yP2utx3WWqsnZRzjgzAX8BMwr1nltC0u0p8T/nzpkx4TojEfhlsOUj1t7efxzZRjUAV0NxNwdJyk+g==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-17.4.0.tgz", + "integrity": "sha512-lz3i1jet2NNjTWpAMwjjQjMZCPWBIHK1Kkja9o09UmUtMjRdALTb8uMLe8gCyeq3DiiZ5lLYOhbsoPK56xGQKA==", "dev": true, "requires": { - "@commitlint/ensure": "^17.3.0", - "@commitlint/message": "^17.2.0", - "@commitlint/to-lines": "^17.0.0", - "@commitlint/types": "^17.0.0", + "@commitlint/ensure": "^17.4.0", + "@commitlint/message": "^17.4.0", + "@commitlint/to-lines": "^17.4.0", + "@commitlint/types": "^17.4.0", "execa": "^5.0.0" } }, "@commitlint/to-lines": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-17.0.0.tgz", - "integrity": "sha512-nEi4YEz04Rf2upFbpnEorG8iymyH7o9jYIVFBG1QdzebbIFET3ir+8kQvCZuBE5pKCtViE4XBUsRZz139uFrRQ==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-17.4.0.tgz", + "integrity": "sha512-LcIy/6ZZolsfwDUWfN1mJ+co09soSuNASfKEU5sCmgFCvX5iHwRYLiIuoqXzOVDYOy7E7IcHilr/KS0e5T+0Hg==", "dev": true }, "@commitlint/top-level": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-17.0.0.tgz", - "integrity": "sha512-dZrEP1PBJvodNWYPOYiLWf6XZergdksKQaT6i1KSROLdjf5Ai0brLOv5/P+CPxBeoj3vBxK4Ax8H1Pg9t7sHIQ==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-17.4.0.tgz", + "integrity": "sha512-/1loE/g+dTTQgHnjoCy0AexKAEFyHsR2zRB4NWrZ6lZSMIxAhBJnmCqwao7b4H8888PsfoTBCLBYIw8vGnej8g==", "dev": true, "requires": { "find-up": "^5.0.0" } }, "@commitlint/types": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-17.0.0.tgz", - "integrity": "sha512-hBAw6U+SkAT5h47zDMeOu3HSiD0SODw4Aq7rRNh1ceUmL7GyLKYhPbUvlRWqZ65XjBLPHZhFyQlRaPNz8qvUyQ==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-17.4.0.tgz", + "integrity": "sha512-2NjAnq5IcxY9kXtUeO2Ac0aPpvkuOmwbH/BxIm36XXK5LtWFObWJWjXOA+kcaABMrthjWu6la+FUpyYFMHRvbA==", "dev": true, "requires": { "chalk": "^4.1.0" @@ -6540,10 +6568,11 @@ "dev": true }, "@types/node": { - "version": "14.18.33", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.33.tgz", - "integrity": "sha512-qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg==", - "dev": true + "version": "18.11.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", + "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==", + "dev": true, + "peer": true }, "@types/normalize-package-data": { "version": "2.4.1", @@ -7224,9 +7253,9 @@ } }, "cosmiconfig-typescript-loader": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.2.0.tgz", - "integrity": "sha512-NkANeMnaHrlaSSlpKGyvn2R4rqUDeE/9E5YHx+b4nwo0R8dZyAqcih8/gxpCZvqWP9Vf6xuLpMSzSgdVEIM78g==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.3.0.tgz", + "integrity": "sha512-NTxV1MFfZDLPiBMjxbHRwSh5LaLcPMwNdCutmnHJCKoVnlvldPWlllonKwrsRJ5pYZBIBGRWWU2tfvzxgeSW5Q==", "dev": true, "requires": {} }, @@ -8172,9 +8201,9 @@ "dev": true }, "fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz", + "integrity": "sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==", "dev": true, "requires": { "graceful-fs": "^4.2.0", @@ -10380,9 +10409,9 @@ "dev": true }, "typescript": { - "version": "4.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz", - "integrity": "sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==", + "version": "4.9.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", + "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", "dev": true }, "uc.micro": { diff --git a/package.json b/package.json index 1a382f4c..4a40dd60 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "release:major": "standard-version --release-as major" }, "devDependencies": { - "@commitlint/cli": "^17.3.0", + "@commitlint/cli": "^17.4.0", "@commitlint/config-conventional": "^17.4.0", "devmoji": "^2.3.0", "eslint-config-wikimedia": "0.23.0", From 46437d81f663277b13459c5a2a2958113078e9d7 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Thu, 5 Jan 2023 00:47:03 -0500 Subject: [PATCH 015/124] =?UTF-8?q?feat(CodeMirror):=20=E2=9C=A8=20sync=20?= =?UTF-8?q?background=20color=20with=20other=20editors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skinStyles/extensions/CodeMirror/ext.CodeMirror.lib.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/skinStyles/extensions/CodeMirror/ext.CodeMirror.lib.less b/skinStyles/extensions/CodeMirror/ext.CodeMirror.lib.less index 513f9b21..7f966bda 100644 --- a/skinStyles/extensions/CodeMirror/ext.CodeMirror.lib.less +++ b/skinStyles/extensions/CodeMirror/ext.CodeMirror.lib.less @@ -24,19 +24,19 @@ --color-syntax-pink: @color-syntax-pink; --color-syntax-violet: @color-syntax-violet; --color-syntax-grey: @color-syntax-grey; - background-color: var( --color-surface-1 ); + background-color: var( --color-surface-0 ); color: var( --color-base ); &-scrollbar, &-gutter { &-filler { - background-color: var( --color-surface-1 ); + background-color: var( --color-surface-0 ); } } &-gutters { border-color: transparent; - background-color: var( --color-surface-1 ); + background-color: var( --color-surface-0 ); } &-linenumber { From d6ebcd22b0dbf4427923031c3233a376478f465a Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Thu, 5 Jan 2023 00:48:10 -0500 Subject: [PATCH 016/124] =?UTF-8?q?chore(ci):=20=F0=9F=94=A7=20?= =?UTF-8?q?=F0=9F=91=B7=20mark=20husky=20as=20executable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .husky/commit-msg | 0 .husky/pre-commit | 0 .husky/prepare-commit-msg | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .husky/commit-msg mode change 100644 => 100755 .husky/pre-commit mode change 100644 => 100755 .husky/prepare-commit-msg diff --git a/.husky/commit-msg b/.husky/commit-msg old mode 100644 new mode 100755 diff --git a/.husky/pre-commit b/.husky/pre-commit old mode 100644 new mode 100755 diff --git a/.husky/prepare-commit-msg b/.husky/prepare-commit-msg old mode 100644 new mode 100755 From 3fd49089535b06af31856fd817d50769e1ea3e3b Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Thu, 5 Jan 2023 01:00:38 -0500 Subject: [PATCH 017/124] =?UTF-8?q?fix(CodeMirror):=20=F0=9F=90=9B=20incor?= =?UTF-8?q?rect=20selector=20for=20CM=20elements?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This should also fix the text highlight color issue --- .../CodeMirror/ext.CodeMirror.lib.less | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/skinStyles/extensions/CodeMirror/ext.CodeMirror.lib.less b/skinStyles/extensions/CodeMirror/ext.CodeMirror.lib.less index 7f966bda..3b46c817 100644 --- a/skinStyles/extensions/CodeMirror/ext.CodeMirror.lib.less +++ b/skinStyles/extensions/CodeMirror/ext.CodeMirror.lib.less @@ -63,6 +63,26 @@ &-ruler { border-left-color: var( --border-color-base ); } + + &-composing { + border-bottom-color: var( --border-color-base ); + } + + &-selected { + background: var( --background-color-primary--hover ); + } + + &-focused .CodeMirror-selected { + background: var( --background-color-primary--active ); + } + + &-line { + &::selection, + > span::selection, + > span > span::selection { + background: var( --background-color-primary--active ); + } + } } // Default theme @@ -179,26 +199,6 @@ color: var( --color-destructive ); } } - - &-composing { - border-bottom-color: var( --border-color-base ); - } - - &-selected { - background: var( --background-color-primary--hover ); - } - - &-focused .CodeMirror-selected { - background: var( --background-color-primary--active ); - } - - &-line { - &::selection, - > span::selection, - > span > span::selection { - background: var( --background-color-primary--active ); - } - } } div.CodeMirror { From 12c9648483b64b587fa6237e3afd5c7bb7854825 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Thu, 5 Jan 2023 01:00:55 -0500 Subject: [PATCH 018/124] =?UTF-8?q?chore(release):=20=F0=9F=9A=80=202.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 28 ++++++++++++++++++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- skin.json | 2 +- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 761a1694..bef1d1a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,34 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [2.3.1](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/compare/v2.3.0...v2.3.1) (2023-01-05) + + +### Features + +* **Cargo:** ✨ add responsive support for datatable ([dd7f21b](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/dd7f21bc8e966bf4dc2a1f553704b4892585001c)) +* **Cargo:** ✨ cargo table should have reduced font size ([5db5620](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/5db562008e51a727ead340fce6505affb0d5ef4d)) +* **Cargo:** ✨ datatable should have reduced font size ([1dcb37a](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/1dcb37a4675ee1d75a4a2a6f15da62bc1d419d47)) +* **Cargo:** ✨ update partial Cargo styles ([a017bae](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/a017bae502b99daf19f8bd8f5694fce133deb858)) +* **CodeEditor:** ✨ add CodeEditor support ([5946089](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/5946089cbbfd1ed040179e9e057067688d74ad61)) +* **CodeMirror:** ✨ sync background color with other editors ([46437d8](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/46437d81f663277b13459c5a2a2958113078e9d7)) +* **core:** ✨ always truncate sticky header first heading ([0051115](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/0051115ce069e039469dc8e463b3ae8789d51c89)), closes [#559](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/issues/559) +* **core:** ✨ increase base layout width to 1080px ([8c8ab99](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/8c8ab997ac306d74aa5f11e4cff8209061e893a5)) +* **core:** ✨ more colorful emphasized text color ([023ee94](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/023ee9427acbec2c019bee3a332df825e4853a45)) +* **core:** ✨ only add upload link when it is enabled ([8c4bd54](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/8c4bd54d32b149398f956d53741aaa63d352b32c)) +* **core:** tweak content sub spacing ([985ecb2](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/985ecb2aa10093a47b1aacfdc95839bbf588cfd6)) +* **ReplaceText:** add ReplaceText styles ([#561](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/issues/561)) ([286f4f2](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/286f4f2f1d77f2c3c3d1b97d54a0cb5e7fa36f33)) +* **search:** contain the overscroll of search suggestion ([60c1270](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/60c12706a5adbb0bffb5802eb0979e1d7bd1a66c)) + + +### Bug Fixes + +* **Cargo:** 🐛 add datatable odd row hover styles ([8adf25e](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/8adf25e350e78f6d12b4533b97371809e6971015)) +* **CodeMirror:** 🐛 incorrect selector for CM elements ([3fd4908](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/3fd49089535b06af31856fd817d50769e1ea3e3b)) +* **core:** add missing WMUI help icon ([#560](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/issues/560)) ([084799f](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/084799f58ac4f4fe84ae19d08682d986303d0b04)) +* **core:** missing style for the previous commit ([aa13b58](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/aa13b58194cd3cd4df9ce4b2154a9f8f5aed9b49)) +* **search:** 🐛 correct URL for MediaSearch ([2e9dffb](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/2e9dffb7f06470e25170407e619f9a5deb372d67)) + ## [2.3.0](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/compare/v2.2.0...v2.3.0) (2022-12-14) diff --git a/package-lock.json b/package-lock.json index 208f2972..9786ad87 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "mediawiki-skins-Citizen", - "version": "2.3.0", + "version": "2.3.1", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "2.3.0", + "version": "2.3.1", "devDependencies": { "@commitlint/cli": "^17.4.0", "@commitlint/config-conventional": "^17.4.0", diff --git a/package.json b/package.json index 4a40dd60..4006b3ad 100644 --- a/package.json +++ b/package.json @@ -30,5 +30,5 @@ "stylelint-config-wikimedia": "0.13.1", "svgo": "3.0.2" }, - "version": "2.3.0" + "version": "2.3.1" } diff --git a/skin.json b/skin.json index 7b24e9bf..37e8d4be 100644 --- a/skin.json +++ b/skin.json @@ -1,6 +1,6 @@ { "name": "Citizen", - "version": "2.3.0", + "version": "2.3.1", "author": [ "[https://www.mediawiki.org/wiki/User:Alistair3149 Alistair3149]", "[https://www.mediawiki.org/wiki/User:Octfx Octfx]", From aeed04b86013e1870830f42fbae54737bbb7fa04 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Thu, 5 Jan 2023 01:12:56 -0500 Subject: [PATCH 019/124] =?UTF-8?q?feat(core):=20=E2=9C=A8=20add=20toolbox?= =?UTF-8?q?=20icon=20for=20CreateRedirect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- includes/Hooks/SkinHooks.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/includes/Hooks/SkinHooks.php b/includes/Hooks/SkinHooks.php index 6e9735cd..196e3544 100644 --- a/includes/Hooks/SkinHooks.php +++ b/includes/Hooks/SkinHooks.php @@ -262,10 +262,12 @@ class SkinHooks implements 'log' => 'history', 'blockip' => 'block', 'userrights' => 'userGroup', - // Extension:CiteThisPage - 'citethispage' => 'reference', // Extension:Cargo 'cargo-pagevalues' => 'database', + // Extension:CiteThisPage + 'citethispage' => 'reference', + // Extension:CreateRedirect + 'createredirect' => 'articleRedirect', // Extension:SemanticMediaWiki 'smwbrowselink' => 'database' ]; From e0943437705b57a7624cced2a06cdb7f26aecf5c Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 5 Jan 2023 13:15:36 +0100 Subject: [PATCH 020/124] Localisation updates from https://translatewiki.net. --- i18n/de.json | 1 - i18n/fa.json | 1 - i18n/fi.json | 1 - i18n/kk-cyrl.json | 1 - i18n/lb.json | 1 - i18n/nb.json | 1 - i18n/pt-br.json | 1 - i18n/pt.json | 1 - i18n/roa-tara.json | 1 - i18n/sl.json | 5 ++--- i18n/sv.json | 1 - i18n/tr.json | 1 - 12 files changed, 2 insertions(+), 14 deletions(-) diff --git a/i18n/de.json b/i18n/de.json index 08dece79..97228fb5 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -11,7 +11,6 @@ "[https://www.mediawiki.org/wiki/User:Octfx Octfx]" ] }, - "skinname-citizen": "Citizen", "citizen-skin-desc": "Ein wunderschöner, benutzerfreundlicher, reaktionsfähiger MediaWiki-Skin, der Erweiterungen zu einem Teil des kohärenten Erlebnisses macht. Ursprünglich wurde es für das [https://starcitizen.tools/ Star Citizen Wiki] erstellt.", "citizen.css": "/* Das folgende CSS wird für Benutzer des Citizen-Skins geladen */", "citizen.js": "/* Das folgende JavaScript wird für Benutzer des Citizen-Skins geladen */", diff --git a/i18n/fa.json b/i18n/fa.json index 05645671..eea7c236 100644 --- a/i18n/fa.json +++ b/i18n/fa.json @@ -7,7 +7,6 @@ "Reza koulivand" ] }, - "skinname-citizen": "Citizen", "citizen-skin-desc": "یک پوسته واکنشگرا که برای ویکی بازی شهروند ستاره توسعه داده شده است", "citizen.css": "/* همه کدهای سی‌اس‌اس که در این بخش قرار بگیرد برای کاربرانی که از پوستهٔ شهروند استفاده کنند بارگزاری می‌شود */", "citizen.js": "/ * همه کدهای جاوااسکریپتی که در اینجا قرار می‌گیرند برای کاربران پوستهٔ مدرن بارگیری می‌شود * /", diff --git a/i18n/fi.json b/i18n/fi.json index e7de5e7d..ad4109ea 100644 --- a/i18n/fi.json +++ b/i18n/fi.json @@ -7,7 +7,6 @@ "Nike" ] }, - "skinname-citizen": "Citizen", "citizen-skin-desc": "Star Citizen Wikiä varten kehitetty responsiivinen ulkoasu", "citizen.js": "/* Tämän sivun JavaScript-koodi liitetään Citizen-ulkoasuun */", "citizen-actions-more-toggle": "Lisää toimintoja", diff --git a/i18n/kk-cyrl.json b/i18n/kk-cyrl.json index 974d546e..18584bb6 100644 --- a/i18n/kk-cyrl.json +++ b/i18n/kk-cyrl.json @@ -5,7 +5,6 @@ "U.ayaao.p" ] }, - "skinname-citizen": "Citizen", "citizen-skin-desc": "Star Citizen Wiki үшін әзірленген адаптивты скин", "citizen-prefs-talkpage": "[[mw:Skin_talk:Citizen|Талқылау]]", "citizen.css": "/* Мұндағы барлық CSS Citizen мұқабасы бар қатысушыларға жүктеледі */", diff --git a/i18n/lb.json b/i18n/lb.json index bb06e8bd..2242b1e0 100644 --- a/i18n/lb.json +++ b/i18n/lb.json @@ -4,7 +4,6 @@ "Robby" ] }, - "skinname-citizen": "Citizen", "citizen-languages-toggle": "Méi Sproochen", "citizen-actions-more-toggle": "Méi Aktiounen", "citizen-sitestats-articles-label": "Artikelen", diff --git a/i18n/nb.json b/i18n/nb.json index 4150a22c..c7a5a633 100644 --- a/i18n/nb.json +++ b/i18n/nb.json @@ -4,7 +4,6 @@ "Jon Harald Søby" ] }, - "skinname-citizen": "Citizen", "citizen-skin-desc": "Ei responsiv drakt utviklet for Star Citizen Wiki", "citizen.css": "/* CSS her blir lastet for de som bruker drakta Citizen */", "citizen.js": "/* Javascript i denne fila vil gjelde brukere av drakta Citizen */", diff --git a/i18n/pt-br.json b/i18n/pt-br.json index 7b8ffc4c..5f3e1c70 100644 --- a/i18n/pt-br.json +++ b/i18n/pt-br.json @@ -8,7 +8,6 @@ "Rafaelff" ] }, - "skinname-citizen": "Citizen", "citizen-skin-desc": "Uma aparência MediaWiki bonita, utilizável e responsiva que torna as extensões parte da experiência coesa. Inicialmente criado para o [https://starcitizen.tools/ Star Citizen Wiki].", "citizen-prefs-talkpage": "[[mw:Skin_talk:Citizen|Discussão]]", "citizen.css": "/* Todo o CSS aqui será carregado para usuários do tema Citizen */", diff --git a/i18n/pt.json b/i18n/pt.json index fabd0926..b337cdaa 100644 --- a/i18n/pt.json +++ b/i18n/pt.json @@ -4,7 +4,6 @@ "Hamilton Abreu" ] }, - "skinname-citizen": "Citizen", "citizen-skin-desc": "Um tema agradável para o MediaWiki, com grande usabilidade e dinamismo, que torna as extensões numa parte integrante da experiência coesiva. Criado inicialmente para a [https://starcitizen.tools/ wiki Star Citizen].", "citizen-prefs-talkpage": "[[mw:Skin_talk:Citizen|Discussão]]", "citizen.css": "/* Todo o código CSS colocado aqui será carregado para os utilizadores do tema Citizen */", diff --git a/i18n/roa-tara.json b/i18n/roa-tara.json index 000b1833..a293224f 100644 --- a/i18n/roa-tara.json +++ b/i18n/roa-tara.json @@ -4,7 +4,6 @@ "Joetaras" ] }, - "skinname-citizen": "Citizen", "citizen-skin-desc": "'Nu skin responsive sveluppate pa Uicchi Star Citizen", "citizen.css": "/* Tutte le CSS aqquà avène carecate pe le utinde ca ausane 'a masckere Citizen */", "citizen.js": "/* Tutte le JavaScript aqquà avène carecate pe le utinde ca ausane 'a masckere Citizen */", diff --git a/i18n/sl.json b/i18n/sl.json index db02b892..72f0cf45 100644 --- a/i18n/sl.json +++ b/i18n/sl.json @@ -4,11 +4,10 @@ "Eleassar" ] }, - "skinname-citizen": "Citizen", "citizen-skin-desc": "Lepa, uporabna in odzivna preobleka MediaWiki, s katero postanejo razširitve del celoste izkušnje. Prvotno je bila razvita za viki [https://starcitizen.tools/ Star Citizen].", "citizen-prefs-talkpage": "[[mw:Skin_talk:Citizen|Pogovor]]", - "citizen.css": "/* Vsa koda CSS tukaj bo naložena za uporabnike preobleke Citizen */", - "citizen.js": "/* Vsa koda JavaScript tukaj bo naložena za uporabnike preobleke Citizen */", + "citizen.css": "/* Vsa koda CSS tukaj se bo naložila za uporabnike preobleke Citizen */", + "citizen.js": "/* Vsa koda JavaScript tukaj se bo naložila za uporabnike preobleke Citizen */", "citizen-drawer-toggle": "Preklopi meni", "citizen-usermenu-toggle": "Preklop osebnega menija", "citizen-search-toggle": "Preklop iskanja", diff --git a/i18n/sv.json b/i18n/sv.json index 686c3dd1..75b7fb2e 100644 --- a/i18n/sv.json +++ b/i18n/sv.json @@ -5,7 +5,6 @@ "WikiPhoenix" ] }, - "skinname-citizen": "Citizen", "citizen-skin-desc": "Ett responsiv utseende utvecklat för Star Citizen Wiki", "citizen.css": "/* All CSS här kommer laddas in för användare av utseendet Citizen */", "citizen.js": "/* All JavaScript här kommer laddas in för användare av utseendet Citizen */", diff --git a/i18n/tr.json b/i18n/tr.json index d71299b3..494ceb19 100644 --- a/i18n/tr.json +++ b/i18n/tr.json @@ -12,7 +12,6 @@ "Toghrul Rahimli" ] }, - "skinname-citizen": "Citizen", "citizen-skin-desc": "Star Citizen Viki için geliştirilmiş duyarlı bir görünüm", "citizen-prefs-talkpage": "[[mw:Skin_talk:Citizen|Tartışma]]", "citizen.css": "/* Buradaki tüm CSS'ler Citizen görünüm kullanıcıları için yüklenecek */", From 242413bf4aa7d851bda2f8b4a4f66a9f60791cfc Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Fri, 6 Jan 2023 16:03:02 -0500 Subject: [PATCH 021/124] =?UTF-8?q?fix(search):=20=F0=9F=90=9B=20incorrect?= =?UTF-8?q?=20keyboard=20navigation=20on=20typeahead=20items?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../skins.citizen.search/gateway/gateway.js | 2 +- .../gateway/mwActionApi.js | 4 +- .../skins.citizen.search/gateway/mwRestApi.js | 3 +- resources/skins.citizen.search/typeahead.js | 48 ++++++++++--------- 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/resources/skins.citizen.search/gateway/gateway.js b/resources/skins.citizen.search/gateway/gateway.js index a31c1b5f..00ceecb3 100644 --- a/resources/skins.citizen.search/gateway/gateway.js +++ b/resources/skins.citizen.search/gateway/gateway.js @@ -2,7 +2,7 @@ * @typedef {Object} Results * @property {string} id The page ID of the page * @property {string} title The title of the page. - * @property {string} description The description of the page. + * @property {string} desc The description of the page. * @property {string} thumbnail The url of the thumbnail of the page. * * @global diff --git a/resources/skins.citizen.search/gateway/mwActionApi.js b/resources/skins.citizen.search/gateway/mwActionApi.js index fa7236dc..a8d8b920 100644 --- a/resources/skins.citizen.search/gateway/mwActionApi.js +++ b/resources/skins.citizen.search/gateway/mwActionApi.js @@ -70,10 +70,12 @@ function convertDataToResults( data ) { const getDescription = ( item ) => { switch ( descriptionSource ) { case 'wikidata': + /* eslint-disable-next-line es-x/no-symbol-prototype-description */ return item.description || ''; case 'textextracts': return item.extract || ''; case 'pagedescription': + /* eslint-disable-next-line es-x/no-symbol-prototype-description */ return item.pageprops.description.slice( 0, 60 ) + '...' || ''; } }; @@ -96,7 +98,7 @@ function convertDataToResults( data ) { id: data[ i ].pageid, key: data[ i ].title, title: getDisplayTitle( data[ i ] ), - description: getDescription( data[ i ] ) + desc: getDescription( data[ i ] ) }; if ( data[ i ].thumbnail && data[ i ].thumbnail.source ) { results[ i ].thumbnail = data[ i ].thumbnail.source; diff --git a/resources/skins.citizen.search/gateway/mwRestApi.js b/resources/skins.citizen.search/gateway/mwRestApi.js index 387f1846..f3f360c5 100644 --- a/resources/skins.citizen.search/gateway/mwRestApi.js +++ b/resources/skins.citizen.search/gateway/mwRestApi.js @@ -29,7 +29,8 @@ function convertDataToResults( data ) { id: data[ i ].id, key: data[ i ].key, title: data[ i ].title, - description: data[ i ].description + /* eslint-disable-next-line es-x/no-symbol-prototype-description */ + desc: data[ i ].description }; // Redirect title // Since 1.38 diff --git a/resources/skins.citizen.search/typeahead.js b/resources/skins.citizen.search/typeahead.js index 1f05bab9..8ab59782 100644 --- a/resources/skins.citizen.search/typeahead.js +++ b/resources/skins.citizen.search/typeahead.js @@ -12,7 +12,7 @@ const config = require( './config.json' ); const activeIndex = { index: -1, - max: config.wgCitizenMaxSearchResults + 1, + max: 0, setMax: function ( x ) { this.max = x; }, @@ -39,6 +39,7 @@ const activeIndex = { let /** @type {HTMLElement | undefined} */ typeahead; let /** @type {HTMLElement | undefined} */ searchInput; +let /** @type {HTMLCollection | undefined} */ typeaheadItems; /** * @typedef {Object} MenuItemData @@ -49,17 +50,23 @@ let /** @type {HTMLElement | undefined} */ searchInput; * @property {string} thumbnail * @property {string} title * @property {string} label - * @property {string} description + * @property {string} desc */ +/** + * Retrieve the current list of item elements to update the active index + */ +function updateActiveIndex() { + typeaheadItems = typeahead.querySelectorAll( `.${ITEM_CLASS}` ); + activeIndex.setMax( typeaheadItems.length ); +} + /** * Sets an 'ACTIVE_CLASS' on the element * * @param {HTMLElement} element */ function toggleActive( element ) { - const typeaheadItems = typeahead.querySelectorAll( `.${ITEM_CLASS}` ); - for ( let i = 0; i < typeaheadItems.length; i++ ) { if ( element !== typeaheadItems[ i ] ) { typeaheadItems[ i ].classList.remove( ACTIVE_CLASS ); @@ -86,18 +93,13 @@ function keyboardEvents( event ) { return; // Do nothing if the event was already processed } - // Is children slower? - const typeaheadItems = typeahead.querySelectorAll( `.${ITEM_CLASS}` ); - if ( event.key === 'ArrowDown' || event.key === 'ArrowUp' ) { if ( event.key === 'ArrowDown' ) { activeIndex.increment( 1 ); } else { activeIndex.increment( -1 ); } - toggleActive( typeaheadItems[ activeIndex.index ] ); - } if ( typeaheadItems[ activeIndex.index ] ) { @@ -127,16 +129,16 @@ function bindMouseHoverEvent( element ) { * Remove all existing suggestions from typeahead */ function clearSuggestions() { - const typeaheadItems = typeahead.children; + const typeaheadChildren = typeahead.children; - if ( typeaheadItems.length > 0 ) { + if ( typeaheadChildren.length > 0 ) { // Do all the work in document fragment then replace the whole list // It is more performant this way const fragment = new DocumentFragment(), template = document.getElementById( `${PREFIX}-template` ); - [ ...typeaheadItems ].forEach( ( item ) => { + [ ...typeaheadChildren ].forEach( ( item ) => { if ( !item.classList.contains( `${ITEM_CLASS}--page` ) ) { fragment.append( item ); } @@ -223,7 +225,7 @@ function getSuggestions( searchQuery, htmlSafeSearchQuery, placeholder ) { link: suggestionLinkPrefix + encodeURIComponent( result.key ), title: highlightTitle( result.title ), // Just to be safe, not sure if the default API is HTML escaped - description: result.description + desc: result.desc }; if ( result.matchedTitle ) { data.label = getRedirectLabel( result.title, result.matchedTitle ); @@ -247,7 +249,7 @@ function getSuggestions( searchQuery, htmlSafeSearchQuery, placeholder ) { icon: 'articleNotFound', type: 'placeholder', title: mw.message( 'citizen-search-noresults-title', htmlSafeSearchQuery ).text(), - description: mw.message( 'citizen-search-noresults-desc' ).text() + desc: mw.message( 'citizen-search-noresults-desc' ).text() } ); placeholder.classList.remove( HIDDEN_CLASS ); @@ -276,6 +278,7 @@ function getSuggestions( searchQuery, htmlSafeSearchQuery, placeholder ) { clearSuggestions(); if ( results !== null ) { renderSuggestions( results ); + updateActiveIndex(); } } ).catch( ( error ) => { searchInput.removeEventListener( 'input', abortFetch ); @@ -326,9 +329,9 @@ function updateMenuItem( item, data ) { const label = item.querySelector( `.${PREFIX}__label` ); label.innerHTML = data.label; } - if ( data.description ) { - const description = item.querySelector( `.${PREFIX}__description` ); - description.innerHTML = data.description; + if ( data.desc ) { + const desc = item.querySelector( `.${PREFIX}__description` ); + desc.innerHTML = data.desc; } } @@ -388,7 +391,7 @@ function updateTypeahead( messages ) { item, { link: itemLink, - description: itemDesc + desc: itemDesc } ); // FIXME: There is probably a more efficient way @@ -403,7 +406,7 @@ function updateTypeahead( messages ) { id: itemId, type: 'tool', link: itemLink, - description: itemDesc + desc: itemDesc } ); typeahead.append( item ); } @@ -437,13 +440,12 @@ function updateTypeahead( messages ) { { icon: 'articlesSearch', title: messages.emptyTitle, - description: messages.emptyDesc + desc: messages.emptyDesc } ); placeholder.classList.remove( HIDDEN_CLASS ); + updateActiveIndex(); } - // -1 as there is a template element - activeIndex.setMax( typeahead.children.length - 1 ); } /** @@ -499,6 +501,8 @@ function initTypeahead( searchForm, input ) { searchInput.setAttribute( 'aria-autocomplete', 'list' ); searchInput.setAttribute( 'aria-controls', 'searchform-suggestions' ); + // Init the value in case of undef error + updateActiveIndex(); // Since searchInput is focused before the event listener is set up onFocus(); searchInput.addEventListener( 'focus', onFocus ); From 7ea295531283abfb2730a84477c8278ad9d33e20 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Sat, 7 Jan 2023 13:47:54 -0500 Subject: [PATCH 022/124] refactor(codex): remove unused file --- skinStyles/codex/codex.styles-rtl.less | 2000 ------------------------ 1 file changed, 2000 deletions(-) delete mode 100644 skinStyles/codex/codex.styles-rtl.less diff --git a/skinStyles/codex/codex.styles-rtl.less b/skinStyles/codex/codex.styles-rtl.less deleted file mode 100644 index bc0cea4c..00000000 --- a/skinStyles/codex/codex.styles-rtl.less +++ /dev/null @@ -1,2000 +0,0 @@ -/* - * Citizen - * - * SkinStyles for Codex - * Module: @wikimedia/codex - * Version: v0.1.1 - * - * Date: 2022-12-01 - * - * WORK IN PROGRESS - * NOT IMPLEMENTED YET -*/ - -/* stylelint-disable */ -.cdx-icon { - display: inline-flex; - align-items: center; - justify-content: center; - color: #202122; - vertical-align: text-bottom; -} - -.cdx-icon--flipped svg { - transform: scaleX( -1 ); -} - -.cdx-button { - overflow: hidden; - min-width: 32px; - max-width: 448px; - min-height: 32px; - box-sizing: border-box; - padding-right: 12px; - padding-left: 12px; - border-width: 1px; - border-style: solid; - border-radius: 2px; - margin: 0; - font-family: inherit; - font-size: inherit; - font-weight: 700; - text-overflow: ellipsis; - text-transform: none; - transition-duration: 0.1s; - transition-property: background-color, color, border-color, box-shadow; - white-space: nowrap; -} - -.cdx-button::-moz-focus-inner { - padding: 0; - border: 0; -} - -.cdx-button:enabled { - color: #202122; -} - -.cdx-button:enabled:hover { - cursor: pointer; -} - -.cdx-button:enabled:focus:not( :active ) { - border-color: #36c; - box-shadow: inset 0 0 0 1px #36c; - outline: 1px solid transparent; -} - -.cdx-button:disabled { - border-color: transparent; -} - -.cdx-button .cdx-icon { - color: inherit; -} - -.cdx-button--icon-only { - padding: 0 5px; -} - -.cdx-button--framed:enabled { - border-color: #a2a9b1; - background-color: #f8f9fa; -} - -.cdx-button--framed:enabled:hover { - background-color: #fff; - color: #404244; -} - -.cdx-button--framed:enabled:active { - border-color: #72777d; - background-color: #eaecf0; - color: #000; -} - -.cdx-button--framed:disabled { - background-color: #c8ccd1; - color: #fff; -} - -.cdx-button--type-primary.cdx-button--action-progressive:enabled { - border-color: #36c; - background-color: #36c; - color: #fff; -} - -.cdx-button--type-primary.cdx-button--action-progressive:enabled:hover { - border-color: #447ff5; - background-color: #447ff5; -} - -.cdx-button--type-primary.cdx-button--action-progressive:enabled:active { - border-color: #2a4b8d; - background-color: #2a4b8d; -} - -.cdx-button--type-primary.cdx-button--action-progressive:enabled:focus:not( :active ) { - border-color: #36c; - box-shadow: inset 0 0 0 1px #36c, inset 0 0 0 2px #fff; -} - -.cdx-button--type-primary.cdx-button--action-destructive:enabled { - border-color: #d33; - background-color: #d33; - color: #fff; -} - -.cdx-button--type-primary.cdx-button--action-destructive:enabled:hover { - border-color: #ff4242; - background-color: #ff4242; -} - -.cdx-button--type-primary.cdx-button--action-destructive:enabled:active { - border-color: #b32424; - background-color: #b32424; -} - -.cdx-button--type-primary.cdx-button--action-destructive:enabled:focus:not( :active ) { - border-color: #d33; - box-shadow: inset 0 0 0 1px #d33, inset 0 0 0 2px #fff; -} - -.cdx-button--type-normal.cdx-button--action-progressive:enabled { - color: #36c; -} - -.cdx-button--type-normal.cdx-button--action-progressive:enabled:hover { - border-color: #447ff5; - color: #447ff5; -} - -.cdx-button--type-normal.cdx-button--action-progressive:enabled:active { - border-color: #2a4b8d; - background-color: #eff3fa; - color: #2a4b8d; -} - -.cdx-button--type-normal.cdx-button--action-destructive:enabled { - color: #d33; -} - -.cdx-button--type-normal.cdx-button--action-destructive:enabled:hover { - border-color: #ff4242; - color: #ff4242; -} - -.cdx-button--type-normal.cdx-button--action-destructive:enabled:active { - border-color: #b32424; - background-color: #fff; - color: #b32424; -} - -.cdx-button--type-normal.cdx-button--action-destructive:enabled:focus:not( :active ) { - border-color: #d33; - box-shadow: inset 0 0 0 1px #d33; -} - -.cdx-button--type-quiet { - border-color: transparent; - background-color: rgba( 255, 255, 255, 0 ); -} - -.cdx-button--type-quiet:enabled:hover { - background-color: rgba( 0, 24, 73, calc( 7 / 255 ) ); -} - -.cdx-button--type-quiet:enabled:active { - border-color: #72777d; - background-color: rgba( 0, 24, 73, calc( 21 / 255 ) ); - color: #000; -} - -.cdx-button--type-quiet.cdx-button--action-progressive:enabled { - color: #36c; -} - -.cdx-button--type-quiet.cdx-button--action-progressive:enabled:hover { - background-color: #eaf3ff; - color: #447ff5; -} - -.cdx-button--type-quiet.cdx-button--action-progressive:enabled:active { - border-color: #2a4b8d; - background-color: #2a4b8d; - color: #fff; -} - -.cdx-button--type-quiet.cdx-button--action-destructive:enabled { - color: #d33; -} - -.cdx-button--type-quiet.cdx-button--action-destructive:enabled:hover { - background-color: #fee7e6; - color: #ff4242; -} - -.cdx-button--type-quiet.cdx-button--action-destructive:enabled:active { - border-color: #b32424; - background-color: #b32424; - color: #fff; -} - -.cdx-button--type-quiet.cdx-button--action-destructive:enabled:focus:not( :active ) { - border-color: #d33; - box-shadow: inset 0 0 0 1px #d33; -} - -.cdx-button--type-quiet:disabled { - color: #72777d; -} - -.cdx-button-group { - position: relative; - z-index: 0; - overflow: hidden; - width: -webkit-fit-content; - width: -moz-fit-content; - width: fit-content; - padding-top: 1px; - padding-right: 1px; - border-radius: 2px; -} - -.cdx-button-group .cdx-button { - position: relative; - z-index: 1; - border-radius: 0; - margin-top: -1px; - margin-right: -1px; -} - -.cdx-button-group .cdx-button:enabled:active, -.cdx-button-group .cdx-button:enabled:focus { - z-index: 3; -} - -.cdx-button-group .cdx-button:disabled { - z-index: 0; - box-shadow: 0 -1px #fff, 1px 0 #fff; -} - -.cdx-thumbnail { - display: inline-flex; -} - -.cdx-thumbnail__placeholder, -.cdx-thumbnail__image { - width: 40px; - height: 40px; - flex-shrink: 0; - border: 1px solid #c8ccd1; - border-radius: 2px; - background-position: center; - background-repeat: no-repeat; - background-size: cover; -} - -.cdx-thumbnail__image { - display: inline-block; -} - -.cdx-thumbnail__image-enter-active { - transition-duration: 0.1s; - transition-property: opacity; -} - -.cdx-thumbnail__image-enter-from { - opacity: 0; -} - -.cdx-thumbnail__placeholder { - display: inline-flex; - align-items: center; - justify-content: center; - background-color: #f8f9fa; -} - -.cdx-thumbnail__placeholder__icon { - color: #72777d; -} - -.cdx-card { - position: relative; - display: flex; - align-items: flex-start; - padding: 12px; - border: 1px solid #a2a9b1; - border-radius: 2px; - background-color: #fff; -} - -.cdx-card--is-link { - transition-duration: 0.1s; - transition-property: background-color, color, border-color, box-shadow; -} - -.cdx-card--is-link, -.cdx-card--is-link:hover, -.cdx-card--is-link:focus { - text-decoration: none; -} - -.cdx-card--is-link:hover { - border-color: #72777d; -} - -.cdx-card--is-link:focus { - border-color: #36c; - box-shadow: inset 0 0 0 1px #36c, inset 0 0 0 2px #fff; - outline: 1px solid transparent; -} - -.cdx-card--title-only { - align-items: center; -} - -.cdx-card__text { - display: flex; - flex-direction: column; - -webkit-hyphens: auto; - hyphens: auto; - line-height: 1.375; - word-break: break-word; - word-wrap: break-word; -} - -.cdx-card__text__title { - color: #202122; - font-weight: 700; - line-height: 1.25; -} - -.cdx-card__text__description, -.cdx-card__text__supporting-text, -.cdx-card__text__description .cdx-icon, -.cdx-card__text__supporting-text .cdx-icon { - color: #54595d; -} - -.cdx-card__text__description { - margin-top: 4px; -} - -.cdx-card__text__supporting-text { - margin-top: 8px; - font-size: 0.875em; -} - -.cdx-card__thumbnail { - margin-left: 12px; -} - -.cdx-card__thumbnail .cdx-thumbnail__placeholder, -.cdx-card__thumbnail .cdx-thumbnail__image { - width: 48px; - height: 48px; -} - -.cdx-card__icon { - margin-left: 12px; - color: inherit; -} - -.cdx-card__icon svg { - width: 1.42857143em; - height: 1.42857143em; -} - -.cdx-checkbox:not( .cdx-checkbox--inline ) { - display: block; - margin-bottom: 12px; -} - -.cdx-checkbox:not( .cdx-checkbox--inline ):last-child { - margin-bottom: 0; -} - -.cdx-checkbox--inline { - margin-left: 16px; - white-space: nowrap; -} - -.cdx-checkbox--inline:last-child { - margin-left: 0; -} - -.cdx-checkbox__label { - position: relative; - z-index: 0; - display: inline-block; - line-height: 1.42857143em; -} - -.cdx-checkbox__label-content { - display: inline-block; - padding-right: 1.92857143em; -} - -.cdx-checkbox--inline .cdx-checkbox__label-content { - display: inline; -} - -.cdx-checkbox__icon { - position: absolute; - right: 0; - width: 1.42857143em; - height: 1.42857143em; - box-sizing: border-box; - border: 1px solid #72777d; - background-color: #fff; -} - -.cdx-checkbox__input { - position: absolute; - z-index: 1; - right: 0; - width: 1.42857143em; - height: 1.42857143em; - margin: 0; - cursor: inherit; - font-size: inherit; - opacity: 0; -} - -.cdx-checkbox__label:hover > .cdx-checkbox__input:enabled, -.cdx-checkbox__label:hover > .cdx-checkbox__input:enabled ~ * { - cursor: pointer; -} - -.cdx-checkbox__icon { - border-radius: 2px; - background-size: 0 0; - transition-duration: 0.1s; - transition-property: background-color, color, border-color, box-shadow; -} - -.cdx-checkbox__input:indeterminate + .cdx-checkbox__icon:before { - position: absolute; - top: calc( 50% - 0.5px ); - right: 0.21428571em; - left: 0.21428571em; - height: 2px; - background-color: #fff; - content: ' '; -} - -.cdx-checkbox__input:checked:not( :indeterminate ) + .cdx-checkbox__icon:before { - position: absolute; - width: 100%; - height: 100%; - background-image: url( 'data:image/svg+xml;utf8,' ); - background-position: center; - background-repeat: no-repeat; - background-size: 1em 1em; - content: ' '; -} - -.cdx-checkbox__input:enabled:hover + .cdx-checkbox__icon { - border-color: #447ff5; -} - -.cdx-checkbox__input:enabled:active + .cdx-checkbox__icon { - border-color: #2a4b8d; - background-color: #2a4b8d; -} - -.cdx-checkbox__input:enabled:focus:not( :active ) + .cdx-checkbox__icon { - border-color: #36c; - box-shadow: inset 0 0 0 1px #36c; - outline: 1px solid transparent; -} - -.cdx-checkbox__input:enabled:checked + .cdx-checkbox__icon, -.cdx-checkbox__input:enabled:indeterminate + .cdx-checkbox__icon { - border-color: #36c; - background-color: #36c; -} - -.cdx-checkbox__input:enabled:checked:hover + .cdx-checkbox__icon, -.cdx-checkbox__input:enabled:indeterminate:hover + .cdx-checkbox__icon { - border-color: #447ff5; - background-color: #447ff5; -} - -.cdx-checkbox__input:enabled:checked:active + .cdx-checkbox__icon, -.cdx-checkbox__input:enabled:indeterminate:active + .cdx-checkbox__icon { - border-color: #2a4b8d; - background-color: #2a4b8d; -} - -.cdx-checkbox__input:enabled:checked:focus:not( :active ):not( :hover ) + .cdx-checkbox__icon, -.cdx-checkbox__input:enabled:indeterminate:focus:not( :active ):not( :hover ) + .cdx-checkbox__icon { - border-color: #36c; - background-color: #36c; -} - -.cdx-checkbox__input:enabled:checked:focus:not( :active ) + .cdx-checkbox__icon, -.cdx-checkbox__input:enabled:indeterminate:focus:not( :active ) + .cdx-checkbox__icon { - box-shadow: inset 0 0 0 1px #36c, inset 0 0 0 2px #fff; -} - -.cdx-checkbox__input:disabled + .cdx-checkbox__icon { - border-color: #c8ccd1; - background-color: #c8ccd1; -} - -.cdx-checkbox__input:disabled ~ .cdx-checkbox__label-content { - color: #72777d; -} - -.cdx-search-result-title { - display: inline-block; - font-weight: 700; -} - -.cdx-search-result-title__match { - font-weight: 400; -} - -.cdx-menu-item { - position: relative; - padding: 8px 12px; - line-height: 1.6; - list-style: none; - transition-duration: 0.1s; - transition-property: background-color, color, border-color, box-shadow; -} - -.cdx-menu-item__content { - display: flex; - align-items: center; - -webkit-hyphens: auto; - hyphens: auto; - line-height: 1.375; - word-break: break-word; - word-wrap: break-word; -} - -.cdx-menu-item__content, -.cdx-menu-item__content:hover { - text-decoration: none; -} - -.cdx-menu-item--has-description .cdx-menu-item__content { - align-items: flex-start; -} - -.cdx-menu-item__text__description { - display: block; -} - -.cdx-menu-item__thumbnail { - margin-left: 8px; -} - -.cdx-menu-item__icon { - margin-left: 8px; - color: inherit; -} - -.cdx-menu-item__icon svg { - width: 1.42857143em; - height: 1.42857143em; -} - -.cdx-menu-item--bold-label .cdx-menu-item__text__label { - font-weight: 700; -} - -.cdx-menu-item--hide-description-overflow .cdx-menu-item__text { - overflow: hidden; -} - -.cdx-menu-item--hide-description-overflow .cdx-menu-item__text__description { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - -.cdx-menu-item--enabled, -.cdx-menu-item--enabled .cdx-menu-item__content { - color: #202122; -} - -.cdx-menu-item--enabled .cdx-menu-item__text__description { - color: #54595d; -} - -.cdx-menu-item--enabled:hover, -.cdx-menu-item--enabled.cdx-menu-item--highlighted { - background-color: #eaecf0; - cursor: pointer; -} - -.cdx-menu-item--enabled.cdx-menu-item--active, -.cdx-menu-item--enabled.cdx-menu-item--active:hover { - background-color: #eaf3ff; - color: #36c; -} - -.cdx-menu-item--enabled.cdx-menu-item--active .cdx-menu-item__content, -.cdx-menu-item--enabled.cdx-menu-item--active:hover .cdx-menu-item__content, -.cdx-menu-item--enabled.cdx-menu-item--active .cdx-menu-item__text__description, -.cdx-menu-item--enabled.cdx-menu-item--active:hover .cdx-menu-item__text__description { - color: #36c; -} - -.cdx-menu-item--enabled.cdx-menu-item--selected, -.cdx-menu-item--enabled.cdx-menu-item--selected:hover { - background-color: #eaf3ff; -} - -.cdx-menu-item--enabled.cdx-menu-item--selected:hover, -.cdx-menu-item--enabled.cdx-menu-item--selected.cdx-menu-item--highlighted, -.cdx-menu-item--enabled.cdx-menu-item--selected:hover .cdx-menu-item__content, -.cdx-menu-item--enabled.cdx-menu-item--selected.cdx-menu-item--highlighted .cdx-menu-item__content, -.cdx-menu-item--enabled.cdx-menu-item--selected:hover .cdx-menu-item__text__description, -.cdx-menu-item--enabled.cdx-menu-item--selected.cdx-menu-item--highlighted .cdx-menu-item__text__description { - color: #36c; -} - -.cdx-menu-item--disabled { - color: #72777d; - cursor: default; -} - -.cdx-menu-item--disabled .cdx-menu-item__text__description { - color: #72777d; -} - -.cdx-progress-bar { - box-sizing: border-box; - overflow-x: hidden; -} - -.cdx-progress-bar__bar { - width: 33%; - height: 100%; - animation-duration: 1.6s; - animation-iteration-count: infinite; - animation-name: cdx-animation-progress-bar__bar; - animation-timing-function: linear; - background-color: #36c; -} - -.cdx-progress-bar--block { - position: relative; - z-index: 1; - max-width: none; - height: 16px; - border: 1px solid #a2a9b1; - border-radius: 9999px; - background-color: #fff; - box-shadow: 0 2px 2px rgba( 0, 0, 0, 0.2 ); -} - -.cdx-progress-bar--inline { - width: 100%; - height: 4px; -} - -@keyframes cdx-animation-progress-bar__bar { - 0% { - transform: translate( 100% ); - } - - to { - transform: translate( -300% ); - } -} - -.cdx-menu { - position: absolute; - z-index: 4; - right: 0; - width: 100%; - box-sizing: border-box; - padding: 0; - border: 1px solid #a2a9b1; - border-radius: 0 0 2px 2px; - margin: -1px 0 0; - background-color: #fff; - box-shadow: 0 2px 2px rgba( 0, 0, 0, 0.2 ); -} - -.cdx-menu__progress-bar { - position: absolute; - top: 0; -} - -.cdx-text-input { - position: relative; - box-sizing: border-box; -} - -.cdx-text-input__start-icon { - position: absolute; - top: 50%; - right: 9px; - transform: translateY( -50% ); - transition-duration: 0.1s; - transition-property: color; -} - -.cdx-text-input__start-icon svg { - width: 20px; - height: 20px; -} - -.cdx-text-input__end-icon { - position: absolute; - top: 50%; - left: 9px; - transform: translateY( -50% ); - transition-duration: 0.1s; - transition-property: color; -} - -.cdx-text-input__end-icon svg { - width: 16px; - height: 16px; -} - -.cdx-text-input__clear-icon { - position: absolute; - top: 50%; - left: 9px; - transform: translateY( -50% ); - transition-duration: 0.1s; - transition-property: color; -} - -.cdx-text-input__clear-icon svg { - width: 16px; - height: 16px; -} - -.cdx-text-input__clear-icon:hover { - cursor: pointer; -} - -.cdx-text-input__end-icon + .cdx-text-input__clear-icon { - position: absolute; - top: 50%; - left: 33px; - transform: translateY( -50% ); - transition-duration: 0.1s; - transition-property: color; -} - -.cdx-text-input__end-icon + .cdx-text-input__clear-icon svg { - width: 16px; - height: 16px; -} - -.cdx-text-input__input { - display: block; - width: 100%; - min-height: 32px; - box-sizing: border-box; - padding: 4px 8px; - border-width: 1px; - border-style: solid; - border-radius: 2px; - margin: 0; - font-family: inherit; - font-size: inherit; - line-height: 1.42857143em; -} - -.cdx-text-input__input:enabled { - border-color: #a2a9b1; - background-color: #fff; - box-shadow: inset 0 0 0 1px transparent; - color: #202122; - transition-duration: 0.25s; - transition-property: background-color, color, border-color, box-shadow; -} - -.cdx-text-input__input:enabled ~ .cdx-text-input__icon { - color: #72777d; -} - -.cdx-text-input__input:enabled:focus ~ .cdx-text-input__icon, -.cdx-text-input__input:enabled.cdx-text-input__input--has-value ~ .cdx-text-input__icon { - color: #202122; -} - -.cdx-text-input__input:enabled:hover { - border-color: #72777d; -} - -.cdx-text-input__input:enabled:focus { - border-color: #36c; - box-shadow: inset 0 0 0 1px #36c; - outline: 1px solid transparent; -} - -.cdx-text-input__input:disabled { - border-color: #c8ccd1; - background-color: #eaecf0; - color: #72777d; - -webkit-text-fill-color: #72777d; -} - -.cdx-text-input__input:disabled ~ .cdx-text-input__icon { - color: #72777d; - pointer-events: none; -} - -.cdxinput__input::input-placeholder { - color: #72777d; - opacity: 1; -} - -.cdx-text-input__input::placeholder { - color: #72777d; - opacity: 1; -} - -.cdx-text-input__input::-ms-clear { - display: none; -} - -.cdx-text-input__input[ type='search' ] { - -webkit-appearance: none; - -moz-appearance: textfield; -} - -.cdx-text-input__input[ type='search' ]::-webkit-search-decoration, -.cdx-text-input__input[ type='search' ]::-webkit-search-cancel-button { - display: none; -} - -.cdx-text-input--has-start-icon .cdx-text-input__input { - padding-right: 36px; -} - -.cdx-text-input--has-end-icon .cdx-text-input__input, -.cdx-text-input--clearable .cdx-text-input__input { - padding-left: 32px; -} - -.cdx-text-input--has-end-icon.cdx-text-input--clearable .cdx-text-input__input { - padding-left: 56px; -} - -.cdx-combobox { - position: relative; - display: inline-block; - min-width: 280px; -} - -.cdx-combobox__input-wrapper { - display: flex; -} - -.cdx-combobox__input { - flex: 1 1 auto; -} - -.cdx-combobox__input [ aria-expanded='true' ], -.cdx-combobox__input[ aria-expanded='true' ] { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; -} - -.cdx-combobox__input .cdx-text-input__input { - border-left-width: 0; - border-bottom-left-radius: 0; - border-top-left-radius: 0; -} - -.cdx-combobox__expand-button { - position: relative; - min-width: 36px; - border-bottom-right-radius: 0; - border-top-right-radius: 0; -} - -.cdx-combobox__expand-icon { - position: absolute; - top: 50%; - right: 12px; - left: 12px; - transform: translateY( -50% ); - transition-duration: 0.1s; - transition-property: color; -} - -.cdx-combobox__expand-icon svg { - width: 12px; - height: 12px; -} - -.cdx-lookup { - position: relative; - box-sizing: border-box; - vertical-align: middle; -} - -.cdx-lookup--pending .cdx-text-input__input { - animation-duration: 0.65s; - animation-iteration-count: infinite; - animation-name: cdx-animation-pending-stripes; - animation-timing-function: linear; - background-color: #eaecf0; - background-image: linear-gradient( -135deg, #fff 25%, rgba( 255, 255, 255, 0 ) 25%, rgba( 255, 255, 255, 0 ) 50%, #fff 50%, #fff 75%, rgba( 255, 255, 255, 0 ) 75%, rgba( 255, 255, 255, 0 ) ); - background-size: 1.42857143em 1.42857143em; -} - -@keyframes cdx-animation-pending-stripes { - 0% { - background-position: calc( 100% - -1.42857143em ) 0; - } - - to { - background-position: 100% 0; - } -} - -.cdx-lookup__input [ aria-expanded='true' ], -.cdx-lookup__input[ aria-expanded='true' ] { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; -} - -.cdx-message { - position: relative; - display: flex; - align-items: flex-start; - color: #202122; -} - -.cdx-message--warning .cdx-message__icon { - color: #fc3; -} - -.cdx-message--error .cdx-message__icon { - color: #d33; -} - -.cdx-message--success .cdx-message__icon { - color: #14866d; -} - -.cdx-message--inline { - font-weight: 700; -} - -.cdx-message--inline.cdx-message--error { - color: #d33; -} - -.cdx-message--inline.cdx-message--success { - color: #14866d; -} - -.cdx-message--block { - padding: 16px; - border-width: 1px; - border-style: solid; -} - -@media screen and ( min-width: 640px ) { - .cdx-message--block { - padding-right: 24px; - padding-left: 24px; - } -} - -.cdx-message--block.cdx-message--notice { - border-color: #a2a9b1; - background-color: #eaecf0; -} - -.cdx-message--block.cdx-message--error { - border-color: #d33; - background-color: #fee7e6; -} - -.cdx-message--block.cdx-message--warning { - border-color: #fc3; - background-color: #fef6e7; -} - -.cdx-message--block.cdx-message--success { - border-color: #14866d; - background-color: #d5fdf4; -} - -.cdx-message--user-dismissable { - padding-left: 48px; -} - -@media screen and ( min-width: 640px ) { - .cdx-message--user-dismissable { - padding-left: 56px; - } -} - -.cdx-message svg { - width: 1.42857143em; - height: 1.42857143em; -} - -.cdx-message__content { - flex-grow: 1; - margin-right: 0.57142857em; - -webkit-hyphens: auto; - hyphens: auto; - word-break: break-word; - word-wrap: break-word; -} - -.cdx-message__dismiss-button { - position: absolute; - top: 0.57142857em; - left: 0.57142857em; - padding: 5px; -} - -@media screen and ( min-width: 640px ) { - .cdx-message__dismiss-button { - left: 1.14285714em; - } -} - -.cdx-message + .cdx-message { - margin-top: 8px; -} - -.cdx-message-enter-active, -.cdx-message-leave-active-system { - transition-duration: 0.25s; - transition-property: opacity; - transition-timing-function: ease; -} - -.cdx-message-leave-active-user { - transition-duration: 0.25s; - transition-property: opacity; - transition-timing-function: ease-out; -} - -.cdx-message-enter-from, -.cdx-message-leave-to { - opacity: 0; -} - -.cdx-radio:not( .cdx-radio--inline ) { - display: block; - margin-bottom: 12px; -} - -.cdx-radio:not( .cdx-radio--inline ):last-child { - margin-bottom: 0; -} - -.cdx-radio--inline { - margin-left: 16px; - white-space: nowrap; -} - -.cdx-radio--inline:last-child { - margin-left: 0; -} - -.cdx-radio__label { - position: relative; - z-index: 0; - display: inline-block; - line-height: 1.42857143em; -} - -.cdx-radio__label-content { - display: inline-block; - padding-right: 1.92857143em; -} - -.cdx-radio--inline .cdx-radio__label-content { - display: inline; -} - -.cdx-radio__icon { - position: absolute; - right: 0; - width: 1.42857143em; - height: 1.42857143em; - box-sizing: border-box; - border: 1px solid #72777d; - background-color: #fff; -} - -.cdx-radio__input { - position: absolute; - z-index: 1; - right: 0; - width: 1.42857143em; - height: 1.42857143em; - margin: 0; - cursor: inherit; - font-size: inherit; - opacity: 0; -} - -.cdx-radio__label:hover > .cdx-radio__input:enabled, -.cdx-radio__label:hover > .cdx-radio__input:enabled ~ * { - cursor: pointer; -} - -.cdx-radio__icon { - border-radius: 100%; - transition-duration: 0.1s; - transition-property: background-color, color, border-color, box-shadow; -} - -.cdx-radio__icon:before { - position: absolute; - top: -4px; - right: -4px; - bottom: -4px; - left: -4px; - border: 1px solid transparent; - border-radius: 100%; - content: ' '; -} - -.cdx-radio__input:enabled:hover + .cdx-radio__icon { - border-color: #447ff5; -} - -.cdx-radio__input:enabled:active + .cdx-radio__icon { - border-color: #2a4b8d; - background-color: #2a4b8d; -} - -.cdx-radio__input:enabled:checked + .cdx-radio__icon { - border-width: 0.42857143em; - border-color: #36c; -} - -.cdx-radio__input:enabled:checked:hover + .cdx-radio__icon { - border-color: #447ff5; -} - -.cdx-radio__input:enabled:checked:focus + .cdx-radio__icon:before { - border-color: #fff; -} - -.cdx-radio__input:enabled:checked:active + .cdx-radio__icon { - border-color: #2a4b8d; - background-color: #fff; -} - -.cdx-radio__input:enabled:checked:active + .cdx-radio__icon:before { - border-color: #2a4b8d; -} - -.cdx-radio__input:disabled ~ .cdx-radio__label-content { - color: #72777d; -} - -.cdx-radio__input:disabled + .cdx-radio__icon { - border-color: #c8ccd1; - background-color: #c8ccd1; -} - -.cdx-radio__input:disabled:checked + .cdx-radio__icon { - border-width: 0.42857143em; -} - -.cdx-search-input--has-end-button { - display: flex; - border: 1px solid #a2a9b1; - border-radius: 2px; - background-color: #fff; -} - -.cdx-search-input--has-end-button .cdx-search-input__input-wrapper { - flex-grow: 1; - margin: -1px; -} - -.cdx-search-input--has-end-button .cdx-search-input__input-wrapper .cdx-text-input__input { - border-bottom-left-radius: 0; - border-top-left-radius: 0; -} - -.cdx-search-input__end-button { - flex-shrink: 0; - margin: -1px 0 -1px -1px; - border-bottom-right-radius: 0; - border-top-right-radius: 0; -} - -.cdx-search-input__end-button:hover { - z-index: 1; -} - -.cdx-search-input__end-button:focus { - z-index: 1; -} - -.cdx-search-input__input-wrapper { - position: relative; -} - -.cdx-select { - position: relative; - display: inline-block; - min-width: 280px; -} - -.cdx-select__handle { - position: relative; - width: 100%; - min-height: 32px; - box-sizing: border-box; - padding: 4px 12px 4px 36px; - border-width: 1px; - border-style: solid; - border-radius: 2px; - line-height: 1.42857143em; -} - -.cdx-select--has-start-icon .cdx-select__handle { - padding-right: 40px; -} - -.cdx-select__start-icon { - position: absolute; - top: 50%; - right: 12px; - transform: translateY( -50% ); - transition-duration: 0.1s; - transition-property: color; -} - -.cdx-select__start-icon svg { - width: 20px; - height: 20px; -} - -.cdx-select__indicator { - position: absolute; - top: 50%; - left: 8px; - color: #202122; - transform: translateY( -50% ); - transition-duration: 0.1s; - transition-property: color; -} - -.cdx-select__indicator svg { - width: 12px; - height: 12px; -} - -.cdx-select--enabled .cdx-select__handle { - border-color: #a2a9b1; - background-color: #f8f9fa; - color: #202122; - transition-duration: 0.1s; - transition-property: background-color, color, border-color, box-shadow; -} - -.cdx-select--enabled .cdx-select__handle [ aria-expanded='true' ], -.cdx-select--enabled .cdx-select__handle[ aria-expanded='true' ] { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; -} - -.cdx-select--enabled .cdx-select__handle:hover { - border-color: #a2a9b1; - background-color: #fff; - color: #404244; - cursor: pointer; -} - -.cdx-select--enabled .cdx-select__handle:hover .cdx-select__indicator { - color: #404244; -} - -.cdx-select--enabled .cdx-select__handle:focus { - border-color: #36c; - box-shadow: inset 0 0 0 1px #36c; - outline: 1px solid transparent; -} - -.cdx-select--enabled .cdx-select__handle:active { - border-color: #72777d; - color: #000; -} - -.cdx-select--enabled.cdx-select--expanded .cdx-select__handle { - background-color: #fff; -} - -.cdx-select--enabled.cdx-select--expanded .cdx-select__handle .cdx-select__indicator { - color: #202122; -} - -.cdx-select--disabled .cdx-select__handle { - border-color: #c8ccd1; - background-color: #eaecf0; - color: #72777d; - cursor: default; -} - -.cdx-select--disabled .cdx-select__indicator, -.cdx-select--disabled .cdx-select__start-icon { - color: #72777d; -} - -.cdx-tab:focus { - outline: 1px solid transparent; -} - -.cdx-tabs__header { - position: relative; - display: flex; - align-items: flex-end; -} - -.cdx-tabs__header:focus { - outline: 1px solid transparent; -} - -.cdx-tabs__prev-scroller, -.cdx-tabs__next-scroller { - position: absolute; - top: 0; - bottom: 0; - background-color: inherit; -} - -.cdx-tabs__prev-scroller { - right: 0; -} - -.cdx-tabs__next-scroller { - left: 0; -} - -.cdx-tabs__prev-scroller:after, -.cdx-tabs__next-scroller:before { - position: absolute; - z-index: 1; - top: 0; - width: 24px; - height: 100%; - content: ''; - pointer-events: none; -} - -.cdx-tabs__prev-scroller:after { - right: 100%; -} - -.cdx-tabs__next-scroller:before { - left: 100%; -} - -.cdx-tabs__scroll-button { - height: 100%; -} - -.cdx-tabs > .cdx-tabs__header:focus .cdx-tabs__list__item--enabled.cdx-tabs__list__item--selected [ role='tab' ] { - overflow: hidden; - box-shadow: inset 0 0 0 2px #36c; -} - -.cdx-tabs__list { - display: flex; - padding: 0; - margin: 0; - list-style: none; - -webkit-overflow-scrolling: touch; - overflow-x: auto; - scrollbar-width: none; -} - -.cdx-tabs__list::-webkit-scrollbar { - display: none; - -webkit-appearance: none; -} - -.cdx-tabs__list__item { - flex: 0 0 auto; -} - -.cdx-tabs__list__item [ role='tab' ] { - display: block; - overflow: hidden; - max-width: 16em; - padding: 4px 12px; - border-top-left-radius: 2px; - border-top-right-radius: 2px; - font-weight: 700; - line-height: 1.42857143em; - text-decoration: none; - text-overflow: ellipsis; - transition-duration: 0.1s; - transition-property: background-color, color, border-color, box-shadow; - white-space: nowrap; -} - -.cdx-tabs__list__item [ role='tab' ]:focus { - border-top-left-radius: 2px; - border-top-right-radius: 2px; - outline: 1px solid transparent; -} - -.cdx-tabs__list__item.cdx-tabs__list__item--selected [ role='tab' ] { - cursor: default; -} - -.cdx-tabs > .cdx-tabs__header .cdx-tabs__list__item + .cdx-tabs__list__item { - margin-right: 0; -} - -.cdx-tabs--framed > .cdx-tabs__header { - background-color: #eaecf0; -} - -.cdx-tabs--framed > .cdx-tabs__header .cdx-tabs__prev-scroller:after { - background-image: linear-gradient( to left, #eaecf0 0, rgba( 255, 255, 255, 0 ) 100% ); -} - -.cdx-tabs--framed > .cdx-tabs__header .cdx-tabs__next-scroller:before { - background-image: linear-gradient( to right, #eaecf0 0, rgba( 255, 255, 255, 0 ) 100% ); -} - -.cdx-tabs--framed > .cdx-tabs__header .cdx-tabs__list__item [ role='tab' ] { - margin: 8px 8px 0 4px; -} - -.cdx-tabs--framed > .cdx-tabs__header .cdx-tabs__list__item:last-child [ role='tab' ] { - margin-left: 8px; -} - -.cdx-tabs--framed > .cdx-tabs__header .cdx-tabs__list__item--enabled [ role='tab' ] { - overflow: hidden; -} - -.cdx-tabs--framed > .cdx-tabs__header .cdx-tabs__list__item--enabled [ role='tab' ]:link, -.cdx-tabs--framed > .cdx-tabs__header .cdx-tabs__list__item--enabled [ role='tab' ]:visited { - color: #202122; -} - -.cdx-tabs--framed > .cdx-tabs__header .cdx-tabs__list__item--enabled [ role='tab' ]:hover { - background-color: rgba( 255, 255, 255, 0.3 ); - color: #202122; -} - -.cdx-tabs--framed > .cdx-tabs__header .cdx-tabs__list__item--enabled [ role='tab' ]:active { - background-color: rgba( 255, 255, 255, 0.8 ); - color: #202122; -} - -.cdx-tabs--framed > .cdx-tabs__header .cdx-tabs__list__item--enabled.cdx-tabs__list__item--selected [ role='tab' ], -.cdx-tabs--framed > .cdx-tabs__header .cdx-tabs__list__item--enabled.cdx-tabs__list__item--selected [ role='tab' ]:hover { - background-color: #fff; -} - -.cdx-tabs--framed > .cdx-tabs__header .cdx-tabs__list__item--disabled [ role='tab' ] { - background-color: #eaecf0; - color: #72777d; - cursor: default; -} - -.cdx-tabs--quiet > .cdx-tabs__header { - border-bottom: 1px solid #a2a9b1; - margin: 0 4px; - background-color: #fff; -} - -.cdx-tabs--quiet > .cdx-tabs__header .cdx-tabs__prev-scroller:after { - background-image: linear-gradient( to left, #fff 0, rgba( 255, 255, 255, 0 ) 100% ); -} - -.cdx-tabs--quiet > .cdx-tabs__header .cdx-tabs__next-scroller:before { - background-image: linear-gradient( to right, #fff 0, rgba( 255, 255, 255, 0 ) 100% ); -} - -.cdx-tabs--quiet > .cdx-tabs__header .cdx-tabs__list__item [ role='tab' ] { - margin: 0 4px; -} - -.cdx-tabs--quiet > .cdx-tabs__header .cdx-tabs__list__item:first-child [ role='tab' ] { - margin-right: 0; -} - -.cdx-tabs--quiet > .cdx-tabs__header .cdx-tabs__list__item:last-child [ role='tab' ] { - margin-left: 0; -} - -.cdx-tabs--quiet > .cdx-tabs__header .cdx-tabs__list__item--enabled [ role='tab' ] { - color: #202122; -} - -.cdx-tabs--quiet > .cdx-tabs__header .cdx-tabs__list__item--enabled [ role='tab' ]:hover { - box-shadow: inset 0 -2px #447ff5; - color: #447ff5; -} - -.cdx-tabs--quiet > .cdx-tabs__header .cdx-tabs__list__item--enabled [ role='tab' ]:active { - box-shadow: inset 0 -2px #2a4b8d; - color: #2a4b8d; -} - -.cdx-tabs--quiet > .cdx-tabs__header .cdx-tabs__list__item--enabled.cdx-tabs__list__item--selected [ role='tab' ] { - box-shadow: inset 0 -2px #36c; - color: #36c; -} - -.cdx-tabs--quiet > .cdx-tabs__header .cdx-tabs__list__item--disabled [ role='tab' ] { - color: #72777d; - cursor: default; -} - -.cdx-toggle-button { - overflow: hidden; - min-width: 32px; - max-width: 448px; - min-height: 32px; - box-sizing: border-box; - padding-right: 12px; - padding-left: 12px; - border-width: 1px; - border-style: solid; - border-radius: 2px; - margin: 0; - font-family: inherit; - font-size: inherit; - font-weight: 700; - text-overflow: ellipsis; - text-transform: none; - transition-duration: 0.1s; - transition-property: background-color, color, border-color, box-shadow; - white-space: nowrap; -} - -.cdx-toggle-button::-moz-focus-inner { - padding: 0; - border: 0; -} - -.cdx-toggle-button:enabled { - color: #202122; -} - -.cdx-toggle-button:enabled:hover { - cursor: pointer; -} - -.cdx-toggle-button:enabled:focus { - border-color: #36c; - box-shadow: inset 0 0 0 1px #36c; - outline: 1px solid transparent; -} - -.cdx-toggle-button:enabled:active { - border-color: #72777d; - box-shadow: none; - color: #000; -} - -.cdx-toggle-button .cdx-icon { - color: inherit; -} - -.cdx-toggle-button--framed:enabled { - border-color: #a2a9b1; - background-color: #f8f9fa; -} - -.cdx-toggle-button--framed:enabled:hover { - background-color: #fff; - color: #404244; -} - -.cdx-toggle-button--framed:enabled:active { - background-color: #eaecf0; -} - -.cdx-toggle-button--framed:disabled { - border-color: #c8ccd1; - background-color: #c8ccd1; - color: #fff; -} - -.cdx-toggle-button--framed.cdx-toggle-button--toggled-on:enabled { - border-color: #2a4b8d; - background-color: #2a4b8d; - color: #fff; -} - -.cdx-toggle-button--framed.cdx-toggle-button--toggled-on:enabled:hover { - border-color: #447ff5; - background-color: #447ff5; - color: #fff; -} - -.cdx-toggle-button--framed.cdx-toggle-button--toggled-on:enabled:focus { - border-color: #36c; - box-shadow: inset 0 0 0 1px #36c, inset 0 0 0 2px #fff; -} - -.cdx-toggle-button--framed.cdx-toggle-button--toggled-on:enabled:active { - border-color: #72777d; - background-color: #eaecf0; - box-shadow: none; - color: #000; -} - -.cdx-toggle-button--quiet { - border-color: transparent; - background-color: rgba( 255, 255, 255, 0 ); -} - -.cdx-toggle-button--quiet:enabled.cdx-toggle-button--toggled-on { - background-color: #eaecf0; -} - -.cdx-toggle-button--quiet:enabled:hover { - background-color: #f8f9fa; -} - -.cdx-toggle-button--quiet:enabled:focus { - background-color: #f8f9fa; -} - -.cdx-toggle-button--quiet:enabled:active { - background-color: #eaecf0; -} - -.cdx-toggle-button--quiet:disabled { - color: #72777d; -} - -.cdx-toggle-button-group { - position: relative; - z-index: 0; - overflow: hidden; - width: -webkit-fit-content; - width: -moz-fit-content; - width: fit-content; - padding-top: 1px; - padding-right: 1px; - border-radius: 2px; -} - -.cdx-toggle-button-group .cdx-toggle-button { - position: relative; - z-index: 1; - border-radius: 0; - margin-top: -1px; - margin-right: -1px; -} - -.cdx-toggle-button-group .cdx-toggle-button:enabled:active, -.cdx-toggle-button-group .cdx-toggle-button:enabled:focus { - z-index: 3; -} - -.cdx-toggle-button-group .cdx-toggle-button:disabled { - z-index: 0; - box-shadow: 0 -1px #fff, 1px 0 #fff; -} - -.cdx-toggle-button-group .cdx-toggle-button--toggled-on:enabled { - z-index: 2; - box-shadow: 0 -1px #fff, 1px 0 #fff; -} - -.cdx-toggle-switch { - position: relative; - z-index: 0; - display: inline-flex; - align-items: center; - justify-content: space-between; -} - -.cdx-toggle-switch__label { - display: flex; - flex-direction: row; -} - -.cdx-toggle-switch__label-content { - align-self: center; - order: 1; - padding-left: 6px; -} - -.cdx-toggle-switch__switch { - position: relative; - display: inline-block; - overflow: hidden; - width: 3.5em; - height: 2em; - box-sizing: border-box; - flex-shrink: 0; - order: 2; - border-width: 1px; - border-style: solid; - border-color: #72777d; - border-radius: 9999px; - background-color: #f8f9fa; - transform: translateZ( 0 ); - transition-duration: 0.25s; - transition-property: background-color, color, border-color, box-shadow; -} - -.cdx-toggle-switch__switch:before { - position: absolute; - z-index: 1; - top: 1px; - right: 1px; - bottom: 1px; - left: 1px; - display: block; - border: 1px solid transparent; - border-radius: 9999px; - content: ''; - transition-duration: 0.25s; - transition-property: background-color, color, border-color, box-shadow; -} - -.cdx-toggle-switch__switch__grip { - position: absolute; - top: 0.32142857em; - right: 0.32142857em; - width: 1.25em; - height: 1.25em; - box-sizing: border-box; - border: 1px solid #72777d; - border-radius: 100%; - transition-duration: 0.1s; - transition-property: background-color, border-color, right; -} - -@media screen and ( min-width: 640px ) { - .cdx-toggle-switch__switch__grip { - top: 0.35714286em; - right: 0.35714286em; - width: 1.14285714em; - height: 1.14285714em; - } -} - -.cdx-toggle-switch__input { - position: absolute; - z-index: 2; - left: 0; - width: 3.5em; - height: 2em; - margin: 0; - font-size: inherit; - opacity: 0; -} - -.cdx-toggle-switch__input:checked ~ .cdx-toggle-switch__switch .cdx-toggle-switch__switch__grip { - right: 1.82142857em; - border-color: #fff; - background-color: #fff; -} - -@media screen and ( min-width: 640px ) { - .cdx-toggle-switch__input:checked ~ .cdx-toggle-switch__switch .cdx-toggle-switch__switch__grip { - right: 1.85714286em; - } -} - -.cdx-toggle-switch__input:enabled:hover, -.cdx-toggle-switch__input:enabled ~ .cdx-toggle-switch__label-content:hover { - cursor: pointer; -} - -.cdx-toggle-switch__input:enabled ~ .cdx-toggle-switch__switch .cdx-toggle-switch__switch__grip { - background-color: #f8f9fa; -} - -.cdx-toggle-switch__input:enabled:hover ~ .cdx-toggle-switch__switch { - border-color: #447ff5; - background-color: #fff; -} - -.cdx-toggle-switch__input:enabled:hover ~ .cdx-toggle-switch__switch .cdx-toggle-switch__switch__grip { - border-color: #447ff5; - background-color: #fff; -} - -.cdx-toggle-switch__input:enabled:active ~ .cdx-toggle-switch__switch { - border-color: #2a4b8d; - background-color: #2a4b8d; -} - -.cdx-toggle-switch__input:enabled:active ~ .cdx-toggle-switch__switch:before { - border-color: #2a4b8d; -} - -.cdx-toggle-switch__input:enabled:active ~ .cdx-toggle-switch__switch .cdx-toggle-switch__switch__grip { - border-color: #fff; -} - -.cdx-toggle-switch__input:enabled:focus:not( :active ) ~ .cdx-toggle-switch__switch { - border-color: #36c; - box-shadow: inset 0 0 0 1px #36c; - outline: 1px solid transparent; -} - -.cdx-toggle-switch__input:enabled:focus:not( :active ) ~ .cdx-toggle-switch__switch .cdx-toggle-switch__switch__grip { - border-color: #36c; -} - -.cdx-toggle-switch__input:enabled:checked ~ .cdx-toggle-switch__switch { - border-color: #36c; - background-color: #36c; -} - -.cdx-toggle-switch__input:enabled:checked ~ .cdx-toggle-switch__switch .cdx-toggle-switch__switch__grip { - border-color: #fff; -} - -.cdx-toggle-switch__input:enabled:checked:hover ~ .cdx-toggle-switch__switch { - border-color: #447ff5; - background-color: #447ff5; -} - -.cdx-toggle-switch__input:enabled:checked:active ~ .cdx-toggle-switch__switch { - border-color: #2a4b8d; - background-color: #2a4b8d; - box-shadow: inset 0 0 0 1px #2a4b8d; -} - -.cdx-toggle-switch__input:enabled:checked:active ~ .cdx-toggle-switch__switch:before { - border-color: #2a4b8d; -} - -.cdx-toggle-switch__input:enabled:checked:active ~ .cdx-toggle-switch__switch .cdx-toggle-switch__switch__grip { - border-color: #fff; - background-color: #fff; -} - -.cdx-toggle-switch__input:enabled:checked:focus:not( :active ) ~ .cdx-toggle-switch__switch { - border-color: #36c; -} - -.cdx-toggle-switch__input:enabled:checked:focus:not( :active ) ~ .cdx-toggle-switch__switch:before, -.cdx-toggle-switch__input:enabled:checked:focus:not( :active ) ~ .cdx-toggle-switch__switch .cdx-toggle-switch__switch__grip { - border-color: #fff; -} - -.cdx-toggle-switch__input:disabled { - cursor: default; -} - -.cdx-toggle-switch__input:disabled ~ .cdx-toggle-switch__label { - color: #72777d; -} - -.cdx-toggle-switch__input:disabled ~ .cdx-toggle-switch__switch { - border-color: #c8ccd1; - background-color: #c8ccd1; -} - -.cdx-toggle-switch__input:disabled ~ .cdx-toggle-switch__switch .cdx-toggle-switch__switch__grip { - border-color: #fff; - box-shadow: inset 0 0 0 1px #fff; -} - -.cdx-toggle-switch__input:disabled:checked ~ .cdx-toggle-switch__switch .cdx-toggle-switch__switch__grip { - background-color: #fff; -} - -.cdx-typeahead-search .cdx-menu-item { - padding: 0; -} - -.cdx-typeahead-search .cdx-menu-item__content { - padding: 8px 12px; -} - -.cdx-typeahead-search__menu-message, -.cdx-typeahead-search__search-footer { - display: flex; - align-items: center; - padding: 8px 12px; - color: #202122; - text-decoration: none; -} - -.cdx-typeahead-search__search-footer { - border-top: 1px solid #c8ccd1; -} - -.cdx-typeahead-search__search-footer:visited { - color: #202122; -} - -.cdx-typeahead-search__search-footer:hover { - cursor: pointer; - text-decoration: none; -} - -.cdx-typeahead-search__search-footer__icon { - width: auto; - height: 40px; - margin-left: 8px; - color: #54595d; -} - -.cdx-typeahead-search__search-footer__active .cdx-typeahead-search__search-footer__icon, -.cdx-typeahead-search__search-footer__active .cdx-typeahead-search__search-footer__text { - color: #36c; -} - -.cdx-typeahead-search__menu-message--with-thumbnail { - padding-right: 20px; -} - -.cdx-typeahead-search__input [ aria-expanded='true' ], -.cdx-typeahead-search__input[ aria-expanded='true' ] { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; -} - -.cdx-typeahead-search--show-thumbnail.cdx-typeahead-search--auto-expand-width:not( .cdx-typeahead-search--active ) { - margin-right: 24px; -} - -.cdx-typeahead-search--show-thumbnail:not( .cdx-typeahead-search--auto-expand-width ), -.cdx-typeahead-search--show-thumbnail.cdx-typeahead-search--auto-expand-width.cdx-typeahead-search--active { - margin-right: 0; -} - -.cdx-typeahead-search--show-thumbnail:not( .cdx-typeahead-search--auto-expand-width ) .cdx-text-input__input, -.cdx-typeahead-search--show-thumbnail.cdx-typeahead-search--auto-expand-width.cdx-typeahead-search--active .cdx-text-input__input { - padding-right: 60px; -} - -.cdx-typeahead-search--show-thumbnail:not( .cdx-typeahead-search--auto-expand-width ) .cdx-text-input__start-icon, -.cdx-typeahead-search--show-thumbnail.cdx-typeahead-search--auto-expand-width.cdx-typeahead-search--active .cdx-text-input__start-icon { - position: absolute; - top: 50%; - right: 22px; - transform: translateY( -50% ); - transition-duration: 0.1s; - transition-property: color; -} - -.cdx-typeahead-search--show-thumbnail:not( .cdx-typeahead-search--auto-expand-width ) .cdx-text-input__start-icon svg, -.cdx-typeahead-search--show-thumbnail.cdx-typeahead-search--auto-expand-width.cdx-typeahead-search--active .cdx-text-input__start-icon svg { - width: 20px; - height: 20px; -} - -.cdx-typeahead-search--show-thumbnail .cdx-typeahead-search__search-footer { - padding-right: 12px; - padding-left: 12px; -} - -.cdx-typeahead-search--show-thumbnail .cdx-typeahead-search__search-footer__icon { - width: 40px; - flex-shrink: 0; -} - -.cdx-typeahead-search--show-thumbnail .cdx-typeahead-search__search-footer__text, -.cdx-typeahead-search--show-thumbnail .cdx-typeahead-search__search-footer__query { - -webkit-hyphens: auto; - hyphens: auto; - word-break: break-word; - word-wrap: break-word; -} - -.cdx-typeahead-search .cdx-menu-item:first-child .cdx-typeahead-search__search-footer { - border-top: unset; -} From b7996c5952a6a54eae8b3d2288317b599a60360c Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Sat, 7 Jan 2023 13:50:41 -0500 Subject: [PATCH 023/124] =?UTF-8?q?fix(codex):=20=F0=9F=90=9B=20incorrect?= =?UTF-8?q?=20Codex=20file=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skin.json b/skin.json index 37e8d4be..db216951 100644 --- a/skin.json +++ b/skin.json @@ -479,7 +479,7 @@ "+oojs-ui-widgets": "skinStyles/ooui/oojs-ui-widgets.less", "+oojs-ui-windows": "skinStyles/ooui/oojs-ui-windows.less", "+jquery.ui": "skinStyles/jquery.ui/smoothness/jquery.ui.theme.less", - "+@wikimedia/codex": "skinStyles/codex/codex-styles.less" + "+@wikimedia/codex": "skinStyles/codex/codex.styles.less" } }, "config_prefix": "wgCitizen", From 7bd30ebecba8a88de902c9366bf44f75f1bf3a9b Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Sun, 8 Jan 2023 21:23:23 -0500 Subject: [PATCH 024/124] =?UTF-8?q?feat(UploadWizard):=20=E2=9C=A8=20updat?= =?UTF-8?q?e=20UploadWizard=20styles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../UploadWizard/ext.uploadWizard.less | 371 +++++++++++++++--- .../UploadWizard/uploadWizard.noWizard.less | 27 +- .../mediawiki.rcfilters.filters.ui.less | 4 +- skinStyles/ooui/oojs-ui-widgets.less | 8 + 5 files changed, 354 insertions(+), 58 deletions(-) diff --git a/README.md b/README.md index 46f20e76..17c79a41 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ Name | Grade | Version | Last updated [TimedMediaHandler](https://www.mediawiki.org/wiki/Extension:TimedMediaHandler) | B | N/A | N/A [Translate](https://www.mediawiki.org/wiki/Extension:Translate) | B | MLEB 2021.07 | 2021-07-29 [UniversalLanguageSelector](https://www.mediawiki.org/wiki/Extension:UniversalLanguageSelector) | B | MLEB 2021.12 | 2022-05-17 -[UploadWizard](https://www.mediawiki.org/wiki/Extension:UploadWizard) | A | N/A | N/A +[UploadWizard](https://www.mediawiki.org/wiki/Extension:UploadWizard) | A | REL1_39 `9cd7a02` | 2023-01-08 [VisualEditor](https://www.mediawiki.org/wiki/Extension:VisualEditor) | A | REL1_35 `cc3466a` | 2021-08-04 [Wikibase](https://www.mediawiki.org/wiki/Extension:Wikibase) | B | REL1_35 `7bb503b` | 2022-05-11 [WikiEditor](https://www.mediawiki.org/wiki/Extension:WikiEditor) | A | REL1_39 `02e1c70` | 2022-11-08 diff --git a/skinStyles/extensions/UploadWizard/ext.uploadWizard.less b/skinStyles/extensions/UploadWizard/ext.uploadWizard.less index 34323056..e2b7c9e5 100644 --- a/skinStyles/extensions/UploadWizard/ext.uploadWizard.less +++ b/skinStyles/extensions/UploadWizard/ext.uploadWizard.less @@ -1,19 +1,127 @@ /* - * Citizen - Upload Wizard - * https://starcitizen.tools - */ + * Citizen + * + * SkinStyles for Extension:UploadWizard + * Module: ext.uploadWizard + * Version: REL1_39 9cd7a02 + * + * Date: 2023-01-08 +*/ -/* - * resources/uploadWizard.css - */ -#upload-wizard { - min-width: auto; - max-width: none; // handled by .mw-body-content +@import '../../../resources/variables.less'; +@import '../../../resources/mixins.less'; + +// Disable sticky header +#citizen-body-header-sticky-sentinel { + display: none; } -#mwe-upwiz-tutorial img { - max-width: 100%; // don't exceed container - height: auto; +/* uw.CopyMetadataWidget.less */ +.mwe-upwiz-copyMetadataWidget { + border-top-color: var( --border-color-base ); + border-bottom-color: var( --border-color-base ); + + @media ( max-width: @width-breakpoint-tablet ) { + padding-left: 0; + } +} + +/* uw.ui.Thanks.less */ +#mwe-upwiz-stepdiv-thanks { + .mwe-upwiz-thanks-update-delay { + font-weight: var( --font-weight-semibold ); + } + + .mwe-upwiz-mv-cta-confirmation { + color: var( --color-success ); + } +} + +/* uw.ui.Metadata.less */ +h3.mwe-upwiz-metadata-title { + font-size: var( --font-size-h3 ); +} + +.mwe-upwiz-metadata-booklet.oo-ui-bookletLayout { + > .oo-ui-menuLayout-menu { + .mwe-upwiz-metadata-page--error { + border-color: transparent; + background-color: var( --background-color-destructive ); + } + } + + > .oo-ui-menuLayout-content { + .wbmi-statements-widget { + border-bottom-color: var( --border-color-base ); + } + } +} + +/* uploadWizard.less */ +#upload-wizard { + /* Remove hardcoded width */ + min-width: auto; + max-width: none; + margin-top: 0; +} + +#mwe-upwiz-steps { + display: flex; + overflow: hidden; // Hide arrow overflow + justify-content: space-evenly; + border-bottom: 1px solid var( --border-color-base ); + background-color: transparent; + line-height: var( --line-height-sm ); + + &:before, + &:after { + content: none; // Pseudo elements do not play well with flex + } + + li { + width: auto !important; + height: auto; + background-color: transparent; + color: var( --color-base--subtle ); + + div { + padding: var( --space-sm ) var( --space-md ); + } + + &.head { + background-color: transparent; + color: var( --color-primary ); + font-weight: var( --font-weight-semibold ); + } + + &.arrow { + &:before, + &:after { + content: none; + } + } + } +} + +#mwe-upwiz-tutorial { + overflow: auto; + /* + * Allow content to overflow + * We don't resize the campaign image because of map and readibility + */ + max-width: 100%; +} + +.mwe-upwiz-add-files-0, +#mwe-upwiz-files { + margin-top: 0; + margin-bottom: 0; +} + +.mwe-upwiz-add-files-0 { + .mwe-upwiz-add-file { + font-size: 1rem; + } } #mwe-upwiz-files { @@ -21,66 +129,237 @@ margin-left: 0; } -.filled + .filled { - border-top-color: var( --border-color-base ); +.mwe-upwiz-file { + &.odd { + .mwe-upwiz-visible-file { + background-color: transparent; + } + } + + &-status { + color: var( --color-base--subtle ); + } + + &:hover { + .mwe-upwiz-visible-file { + background-color: var( --background-color-quiet--hover ) !important; + } + } } -.mwe-upwiz-file:hover .mwe-upwiz-visible-file { - background: var( --background-color-primary--hover ) !important; +.mwe-upwiz-visible-file-filename { + padding: var( --space-md ) 0; + + &-text { + color: var( --color-base--emphasized ); + font-weight: var( --font-weight-semibold ); + } } -.mwe-upwiz-file.odd .mwe-upwiz-visible-file { - background: var( --color-surface-2 ); +.mwe-upwiz-add-file.oo-ui-selectFileInputWidget { + max-width: none; // Full width for file drop widget +} + +.mwe-upwiz-patent-rights .oo-ui-panelLayout .oo-ui-panelLayout:not( :last-child ) { + box-shadow: 0 1em 1px -1em var( --border-color-base ); +} + +.mwe-upwiz-patent-rights-filelist { + box-shadow: 0 0 1px 0 var( --border-color-base ); +} + +.mwe-upwiz-patent-weapon-policy { + border-color: var( --border-color-base ); + background-color: var( --color-surface-2 ); +} + +.mwe-upwiz-license-metadata { + border-color: var( --border-color-base ); + background-color: var( --color-surface-2 ); +} + +#mwe-upwiz-flickr-disclaimer { + background-color: var( --color-surface-2 ); + font-size: 0.875rem; +} + +.mwe-upwiz-thumbnail { + background-color: var( --color-surface-0 ); + + &-link { + canvas, + img { + border-radius: var( --border-radius--small ); + box-shadow: var( --box-shadow-card ); + } + } } #mwe-upwiz-deeds-thumbnails { + padding-bottom: 1em; // Even out margin + border-bottom: 1px solid var( --border-color-base ); + background: transparent; + overflow-x: auto; + white-space: nowrap; +} + +.mwe-upwiz-deed { + border-radius: var( --border-radius--small ); + margin: var( --space-xs ) 0; background-color: var( --color-surface-2 ); + + &-option-title { + + .mwe-upwiz-deed-form { + border-top: 1px solid var( --border-color-base ); + } + } + + &-form-internal { + padding: var( --space-sm ) var( --space-md ); + } + + &-license-group { + &-subhead { + color: var( --color-base--subtle ); + } + + &-body { + margin-top: var( --space-md ); + } + } + + .mwe-upwiz-deed-option-title { + .oo-ui-optionWidget { + display: block; + padding: var( --space-sm ) var( --space-md ); + border-radius: var( --border-radius--small ); + + &.oo-ui-widget-enabled { + &:hover { + background-color: var( --background-color-quiet--hover ); + } + + &:active { + background-color: var( --background-color-quiet--active ); + } + } + } + } + + /* More obvious selected state */ + &.selected { + .mwe-upwiz-deed-option-title { + .oo-ui-optionWidget.oo-ui-widget-enabled { + background-color: var( --background-color-primary--hover ); + } + } + } } -.mwe-upwiz-thumbnail-link canvas, -.mwe-upwiz-thumbnail-link img { - box-shadow: var( --box-shadow-card ); +.mwe-upwiz-details-fieldname { + // Citizen label styles + color: var( --color-base--subtle ); + font-size: 0.8125rem; + font-weight: var( --font-weight-normal ); + letter-spacing: 0.05em; } -.mwe-upwiz-singleLanguageInputWidget { - border-color: var( --border-color-base ); - background-color: var( --color-surface-2 ); +.mwe-title { + font-family: var( --font-family-base ); } -.mwe-upwiz-copyMetadataWidget { +.mwe-small-print { + color: var( --color-base--subtle ); + font-size: 0.8125rem; +} + +.mwe-upwiz-license-custom .oo-ui-textInputWidget textarea { + font-family: var( --font-family-monospace ); +} + +.mwe-readonly { + background-color: var( --color-surface-0 ); +} + +.ui-corner-top { + border-top-left-radius: var( --border-radius--small ); + border-top-right-radius: var( --border-radius--small ); +} + +.ui-corner-bottom { + border-bottom-left-radius: var( --border-radius--small ); + border-bottom-right-radius: var( --border-radius--small ); +} + +.ui-corner-all { + border-radius: var( --border-radius--small ); +} + +.filled + .filled { border-color: var( --border-color-base ); } -#mwe-upwiz-stepdiv-details .mwe-upwiz-data { - width: auto; - max-width: 100%; +.mwe-upwiz-objref-pick-image { + font-weight: var( --font-weight-semibold ); } -/* - * resources/jquery.arrowSteps/jquery.arrowSteps.css - */ -.arrowSteps { - border-color: var( --border-color-base ); -} - -.arrowSteps li { - background-color: var( --color-surface-2 ); +.mwe-upwiz-objref-pick-image input:disabled + label { color: var( --color-base--subtle ); } -#mwe-upwiz-steps li.head { - background-color: var( --background-color-primary--hover ); - color: var( --color-primary ); +.mwe-upwiz-objref-notice-existing-image { + font-weight: var( --font-weight-semibold ); } -.arrowSteps li.arrow:after { - border-left-color: var( --color-surface-2 ); +@media ( max-width: @width-breakpoint-tablet ) { + #mwe-upwiz-stepdiv-details { + /* Single column in limited width */ + .mwe-upwiz-data, + .mwe-upwiz-thumbnail-side { + width: auto; + float: none; + } + } } -.arrowSteps li.arrow:before { - border-left-color: var( --color-surface-0 ); +/* uw.FieldLayout.less */ +.mwe-upwiz-fieldLayout { + .mwe-upwiz-fieldLayout-indicator { + color: var( --color-base--subtle ); + font-size: 0.8125rem; + } + + .mwe-upwiz-details-help { + font-size: 0.875rem; + } } -#mwe-upwiz-steps li.head:after { - border-left-color: var( --background-color-primary--hover ); +/* uw.SingleLanguageInputWidget.less */ +.mwe-upwiz-singleLanguageInputWidget { + display: flex; + flex-wrap: wrap; + border-color: transparent; + border-radius: var( --border-radius--medium ); + background-color: var( --color-surface-2 ); + gap: var( --space-xs ); + + .mwe-upwiz-singleLanguageInputWidget-language { + margin-right: 0; + } + + .mwe-upwiz-singleLanguageInputWidget-text { + padding-top: 0; + } +} + +/* uw.MetadataContent.less */ +.mwe-upwiz-metadata-content { + .mwe-upwiz-metadata-content-caption { + font-family: var( --font-family-base ); + font-weight: var( --font-weight-semibold ); + } +} + +.mwe-upwiz-metadata-pendingOverlay { + background-color: var( --background-color-overlay ); } diff --git a/skinStyles/extensions/UploadWizard/uploadWizard.noWizard.less b/skinStyles/extensions/UploadWizard/uploadWizard.noWizard.less index 330d55fa..d6ce7d44 100644 --- a/skinStyles/extensions/UploadWizard/uploadWizard.noWizard.less +++ b/skinStyles/extensions/UploadWizard/uploadWizard.noWizard.less @@ -1,12 +1,21 @@ /* - * Citizen - Upload Wizard - * https://starcitizen.tools - */ + * Citizen + * + * SkinStyles for Extension:UploadWizard + * Module: ext.uploadWizard.page.styles + * Version: REL1_39 9cd7a02 + * + * Date: 2023-01-08 +*/ -/* - * resources/uploadWizard.noWizard - */ -.mwe-first-spinner { - min-width: auto; - max-width: none; // handled by .mw-body-content +// Needed extra specificity +.skin-citizen { + .mwe-first-spinner { + min-width: auto; + max-width: none; + } + + .mw-spinner-container > div:after { + background: var( --color-primary ); + } } diff --git a/skinStyles/mediawiki/mediawiki.rcfilters.filters.ui.less b/skinStyles/mediawiki/mediawiki.rcfilters.filters.ui.less index bbb4698e..08661492 100644 --- a/skinStyles/mediawiki/mediawiki.rcfilters.filters.ui.less +++ b/skinStyles/mediawiki/mediawiki.rcfilters.filters.ui.less @@ -47,7 +47,7 @@ &-wrapper { &-content { &-title { - // Citizen label style + // Citizen label styles color: var( --color-base--subtle ); font-size: 0.8125rem; font-weight: var( --font-weight-normal ); @@ -147,7 +147,7 @@ background-color: var( --color-surface-1 ); // Sync with background &-header-title.oo-ui-labelElement-label { - // Citizen label style + // Citizen label styles color: var( --color-base--subtle ); font-size: 0.8125rem; font-weight: var( --font-weight-normal ); diff --git a/skinStyles/ooui/oojs-ui-widgets.less b/skinStyles/ooui/oojs-ui-widgets.less index bc2b30ed..207fc4de 100644 --- a/skinStyles/ooui/oojs-ui-widgets.less +++ b/skinStyles/ooui/oojs-ui-widgets.less @@ -237,6 +237,14 @@ border-radius: var( --border-radius--small ); } +.oo-ui-tagMultiselectWidget-handle .oo-ui-tagMultiselectWidget-group > input { + color: var( --color-base--emphasized ); +} + +.oo-ui-tagMultiselectWidget-handle .oo-ui-tagMultiselectWidget-group > input::placeholder { + color: var( --color-base--subtle ); +} + .oo-ui-tagMultiselectWidget-handle > .oo-ui-tagMultiselectWidget-content > input { color: var( --color-base--emphasized ); } From 1e47e95a8dd5d7169a0d0701257da78fed1a0758 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Mon, 9 Jan 2023 16:24:28 -0500 Subject: [PATCH 025/124] =?UTF-8?q?fix(search):=20=F0=9F=90=9B=20more=20ro?= =?UTF-8?q?bust=20null=20check=20for=20description?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/skins.citizen.search/gateway/mwActionApi.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/resources/skins.citizen.search/gateway/mwActionApi.js b/resources/skins.citizen.search/gateway/mwActionApi.js index a8d8b920..a95b7296 100644 --- a/resources/skins.citizen.search/gateway/mwActionApi.js +++ b/resources/skins.citizen.search/gateway/mwActionApi.js @@ -75,8 +75,13 @@ function convertDataToResults( data ) { case 'textextracts': return item.extract || ''; case 'pagedescription': - /* eslint-disable-next-line es-x/no-symbol-prototype-description */ - return item.pageprops.description.slice( 0, 60 ) + '...' || ''; + /* eslint-disable es-x/no-symbol-prototype-description */ + if ( item.pageprops && item.pageprops.description ) { + return item.pageprops.description.slice( 0, 60 ) + '...'; + /* eslint-enable es-x/no-symbol-prototype-description */ + } else { + return ''; + } } }; From ed36d72482b9df327df5be6430a473373ff73701 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Mon, 9 Jan 2023 18:38:09 -0500 Subject: [PATCH 026/124] =?UTF-8?q?feat(TwoColConflict):=20=E2=9C=A8=20add?= =?UTF-8?q?=20TwoColConflict=20skinStyles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + skin.json | 2 + .../ext.TwoColConflict.SplitCss.less | 155 ++++++++++++++++++ .../ext.TwoColConflict.SplitJs.less | 34 ++++ 4 files changed, 192 insertions(+) create mode 100644 skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitCss.less create mode 100644 skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitJs.less diff --git a/README.md b/README.md index 17c79a41..67fc95da 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,7 @@ Name | Grade | Version | Last updated [TabberNeue](https://www.mediawiki.org/wiki/Extension:TabberNeue) | A | 1.3.1 `656f396` | 2022-10-23 [TimedMediaHandler](https://www.mediawiki.org/wiki/Extension:TimedMediaHandler) | B | N/A | N/A [Translate](https://www.mediawiki.org/wiki/Extension:Translate) | B | MLEB 2021.07 | 2021-07-29 +[TwoColConflict](https://www.mediawiki.org/wiki/Extension:TwoColConflict) | B | REL1_39 5a2a947 | 2023-01-09 [UniversalLanguageSelector](https://www.mediawiki.org/wiki/Extension:UniversalLanguageSelector) | B | MLEB 2021.12 | 2022-05-17 [UploadWizard](https://www.mediawiki.org/wiki/Extension:UploadWizard) | A | REL1_39 `9cd7a02` | 2023-01-08 [VisualEditor](https://www.mediawiki.org/wiki/Extension:VisualEditor) | A | REL1_35 `cc3466a` | 2021-08-04 diff --git a/skin.json b/skin.json index db216951..62de6afd 100644 --- a/skin.json +++ b/skin.json @@ -411,6 +411,8 @@ "+ext.translate.statsbar": "skinStyles/extensions/Translate/ext.translate.statsbar.less", "+ext.translate.statstable": "skinStyles/extensions/Translate/ext.translate.statstable.less", "+ext.translate.tag.languages": "skinStyles/extensions/Translate/ext.translate.tag.languages.less", + "+ext.TwoColConflict.SplitJs": "skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitJs.less", + "+ext.TwoColConflict.SplitCss": "skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitCss.less", "+ext.uls.common": "skinStyles/extensions/UniversalLanguageSelector/ext.uls.common.less", "+ext.uls.compactlinks": "skinStyles/extensions/UniversalLanguageSelector/ext.uls.compactlinks.less", "+ext.uls.displaysettings": "skinStyles/extensions/UniversalLanguageSelector/ext.uls.displaysettings.less", diff --git a/skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitCss.less b/skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitCss.less new file mode 100644 index 00000000..b52db3d3 --- /dev/null +++ b/skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitCss.less @@ -0,0 +1,155 @@ +/* + * Citizen + * + * SkinStyles for Extension:TwoColConflict + * Module: ext.TwoColConflict.SplitCss + * Version: REL1_39 5a2a947 + * + * Date: 2023-01-09 +*/ + +/* ext.TwoColConflict.Split.less */ +.mw-twocolconflict-special-your-version-header, +.mw-twocolconflict-split-current-version-header, +.mw-twocolconflict-split-your-version-header { + .mw-twocolconflict-revision-label { + padding: 0 5px; + font-weight: var( --font-weight-semibold ); + } +} + +.mw-twocolconflict-split-current-version-header .mw-twocolconflict-revision-label { + background-color: var( --background-color-warning ); +} + +.mw-twocolconflict-special-your-version-header .mw-twocolconflict-revision-label, +.mw-twocolconflict-split-your-version-header .mw-twocolconflict-revision-label { + background-color: var( --background-color-primary--hover ); +} + +.mw-twocolconflict-split-row { + &.mw-twocolconflict-no-selection { + border-color: transparent; + background-color: var( --background-color-destructive ); + } +} + +.mw-twocolconflict-single-column, +.mw-twocolconflict-split-column { + background-color: var( --color-surface-0 ); + color: var( --color-base--emphasized ); + + &.mw-twocolconflict-split-add { + border-color: var( --background-color-primary--hover ); + } + + &.mw-twocolconflict-split-delete { + border-color: var( --background-color-warning ); + } + + &.mw-twocolconflict-split-copy { + border-color: var( --color-surface-2 ); + background-color: var( --color-surface-2 ); + } + + ins.mw-twocolconflict-diffchange { + background-color: var( --background-color-primary--hover ); + } + + del.mw-twocolconflict-diffchange { + background-color: var( --background-color-warning ); + } + + &.mw-twocolconflict-split-unselected { + color: var( --color-base--subtle ); + + &.mw-twocolconflict-split-add { + border-color: var( --background-color-primary--hover ); + } + + &.mw-twocolconflict-split-delete { + border-color: var( --background-color-warning ); + } + + ins.mw-twocolconflict-diffchange { + background-color: var( --background-color-primary--hover ); + } + + del.mw-twocolconflict-diffchange { + background-color: var( --background-color-warning ); + } + } + + .mw-twocolconflict-split-collapsed { + .mw-twocolconflict-split-fade { + background-image: linear-gradient( transparent, var( --color-surface-2 ) ); + } + } +} + +.mw-twocolconflict-split-selector-label { + .mw-twocolconflict-no-selection & { + color: var( --color-destructive ); + } +} + +.mw-twocolconflict-split-selection { + .mw-twocolconflict-split-row.mw-twocolconflict-no-selection & > div { + .oo-ui-radioInputWidget [ type='radio' ] + span { + border-color: var( --color-destructive ); + } + } + + > div:nth-child( 1 ) { + .oo-ui-radioInputWidget.oo-ui-widget-enabled [ type='radio' ]:checked + span, + .oo-ui-radioInputWidget.oo-ui-widget-enabled [ type='radio' ]:active + span, + .oo-ui-radioInputWidget [ type='radio' ] + span { + border-color: var( --color-warning ); + background: var( --background-color-warning ); + } + } + + > div:nth-child( 2 ) { + .oo-ui-radioInputWidget.oo-ui-widget-enabled [ type='radio' ]:checked + span, + .oo-ui-radioInputWidget.oo-ui-widget-enabled [ type='radio' ]:active + span, + .oo-ui-radioInputWidget [ type='radio' ] + span { + border-color: var( --color-primary ); + background: var( --background-color-primary--hover ); + } + } +} + +.mw-twocolconflict-copy-notice { + p { + font-size: 0.875em; + } +} + +/* ext.TwoColConflict.Talk.styles.less */ +.mw-twocolconflict-single-row { + margin: 16px 0; + + &:first-of-type { + margin: 32px 0 16px 0; + } + + &:last-of-type { + margin: 16px 0 32px 0; + } +} + +.mw-twocolconflict-conflicting-talk-row { + .mw-twocolconflict-conflicting-talk-label { + span { + font-weight: var( --font-weight-semibold ); + + .mw-twocolconflict-split-delete { + background-color: var( --background-color-warning ); + } + + .mw-twocolconflict-split-add { + background-color: var( --background-color-primary--hover ); + } + } + } +} diff --git a/skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitJs.less b/skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitJs.less new file mode 100644 index 00000000..e43e0cd6 --- /dev/null +++ b/skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitJs.less @@ -0,0 +1,34 @@ +/* + * Citizen + * + * SkinStyles for Extension:TwoColConflict + * Module: ext.TwoColConflict.SplitJs + * Version: REL1_39 5a2a947 + * + * Date: 2023-01-09 +*/ + +.mw-twocolconflict-split-tour-intro-container, +.mw-twocolconflict-split-tour-popup { + p { + line-height: var( --line-height ); + } +} + +.mw-twocolconflict-split-tour-popup { + color: var( --color-base--emphasized ); +} + +.mw-twocolconflict-split-tour-help-button { + font-size: 1rem; +} + +.mw-twocolconflict-split-tour-help-button-single-column-view { + font-size: 0.8125rem; +} + +.mw-twocolconflict-split-tour-intro-container-blue-dot-hint { + p { + font-weight: var( --font-weight-semibold ); + } +} From a021815757da010ced8acc1f7805469c8303aced Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Mon, 9 Jan 2023 18:38:56 -0500 Subject: [PATCH 027/124] =?UTF-8?q?refactor(TwoColConflict):=20=E2=99=BB?= =?UTF-8?q?=EF=B8=8F=20remove=20unused=20styles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TwoColConflict/ext.TwoColConflict.SplitCss.less | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitCss.less b/skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitCss.less index b52db3d3..61f57af8 100644 --- a/skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitCss.less +++ b/skinStyles/extensions/TwoColConflict/ext.TwoColConflict.SplitCss.less @@ -126,18 +126,6 @@ } /* ext.TwoColConflict.Talk.styles.less */ -.mw-twocolconflict-single-row { - margin: 16px 0; - - &:first-of-type { - margin: 32px 0 16px 0; - } - - &:last-of-type { - margin: 16px 0 32px 0; - } -} - .mw-twocolconflict-conflicting-talk-row { .mw-twocolconflict-conflicting-talk-label { span { From 8704cc2d91e40417f8f80de96a712d6aab27588e Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Mon, 9 Jan 2023 18:47:25 -0500 Subject: [PATCH 028/124] =?UTF-8?q?feat(core):=20=E2=9C=A8=20add=20file=20?= =?UTF-8?q?metadata=20table=20styles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mediawiki.action.view.filepage.less | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/skinStyles/mediawiki/action/mediawiki.action.view.filepage.less b/skinStyles/mediawiki/action/mediawiki.action.view.filepage.less index 1be58f9a..3600720b 100644 --- a/skinStyles/mediawiki/action/mediawiki.action.view.filepage.less +++ b/skinStyles/mediawiki/action/mediawiki.action.view.filepage.less @@ -125,3 +125,36 @@ .fullMedia { font-size: 0.875rem; } + +.mw_metadata { + margin: 0; + font-size: 0.8125rem; +} + +.mw_metadata caption { + color: var( --color-base--emphasized ); + font-weight: var( --font-weight-semibold ); +} + +.mw_metadata tr + tr { + border-top: 1px solid var( --border-color-base ); +} + +.mw_metadata td, +.mw_metadata th { + padding: var( --space-xs ); + border: 0; +} + +// Citizen label styles +.mw_metadata th { + background-color: transparent; + color: var( --color-base--subtle ); + font-weight: var( --font-weight-normal ); + letter-spacing: 0.05em; + text-align: start; +} + +.mw_metadata td { + background-color: transparent; +} From df7346c937b4a4d80f7f91e42f0fb18269fe5356 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Mon, 9 Jan 2023 18:55:55 -0500 Subject: [PATCH 029/124] fix(Cargo): restore table to default behavior That behavior will be the same as how we handle other tables as well --- skinStyles/extensions/Cargo/ext.cargo.datatables.less | 2 -- 1 file changed, 2 deletions(-) diff --git a/skinStyles/extensions/Cargo/ext.cargo.datatables.less b/skinStyles/extensions/Cargo/ext.cargo.datatables.less index d79a4f3b..ceda7571 100644 --- a/skinStyles/extensions/Cargo/ext.cargo.datatables.less +++ b/skinStyles/extensions/Cargo/ext.cargo.datatables.less @@ -10,8 +10,6 @@ /* jquery.dataTables.css */ table.dataTable { - /* FIXME: Better handling of responsive table */ - display: block; overflow: auto; max-width: 100%; font-size: 0.875rem; From b7fc5502d3a0438e5242f234e9b1f74ef518be54 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Tue, 10 Jan 2023 15:14:28 -0500 Subject: [PATCH 030/124] =?UTF-8?q?docs(readme):=20=F0=9F=93=9A=EF=B8=8F?= =?UTF-8?q?=20remove=20duplicated=20config=20flag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index 67fc95da..d21fe94e 100644 --- a/README.md +++ b/README.md @@ -126,11 +126,6 @@ Name | Description | Values | Default `$wgCitizenManifestThemeColor` | [Theme color](https://developer.mozilla.org/en-US/docs/Web/Manifest/theme_color) of the web app manifest | Hex color code | `#131a21` `$wgCitizenManifestBackgroundColor` | [Background color](https://developer.mozilla.org/en-US/docs/Web/Manifest/background_color) of the web app manifest | Hex color code | `#131a21` -### Miscellaneous -Name | Description | Values | Default -:--- | :--- | :--- | :--- -`$wgCitizenThemeColor` | The color defined in the `theme-color` meta tag | Hex color code | `#11151d` - ## Requirements * [MediaWiki](https://www.mediawiki.org) 1.39.0 or later * For the legacy versions, check the other release branches. From 77ed808acdddac46534672b0f1e5462c149e4f12 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 12 Jan 2023 13:11:47 +0100 Subject: [PATCH 031/124] Localisation updates from https://translatewiki.net. --- i18n/ia.json | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 i18n/ia.json diff --git a/i18n/ia.json b/i18n/ia.json new file mode 100644 index 00000000..2bee480a --- /dev/null +++ b/i18n/ia.json @@ -0,0 +1,45 @@ +{ + "@metadata": { + "authors": [ + "McDutchie" + ] + }, + "citizen-skin-desc": "Un apparentia de MediaWiki belle, usabile e responsive que face extensiones parte del experientia cohesive. Initialmente create pro le [https://starcitizen.tools/ wiki Star Citizen].", + "citizen-prefs-talkpage": "[[mw:Skin_talk:Citizen|Discussion]]", + "citizen-drawer-toggle": "Alternar menu", + "citizen-usermenu-toggle": "Alternar menu personal", + "citizen-search-toggle": "Alternar recerca", + "citizen-languages-toggle": "Plus linguas", + "citizen-actions-more-toggle": "Plus actiones", + "citizen-sitestats-articles-label": "articulos", + "citizen-sitestats-images-label": "files", + "citizen-sitestats-users-label": "usatores", + "citizen-sitestats-edits-label": "modificationes", + "citizen-page-info-copyright": "Derectos de autor", + "citizen-page-info-credits": "Creditos", + "citizen-page-info-lastmod": "Ultime modification", + "citizen-footer-desc": "Modificar iste texto sur [[MediaWiki:Citizen-footer-desc]]", + "citizen-footer-tagline": "Modificar iste texto sur [[MediaWiki:Citizen-footer-tagline]]", + "citizen-action-addsection": "Adder topico", + "citizen-jumptotop": "Retro al initio", + "citizen-search-fulltext": "Cercar paginas que contine $1", + "citizen-search-mediasearch": "Cercar multimedia concernente $1", + "citizen-search-empty-desc": "Digita pro comenciar a cercar", + "citizen-search-noresults-title": "Oh oh! Necun resultato pro $1", + "citizen-search-noresults-desc": "Essayar forsan le optiones hic infra?", + "citizen-tagline-ns-talk": "Pagina de discussion de {{SUBJECTPAGENAME}}", + "citizen-tagline-ns-project": "Informationes sur {{SITENAME}}", + "citizen-tagline-ns-file": "File sur {{SITENAME}}", + "citizen-tagline-ns-mediawiki": "Pagina de interfacie MediaWiki", + "citizen-tagline-ns-template": "Pagina de patrono", + "citizen-tagline-ns-help": "Pagina de adjuta", + "citizen-tagline-ns-category": "Pagina de categoria", + "prefs-citizen-theme-label": "Thema", + "prefs-citizen-theme-option-auto": "Automatic", + "prefs-citizen-theme-option-light": "Clar", + "prefs-citizen-theme-option-dark": "Obscur", + "prefs-citizen-fontsize-label": "Dimension del litteras", + "prefs-citizen-pagewidth-label": "Latitude del pagina", + "prefs-citizen-lineheight-label": "Altitude de lineas", + "prefs-citizen-resetbutton-label": "Reinitialisar al predefinition" +} From 4c1ec61622294222357bdd8c079a195cca0ea268 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Thu, 12 Jan 2023 15:52:33 -0500 Subject: [PATCH 032/124] =?UTF-8?q?fix(core):=20=F0=9F=90=9B=20incorrect?= =?UTF-8?q?=20layout=20when=20signupstart=20is=20present?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...awiki.special.userlogin.signup.styles.less | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/skinStyles/mediawiki/special/mediawiki.special.userlogin.signup.styles.less b/skinStyles/mediawiki/special/mediawiki.special.userlogin.signup.styles.less index 39a53fe8..223e17a0 100644 --- a/skinStyles/mediawiki/special/mediawiki.special.userlogin.signup.styles.less +++ b/skinStyles/mediawiki/special/mediawiki.special.userlogin.signup.styles.less @@ -11,17 +11,30 @@ @import '../../resources/variables.less'; .mw-ui-container { - display: flex; - // Show benefits first - flex-direction: column-reverse; + display: grid; + gap: var( --space-md ); + grid-template-areas: 'message' + 'stats' + 'form'; // No need for float clear since we are using flex &:after { content: none; } + + #signupstart { + grid-area: message; + } + + #userloginForm { + margin-right: 0; + grid-area: form; + } } .mw-createacct-benefits { + grid-area: stats; + &-container { padding-bottom: var( --space-lg ); border-bottom: 1px solid var( --border-color-base ); @@ -65,13 +78,10 @@ } } -.mw-ui-container #userloginForm { - margin-right: 0; -} - @media ( min-width: @width-breakpoint-tablet ) { .mw-ui-container { - flex-direction: row; + grid-template-areas: 'message message' + 'form stats'; } .mw-createacct-benefits { @@ -81,7 +91,6 @@ padding-left: var( --space-xxl ); border-bottom: 0; border-left: 1px solid var( --border-color-base ); - margin-left: var( --space-xxl ); h2 { max-width: 20rem; From 5023f2aa646cb1bf639bb0163f1f35dccd191d6f Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Thu, 12 Jan 2023 15:58:40 -0500 Subject: [PATCH 033/124] =?UTF-8?q?feat(toc):=20=E2=9C=A8=20add=20bottom?= =?UTF-8?q?=20margin=20to=20sticky=20toc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/skins.citizen.styles/TableOfContents.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/skins.citizen.styles/TableOfContents.less b/resources/skins.citizen.styles/TableOfContents.less index 31db782e..5f8a958f 100644 --- a/resources/skins.citizen.styles/TableOfContents.less +++ b/resources/skins.citizen.styles/TableOfContents.less @@ -235,7 +235,7 @@ --toc-margin-top: var( --space-xs ); position: sticky; top: var( --toc-margin-top ); - max-height: ~'calc( 100vh - var( --toc-margin-top ) )'; + max-height: ~'calc( 100vh - var( --toc-margin-top ) - var( --space-md ) )'; overflow-y: auto; overscroll-behavior: contain; } From f3de051635cd2e3486f6648cec96e929f293197e Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Thu, 12 Jan 2023 16:43:20 -0500 Subject: [PATCH 034/124] =?UTF-8?q?chore(release):=20=F0=9F=9A=80=202.3.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 20 ++++++++++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- skin.json | 2 +- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bef1d1a7..6ffbaa10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,26 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [2.3.2](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/compare/v2.3.1...v2.3.2) (2023-01-12) + + +### Features + +* **core:** ✨ add file metadata table styles ([8704cc2](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/8704cc2d91e40417f8f80de96a712d6aab27588e)) +* **core:** ✨ add toolbox icon for CreateRedirect ([aeed04b](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/aeed04b86013e1870830f42fbae54737bbb7fa04)) +* **toc:** ✨ add bottom margin to sticky toc ([5023f2a](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/5023f2aa646cb1bf639bb0163f1f35dccd191d6f)) +* **TwoColConflict:** ✨ add TwoColConflict skinStyles ([ed36d72](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/ed36d72482b9df327df5be6430a473373ff73701)) +* **UploadWizard:** ✨ update UploadWizard styles ([7bd30eb](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/7bd30ebecba8a88de902c9366bf44f75f1bf3a9b)) + + +### Bug Fixes + +* **Cargo:** restore table to default behavior ([df7346c](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/df7346c937b4a4d80f7f91e42f0fb18269fe5356)) +* **codex:** 🐛 incorrect Codex file name ([b7996c5](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/b7996c5952a6a54eae8b3d2288317b599a60360c)) +* **core:** 🐛 incorrect layout when signupstart is present ([4c1ec61](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/4c1ec61622294222357bdd8c079a195cca0ea268)) +* **search:** 🐛 incorrect keyboard navigation on typeahead items ([242413b](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/242413bf4aa7d851bda2f8b4a4f66a9f60791cfc)) +* **search:** 🐛 more robust null check for description ([1e47e95](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/1e47e95a8dd5d7169a0d0701257da78fed1a0758)) + ### [2.3.1](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/compare/v2.3.0...v2.3.1) (2023-01-05) diff --git a/package-lock.json b/package-lock.json index 9786ad87..39829fef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "mediawiki-skins-Citizen", - "version": "2.3.1", + "version": "2.3.2", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "2.3.1", + "version": "2.3.2", "devDependencies": { "@commitlint/cli": "^17.4.0", "@commitlint/config-conventional": "^17.4.0", diff --git a/package.json b/package.json index 4006b3ad..ec5bb3b8 100644 --- a/package.json +++ b/package.json @@ -30,5 +30,5 @@ "stylelint-config-wikimedia": "0.13.1", "svgo": "3.0.2" }, - "version": "2.3.1" + "version": "2.3.2" } diff --git a/skin.json b/skin.json index 62de6afd..ddf5604f 100644 --- a/skin.json +++ b/skin.json @@ -1,6 +1,6 @@ { "name": "Citizen", - "version": "2.3.1", + "version": "2.3.2", "author": [ "[https://www.mediawiki.org/wiki/User:Alistair3149 Alistair3149]", "[https://www.mediawiki.org/wiki/User:Octfx Octfx]", From a5a979dbebf7490ee2ed5f7e6fb1916ef0be2f34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Jan 2023 08:42:54 -0500 Subject: [PATCH 035/124] chore(deps-dev): bump @commitlint/cli from 17.4.0 to 17.4.2 (#568) Bumps [@commitlint/cli](https://github.com/conventional-changelog/commitlint/tree/HEAD/@commitlint/cli) from 17.4.0 to 17.4.2. - [Release notes](https://github.com/conventional-changelog/commitlint/releases) - [Changelog](https://github.com/conventional-changelog/commitlint/blob/master/@commitlint/cli/CHANGELOG.md) - [Commits](https://github.com/conventional-changelog/commitlint/commits/v17.4.2/@commitlint/cli) --- updated-dependencies: - dependency-name: "@commitlint/cli" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 134 +++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 68 insertions(+), 68 deletions(-) diff --git a/package-lock.json b/package-lock.json index 39829fef..ad7a15c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,7 @@ "": { "version": "2.3.2", "devDependencies": { - "@commitlint/cli": "^17.4.0", + "@commitlint/cli": "^17.4.2", "@commitlint/config-conventional": "^17.4.0", "devmoji": "^2.3.0", "eslint-config-wikimedia": "0.23.0", @@ -140,15 +140,15 @@ } }, "node_modules/@commitlint/cli": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-17.4.0.tgz", - "integrity": "sha512-SEY4sYe8yVlgxPP7X0wJb96DBAGBPsCsy6QbqJt/UECbIAjDeDV5xXBV4jnS7T/qMC10sk6Ub9kDhEX0VWvblw==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-17.4.2.tgz", + "integrity": "sha512-0rPGJ2O1owhpxMIXL9YJ2CgPkdrFLKZElIZHXDN8L8+qWK1DGH7Q7IelBT1pchXTYTuDlqkOTdh//aTvT3bSUA==", "dev": true, "dependencies": { "@commitlint/format": "^17.4.0", - "@commitlint/lint": "^17.4.0", - "@commitlint/load": "^17.4.0", - "@commitlint/read": "^17.4.0", + "@commitlint/lint": "^17.4.2", + "@commitlint/load": "^17.4.2", + "@commitlint/read": "^17.4.2", "@commitlint/types": "^17.4.0", "execa": "^5.0.0", "lodash.isfunction": "^3.0.9", @@ -264,9 +264,9 @@ } }, "node_modules/@commitlint/is-ignored": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-17.4.0.tgz", - "integrity": "sha512-mkRuBlPUaBimvSvJyIHEHEW1/jP1SqEI7NOoaO9/eyJkMbsaiv5b1QgDYL4ZXlHdS64RMV7Y21MVVzuIceImDA==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-17.4.2.tgz", + "integrity": "sha512-1b2Y2qJ6n7bHG9K6h8S4lBGUl6kc7mMhJN9gy1SQfUZqe92ToDjUTtgNWb6LbzR1X8Cq4SEus4VU8Z/riEa94Q==", "dev": true, "dependencies": { "@commitlint/types": "^17.4.0", @@ -292,14 +292,14 @@ } }, "node_modules/@commitlint/lint": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-17.4.0.tgz", - "integrity": "sha512-HG2YT4TUbQKs9v8QvpQjJ6OK+fhflsDB8M+D5tLrY79hbQOWA9mDKdRkABsW/AAhpNI9+zeGUWF3jj245jSHKw==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-17.4.2.tgz", + "integrity": "sha512-HcymabrdBhsDMNzIv146+ZPNBPBK5gMNsVH+el2lCagnYgCi/4ixrHooeVyS64Fgce2K26+MC7OQ4vVH8wQWVw==", "dev": true, "dependencies": { - "@commitlint/is-ignored": "^17.4.0", - "@commitlint/parse": "^17.4.0", - "@commitlint/rules": "^17.4.0", + "@commitlint/is-ignored": "^17.4.2", + "@commitlint/parse": "^17.4.2", + "@commitlint/rules": "^17.4.2", "@commitlint/types": "^17.4.0" }, "engines": { @@ -307,15 +307,16 @@ } }, "node_modules/@commitlint/load": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-17.4.0.tgz", - "integrity": "sha512-wDKNvAJqukqZqKmhRlf3KNo/12QGo1AQcd80EbV01SxtGvyHOsJ/g+/IbrZpopZv8rvzmEVktcpfDYH6ITepFA==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-17.4.2.tgz", + "integrity": "sha512-Si++F85rJ9t4hw6JcOw1i2h0fdpdFQt0YKwjuK4bk9KhFjyFkRxvR3SB2dPaMs+EwWlDrDBGL+ygip1QD6gmPw==", "dev": true, "dependencies": { "@commitlint/config-validator": "^17.4.0", "@commitlint/execute-rule": "^17.4.0", "@commitlint/resolve-extends": "^17.4.0", "@commitlint/types": "^17.4.0", + "@types/node": "*", "chalk": "^4.1.0", "cosmiconfig": "^8.0.0", "cosmiconfig-typescript-loader": "^4.0.0", @@ -346,18 +347,18 @@ } }, "node_modules/@commitlint/message": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-17.4.0.tgz", - "integrity": "sha512-USGJDU9PPxcgQjKXCzvPUal65KAhxWq3hp+MrU1pNCN2itWM654CLIoY2LMIQ7rScTli9B5dTLH3vXhzbItmzA==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-17.4.2.tgz", + "integrity": "sha512-3XMNbzB+3bhKA1hSAWPCQA3lNxR4zaeQAQcHj0Hx5sVdO6ryXtgUBGGv+1ZCLMgAPRixuc6en+iNAzZ4NzAa8Q==", "dev": true, "engines": { "node": ">=v14" } }, "node_modules/@commitlint/parse": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-17.4.0.tgz", - "integrity": "sha512-x8opKc5p+Hgs+CrMbq3VAnW2L2foPAX6arW8u9c8nTzksldGgFsENT+XVyPmpSMLlVBswZ1tndcz1xyKiY9TJA==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-17.4.2.tgz", + "integrity": "sha512-DK4EwqhxfXpyCA+UH8TBRIAXAfmmX4q9QRBz/2h9F9sI91yt6mltTrL6TKURMcjUVmgaB80wgS9QybNIyVBIJA==", "dev": true, "dependencies": { "@commitlint/types": "^17.4.0", @@ -369,9 +370,9 @@ } }, "node_modules/@commitlint/read": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-17.4.0.tgz", - "integrity": "sha512-pGDeZpbkyvhxK8ZoCDUacPPRpauKPWF3n2XpDBEnuGreqUF2clq2PVJpwMMaNN5cHW8iFKCbcoOjXhD01sln0A==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-17.4.2.tgz", + "integrity": "sha512-hasYOdbhEg+W4hi0InmXHxtD/1favB4WdwyFxs1eOy/DvMw6+2IZBmATgGOlqhahsypk4kChhxjAFJAZ2F+JBg==", "dev": true, "dependencies": { "@commitlint/top-level": "^17.4.0", @@ -402,13 +403,13 @@ } }, "node_modules/@commitlint/rules": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-17.4.0.tgz", - "integrity": "sha512-lz3i1jet2NNjTWpAMwjjQjMZCPWBIHK1Kkja9o09UmUtMjRdALTb8uMLe8gCyeq3DiiZ5lLYOhbsoPK56xGQKA==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-17.4.2.tgz", + "integrity": "sha512-OGrPsMb9Fx3/bZ64/EzJehY9YDSGWzp81Pj+zJiY+r/NSgJI3nUYdlS37jykNIugzazdEXfMtQ10kmA+Kx2pZQ==", "dev": true, "dependencies": { "@commitlint/ensure": "^17.4.0", - "@commitlint/message": "^17.4.0", + "@commitlint/message": "^17.4.2", "@commitlint/to-lines": "^17.4.0", "@commitlint/types": "^17.4.0", "execa": "^5.0.0" @@ -674,8 +675,7 @@ "version": "18.11.18", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@types/normalize-package-data": { "version": "2.4.1", @@ -6132,15 +6132,15 @@ "dev": true }, "@commitlint/cli": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-17.4.0.tgz", - "integrity": "sha512-SEY4sYe8yVlgxPP7X0wJb96DBAGBPsCsy6QbqJt/UECbIAjDeDV5xXBV4jnS7T/qMC10sk6Ub9kDhEX0VWvblw==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-17.4.2.tgz", + "integrity": "sha512-0rPGJ2O1owhpxMIXL9YJ2CgPkdrFLKZElIZHXDN8L8+qWK1DGH7Q7IelBT1pchXTYTuDlqkOTdh//aTvT3bSUA==", "dev": true, "requires": { "@commitlint/format": "^17.4.0", - "@commitlint/lint": "^17.4.0", - "@commitlint/load": "^17.4.0", - "@commitlint/read": "^17.4.0", + "@commitlint/lint": "^17.4.2", + "@commitlint/load": "^17.4.2", + "@commitlint/read": "^17.4.2", "@commitlint/types": "^17.4.0", "execa": "^5.0.0", "lodash.isfunction": "^3.0.9", @@ -6232,9 +6232,9 @@ } }, "@commitlint/is-ignored": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-17.4.0.tgz", - "integrity": "sha512-mkRuBlPUaBimvSvJyIHEHEW1/jP1SqEI7NOoaO9/eyJkMbsaiv5b1QgDYL4ZXlHdS64RMV7Y21MVVzuIceImDA==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-17.4.2.tgz", + "integrity": "sha512-1b2Y2qJ6n7bHG9K6h8S4lBGUl6kc7mMhJN9gy1SQfUZqe92ToDjUTtgNWb6LbzR1X8Cq4SEus4VU8Z/riEa94Q==", "dev": true, "requires": { "@commitlint/types": "^17.4.0", @@ -6253,27 +6253,28 @@ } }, "@commitlint/lint": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-17.4.0.tgz", - "integrity": "sha512-HG2YT4TUbQKs9v8QvpQjJ6OK+fhflsDB8M+D5tLrY79hbQOWA9mDKdRkABsW/AAhpNI9+zeGUWF3jj245jSHKw==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-17.4.2.tgz", + "integrity": "sha512-HcymabrdBhsDMNzIv146+ZPNBPBK5gMNsVH+el2lCagnYgCi/4ixrHooeVyS64Fgce2K26+MC7OQ4vVH8wQWVw==", "dev": true, "requires": { - "@commitlint/is-ignored": "^17.4.0", - "@commitlint/parse": "^17.4.0", - "@commitlint/rules": "^17.4.0", + "@commitlint/is-ignored": "^17.4.2", + "@commitlint/parse": "^17.4.2", + "@commitlint/rules": "^17.4.2", "@commitlint/types": "^17.4.0" } }, "@commitlint/load": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-17.4.0.tgz", - "integrity": "sha512-wDKNvAJqukqZqKmhRlf3KNo/12QGo1AQcd80EbV01SxtGvyHOsJ/g+/IbrZpopZv8rvzmEVktcpfDYH6ITepFA==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-17.4.2.tgz", + "integrity": "sha512-Si++F85rJ9t4hw6JcOw1i2h0fdpdFQt0YKwjuK4bk9KhFjyFkRxvR3SB2dPaMs+EwWlDrDBGL+ygip1QD6gmPw==", "dev": true, "requires": { "@commitlint/config-validator": "^17.4.0", "@commitlint/execute-rule": "^17.4.0", "@commitlint/resolve-extends": "^17.4.0", "@commitlint/types": "^17.4.0", + "@types/node": "*", "chalk": "^4.1.0", "cosmiconfig": "^8.0.0", "cosmiconfig-typescript-loader": "^4.0.0", @@ -6300,15 +6301,15 @@ } }, "@commitlint/message": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-17.4.0.tgz", - "integrity": "sha512-USGJDU9PPxcgQjKXCzvPUal65KAhxWq3hp+MrU1pNCN2itWM654CLIoY2LMIQ7rScTli9B5dTLH3vXhzbItmzA==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-17.4.2.tgz", + "integrity": "sha512-3XMNbzB+3bhKA1hSAWPCQA3lNxR4zaeQAQcHj0Hx5sVdO6ryXtgUBGGv+1ZCLMgAPRixuc6en+iNAzZ4NzAa8Q==", "dev": true }, "@commitlint/parse": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-17.4.0.tgz", - "integrity": "sha512-x8opKc5p+Hgs+CrMbq3VAnW2L2foPAX6arW8u9c8nTzksldGgFsENT+XVyPmpSMLlVBswZ1tndcz1xyKiY9TJA==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-17.4.2.tgz", + "integrity": "sha512-DK4EwqhxfXpyCA+UH8TBRIAXAfmmX4q9QRBz/2h9F9sI91yt6mltTrL6TKURMcjUVmgaB80wgS9QybNIyVBIJA==", "dev": true, "requires": { "@commitlint/types": "^17.4.0", @@ -6317,9 +6318,9 @@ } }, "@commitlint/read": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-17.4.0.tgz", - "integrity": "sha512-pGDeZpbkyvhxK8ZoCDUacPPRpauKPWF3n2XpDBEnuGreqUF2clq2PVJpwMMaNN5cHW8iFKCbcoOjXhD01sln0A==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-17.4.2.tgz", + "integrity": "sha512-hasYOdbhEg+W4hi0InmXHxtD/1favB4WdwyFxs1eOy/DvMw6+2IZBmATgGOlqhahsypk4kChhxjAFJAZ2F+JBg==", "dev": true, "requires": { "@commitlint/top-level": "^17.4.0", @@ -6344,13 +6345,13 @@ } }, "@commitlint/rules": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-17.4.0.tgz", - "integrity": "sha512-lz3i1jet2NNjTWpAMwjjQjMZCPWBIHK1Kkja9o09UmUtMjRdALTb8uMLe8gCyeq3DiiZ5lLYOhbsoPK56xGQKA==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-17.4.2.tgz", + "integrity": "sha512-OGrPsMb9Fx3/bZ64/EzJehY9YDSGWzp81Pj+zJiY+r/NSgJI3nUYdlS37jykNIugzazdEXfMtQ10kmA+Kx2pZQ==", "dev": true, "requires": { "@commitlint/ensure": "^17.4.0", - "@commitlint/message": "^17.4.0", + "@commitlint/message": "^17.4.2", "@commitlint/to-lines": "^17.4.0", "@commitlint/types": "^17.4.0", "execa": "^5.0.0" @@ -6571,8 +6572,7 @@ "version": "18.11.18", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==", - "dev": true, - "peer": true + "dev": true }, "@types/normalize-package-data": { "version": "2.4.1", diff --git a/package.json b/package.json index ec5bb3b8..dae04ee8 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "release:major": "standard-version --release-as major" }, "devDependencies": { - "@commitlint/cli": "^17.4.0", + "@commitlint/cli": "^17.4.2", "@commitlint/config-conventional": "^17.4.0", "devmoji": "^2.3.0", "eslint-config-wikimedia": "0.23.0", From c98e87a92c19ad3955b651e9b9e246489c910574 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Jan 2023 08:56:01 -0500 Subject: [PATCH 036/124] chore(deps-dev): bump @commitlint/config-conventional (#569) Bumps [@commitlint/config-conventional](https://github.com/conventional-changelog/commitlint/tree/HEAD/@commitlint/config-conventional) from 17.4.0 to 17.4.2. - [Release notes](https://github.com/conventional-changelog/commitlint/releases) - [Changelog](https://github.com/conventional-changelog/commitlint/blob/master/@commitlint/config-conventional/CHANGELOG.md) - [Commits](https://github.com/conventional-changelog/commitlint/commits/v17.4.2/@commitlint/config-conventional) --- updated-dependencies: - dependency-name: "@commitlint/config-conventional" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index ad7a15c1..508fc5c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "version": "2.3.2", "devDependencies": { "@commitlint/cli": "^17.4.2", - "@commitlint/config-conventional": "^17.4.0", + "@commitlint/config-conventional": "^17.4.2", "devmoji": "^2.3.0", "eslint-config-wikimedia": "0.23.0", "grunt-banana-checker": "0.10.0", @@ -164,9 +164,9 @@ } }, "node_modules/@commitlint/config-conventional": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-17.4.0.tgz", - "integrity": "sha512-G4XBf45J4ZMspO4NwBFzY3g/1Kb+B42BcIxeikF8wucQxcyxcmhRdjeQpRpS1XEcBq5pdtEEQFipuB9IuiNFhw==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-17.4.2.tgz", + "integrity": "sha512-JVo1moSj5eDMoql159q8zKCU8lkOhQ+b23Vl3LVVrS6PXDLQIELnJ34ChQmFVbBdSSRNAbbXnRDhosFU+wnuHw==", "dev": true, "dependencies": { "conventional-changelog-conventionalcommits": "^5.0.0" @@ -6150,9 +6150,9 @@ } }, "@commitlint/config-conventional": { - "version": "17.4.0", - "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-17.4.0.tgz", - "integrity": "sha512-G4XBf45J4ZMspO4NwBFzY3g/1Kb+B42BcIxeikF8wucQxcyxcmhRdjeQpRpS1XEcBq5pdtEEQFipuB9IuiNFhw==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-17.4.2.tgz", + "integrity": "sha512-JVo1moSj5eDMoql159q8zKCU8lkOhQ+b23Vl3LVVrS6PXDLQIELnJ34ChQmFVbBdSSRNAbbXnRDhosFU+wnuHw==", "dev": true, "requires": { "conventional-changelog-conventionalcommits": "^5.0.0" diff --git a/package.json b/package.json index dae04ee8..2e9a4276 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ }, "devDependencies": { "@commitlint/cli": "^17.4.2", - "@commitlint/config-conventional": "^17.4.0", + "@commitlint/config-conventional": "^17.4.2", "devmoji": "^2.3.0", "eslint-config-wikimedia": "0.23.0", "grunt-banana-checker": "0.10.0", From f11ad86a07ad9cef7ae2fa73b9a99f8199adf540 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Sat, 14 Jan 2023 19:04:42 -0500 Subject: [PATCH 037/124] =?UTF-8?q?fix(Cargo):=20=F0=9F=90=9B=20incorrect?= =?UTF-8?q?=20hover=20style=20for=20datatable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skinStyles/extensions/Cargo/ext.cargo.datatables.less | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/skinStyles/extensions/Cargo/ext.cargo.datatables.less b/skinStyles/extensions/Cargo/ext.cargo.datatables.less index ceda7571..be2269e2 100644 --- a/skinStyles/extensions/Cargo/ext.cargo.datatables.less +++ b/skinStyles/extensions/Cargo/ext.cargo.datatables.less @@ -94,11 +94,6 @@ table.dataTable.cell-border tbody tr td:first-child { table.dataTable.stripe tbody tr.odd, table.dataTable.display tbody tr.odd { background-color: var( --color-surface-2 ); - - &:hover { - // Added hover styles - background-color: var( --background-color-quiet--hover ); - } } table.dataTable.stripe tbody tr.odd.selected, @@ -106,6 +101,8 @@ table.dataTable.display tbody tr.odd.selected { background-color: var( --background-color-quiet--hover ); } +table.dataTable.hover tbody tr:hover, +table.dataTable.display tbody tr:hover, table.dataTable.hover tbody tr:hover.selected, table.dataTable.display tbody tr:hover.selected { background-color: var( --background-color-quiet--hover ); From f40c0db9bfdfa1978a90b630d6fe08b6ee38a43f Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Sat, 14 Jan 2023 19:34:54 -0500 Subject: [PATCH 038/124] =?UTF-8?q?fix(core):=20=F0=9F=90=9B=20incorrect?= =?UTF-8?q?=20gallery=20margin=20and=20padding=20styles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See T327016 --- .../mediawiki/mediawiki.page.gallery.styles.less | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/skinStyles/mediawiki/mediawiki.page.gallery.styles.less b/skinStyles/mediawiki/mediawiki.page.gallery.styles.less index bcb13462..e8ad0436 100644 --- a/skinStyles/mediawiki/mediawiki.page.gallery.styles.less +++ b/skinStyles/mediawiki/mediawiki.page.gallery.styles.less @@ -3,6 +3,19 @@ * https://starcitizen.tools */ +ul.gallery { + padding: 0; + margin: var( --space-xxs ) 0; +} + +// TODO: Remove when T327016 is fixed +.mw-content-ltr ul.gallery, +.mw-content-rtl .mw-content-ltr ul.gallery, +.mw-content-rtl ul.gallery, +.mw-content-ltr .mw-content-rtl ul.gallery { + margin: var( --space-xxs ) 0; +} + // Sync with caption styles div.gallerytext { padding: 0; From e3bf5813c8f97f00ce1cbe19a2684d5ce2d8d291 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Sun, 15 Jan 2023 02:26:34 -0500 Subject: [PATCH 039/124] =?UTF-8?q?fix(core):=20=F0=9F=90=9B=20disable=20U?= =?UTF-8?q?LS-enhanced=20language=20button=20for=20now?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Somehow the ULS popup does not appear after clicking the button. Disabling it for now until it is fixed --- includes/Partials/PageTools.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/includes/Partials/PageTools.php b/includes/Partials/PageTools.php index 7f6de99a..8878756f 100644 --- a/includes/Partials/PageTools.php +++ b/includes/Partials/PageTools.php @@ -61,7 +61,11 @@ final class PageTools extends Partial { if ( $hasLanguages ) { $data += [ 'has-languages' => $hasLanguages, - 'is-uls-ready' => $this->shouldShowULS( $variantsData ), + /* + * FIXME: ULS does not trigger for some reason, disabling it for now + * 'is-uls-ready' => $this->shouldShowULS( $variantsData ), + */ + 'is-uls-ready' => false, 'html-language-count' => $this->getLanguagesCount(), ]; } From 8e0edeaaf4e319b0cca81fcede97fc9baf8c1647 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 16 Jan 2023 13:10:09 +0100 Subject: [PATCH 040/124] Localisation updates from https://translatewiki.net. --- i18n/de.json | 7 ++++--- i18n/qqq.json | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/i18n/de.json b/i18n/de.json index 97228fb5..d862423e 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -1,6 +1,7 @@ { "@metadata": { "authors": [ + "CyberOne25", "FF-11", "Gebu", "Justman10000", @@ -26,11 +27,11 @@ "citizen-page-info-copyright": "Urheberrecht", "citizen-page-info-credits": "Namensnennung", "citizen-page-info-lastmod": "Zuletzt geändert", - "citizen-footer-desc": "Bearbeiten Sie diesen Text auf [[MediaWiki:Citizen-footer-desc/de]]", - "citizen-footer-tagline": "Bearbeiten Sie diesen Text auf [[MediaWiki:Citizen-footer-tagline/de]]", + "citizen-footer-desc": "Bearbeiten Sie diesen Text auf [[MediaWiki:Citizen-footer-desc]]", + "citizen-footer-tagline": "Bearbeiten Sie diesen Text auf [[MediaWiki:Citizen-footer-tagline]]", "citizen-action-addsection": "Thema hinzufügen", "citizen-jumptotop": "Zurück nach oben", - "citizen-search-fulltext": "Suche nach Seiten mit", + "citizen-search-fulltext": "Suche nach Artikeln, die $1 beinhalten", "citizen-search-empty-desc": "Tippe, um zu suchen zu beginnen", "citizen-tagline-ns-talk": "Diskussionsseite von {{SUBJECTPAGENAME}}", "citizen-tagline-ns-project": "Informationen über {{SITENAME}}", diff --git a/i18n/qqq.json b/i18n/qqq.json index ad62f4cd..0a8583bc 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -4,6 +4,7 @@ "Abijeet Patro", "Alistair3149", "Amire80", + "CyberOne25", "[https://www.mediawiki.org/wiki/User:Alistair3149 Alistair3149]", "[https://www.mediawiki.org/wiki/User:Octfx Octfx]" ] @@ -25,8 +26,8 @@ "citizen-page-info-copyright": "Label for the copyright message", "citizen-page-info-credits": "Label for the article credits message", "citizen-page-info-lastmod": "Label for the last modified message", - "citizen-footer-desc": "Default text for the site footer decription. Add the language code to the end of the link if not en (e.g. MediaWiki:Citizen-footer-description/de for German).", - "citizen-footer-tagline": "Default text for the site footer tagline. Add the language code to the end of the link if not en (e.g. MediaWiki:Citizen-footer-tagline/de for German).", + "citizen-footer-desc": "Default text for the site footer decription.", + "citizen-footer-tagline": "Default text for the site footer tagline.", "citizen-action-addsection": "Used in the Citizen skin. See for example {{canonicalurl:Talk:Main_Page|useskin=vector}}\n{{Identical|Add topic}}. Same as vector-action-addsection in Vector skin.", "citizen-jumptotop": "Label for link to jump to top of page", "citizen-search-fulltext": "Fulltext search suggestion", From 7c552fe76313ab097c9c8b8c9378b96c505c7d8d Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Mon, 16 Jan 2023 15:58:55 -0500 Subject: [PATCH 041/124] =?UTF-8?q?fix(core):=20=F0=9F=90=9B=20more=20defe?= =?UTF-8?q?nsive=20check=20for=20logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolve undefined index from wgLogos --- includes/Api/ApiWebappManifest.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/includes/Api/ApiWebappManifest.php b/includes/Api/ApiWebappManifest.php index b693e7f7..11b149bb 100644 --- a/includes/Api/ApiWebappManifest.php +++ b/includes/Api/ApiWebappManifest.php @@ -83,6 +83,11 @@ class ApiWebappManifest extends ApiBase { ]; foreach ( $logoKeys as $logoKey ) { + // Avoid undefined index + if ( !isset( (string)$logos[$logoKey] ) { + continue; + } + $logo = (string)$logos[$logoKey]; if ( !empty( $logo ) ) { From 7416a7f6d13688e635e3031a4eb40d8f5b1a7ecf Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Mon, 16 Jan 2023 17:36:45 -0500 Subject: [PATCH 042/124] =?UTF-8?q?fix(search):=20=F0=9F=90=9B=20incorrect?= =?UTF-8?q?=20max=20height=20for=20search=20suggestions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/skins.citizen.search/skins.citizen.search.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/skins.citizen.search/skins.citizen.search.less b/resources/skins.citizen.search/skins.citizen.search.less index 0c27ebe7..49bd4e5a 100644 --- a/resources/skins.citizen.search/skins.citizen.search.less +++ b/resources/skins.citizen.search/skins.citizen.search.less @@ -5,7 +5,7 @@ position: absolute; overflow: auto; width: 100%; - max-height: var( --header-card-maxheight ); + max-height: ~'calc( var( --header-card-maxheight ) - var( --height-search-bar ) )'; box-sizing: border-box; padding: 0.75rem 0 0 0; margin: -0.75rem 0 0 0; // Reset
    styles From 4b8e128e4b0dbc8b6d507b7789e3f032ee8c8ee1 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Mon, 16 Jan 2023 18:02:07 -0500 Subject: [PATCH 043/124] =?UTF-8?q?feat(search):=20=E2=9C=A8=20add=20searc?= =?UTF-8?q?h=20portals=20to=20empty=20state?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i18n/en.json | 2 ++ i18n/qqq.json | 2 ++ resources/skins.citizen.search/typeahead.js | 10 ++-------- skin.json | 2 ++ 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/i18n/en.json b/i18n/en.json index 2bb6565d..423da412 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -27,7 +27,9 @@ "citizen-action-addsection": "Add topic", "citizen-jumptotop": "Back to top", "citizen-search-fulltext": "Search for pages containing $1", + "citizen-search-fulltext-empty": "Search text within pages", "citizen-search-mediasearch": "Search for media related to $1", + "citizen-search-mediasearch-empty": "Search for media", "citizen-search-empty-desc": "Type to start searching", "citizen-search-noresults-title": "Uh oh! No results for $1", "citizen-search-noresults-desc": "Maybe try the options below?", diff --git a/i18n/qqq.json b/i18n/qqq.json index 0a8583bc..b3f4715f 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -31,7 +31,9 @@ "citizen-action-addsection": "Used in the Citizen skin. See for example {{canonicalurl:Talk:Main_Page|useskin=vector}}\n{{Identical|Add topic}}. Same as vector-action-addsection in Vector skin.", "citizen-jumptotop": "Label for link to jump to top of page", "citizen-search-fulltext": "Fulltext search suggestion", + "citizen-search-fulltext-empty": "Helper text for Fulltext search", "citizen-search-mediasearch": "MediaSearch suggestion", + "citizen-search-mediasearch-empty": "Helper text for MediaSearch", "citizen-search-empty-desc": "Helper text in the search suggestion when there are no search query", "citizen-search-noresults-title": "Title in the search suggestion when there are no search results", "citizen-search-noresults-desc": "Description in the search suggestion when there are no search results", diff --git a/resources/skins.citizen.search/typeahead.js b/resources/skins.citizen.search/typeahead.js index 8ab59782..eca1d7c7 100644 --- a/resources/skins.citizen.search/typeahead.js +++ b/resources/skins.citizen.search/typeahead.js @@ -394,12 +394,6 @@ function updateTypeahead( messages ) { desc: itemDesc } ); - // FIXME: There is probably a more efficient way - if ( hasQuery ) { - item.classList.remove( HIDDEN_CLASS ); - } else { - item.classList.add( HIDDEN_CLASS ); - } } else { item = getMenuItem( { icon: data.icon, @@ -417,7 +411,7 @@ function updateTypeahead( messages ) { id: 'fulltext', link: `${config.wgScriptPath}/index.php?title=Special:Search&fulltext=1&search=`, icon: 'articleSearch', - msg: 'citizen-search-fulltext' + msg: hasQuery ? 'citizen-search-fulltext' : 'citizen-search-fulltext-empty' } ); // MediaSearch @@ -426,7 +420,7 @@ function updateTypeahead( messages ) { id: 'mediasearch', link: `${config.wgScriptPath}/index.php?title=Special:MediaSearch&type=image&search=`, icon: 'imageGallery', - msg: 'citizen-search-mediasearch' + msg: hasQuery ? 'citizen-search-mediasearch' : 'citizen-search-mediasearch-empty' } ); } diff --git a/skin.json b/skin.json index ddf5604f..62dfe7cd 100644 --- a/skin.json +++ b/skin.json @@ -159,7 +159,9 @@ ], "messages": [ "citizen-search-fulltext", + "citizen-search-fulltext-empty", "citizen-search-mediasearch", + "citizen-search-mediasearch-empty", "citizen-search-empty-desc", "citizen-search-noresults-title", "citizen-search-noresults-desc", From dc01717c98ad617ec2c53887b9b3d8f7ea7c8ec4 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Mon, 16 Jan 2023 18:08:47 -0500 Subject: [PATCH 044/124] =?UTF-8?q?fix(search):=20=F0=9F=90=9B=20consisten?= =?UTF-8?q?t=20empty=20messages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/en.json b/i18n/en.json index 423da412..257a2b1b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -27,7 +27,7 @@ "citizen-action-addsection": "Add topic", "citizen-jumptotop": "Back to top", "citizen-search-fulltext": "Search for pages containing $1", - "citizen-search-fulltext-empty": "Search text within pages", + "citizen-search-fulltext-empty": "Search for text within pages", "citizen-search-mediasearch": "Search for media related to $1", "citizen-search-mediasearch-empty": "Search for media", "citizen-search-empty-desc": "Type to start searching", From 5589916bfa3a72f9f9e75574938dfacee1ccca4f Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Mon, 16 Jan 2023 18:25:15 -0500 Subject: [PATCH 045/124] =?UTF-8?q?fix(VisualEditor):=20=F0=9F=90=9B=20inc?= =?UTF-8?q?orrect=20layout=20for=20header=20in=20preview=20dialog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skinStyles/extensions/VisualEditor/ext.visualEditor.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/skinStyles/extensions/VisualEditor/ext.visualEditor.less b/skinStyles/extensions/VisualEditor/ext.visualEditor.less index ca1cb4dc..a320cc8b 100644 --- a/skinStyles/extensions/VisualEditor/ext.visualEditor.less +++ b/skinStyles/extensions/VisualEditor/ext.visualEditor.less @@ -166,10 +166,10 @@ } // Give preview content a max width - .mw-parser-output { + .mw-body { max-width: var( --width-layout ); - margin-right: auto; - margin-left: auto; + margin-right: auto !important; + margin-left: auto !important; } } From 5c221452959c891eab7cda043fd24cb9d2270699 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Mon, 16 Jan 2023 19:30:15 -0500 Subject: [PATCH 046/124] =?UTF-8?q?feat(Echo):=20=E2=9C=A8=20tweak=20Speci?= =?UTF-8?q?al:Notifications=20styles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extensions/Echo/ext.echo.special.less | 87 ++++++++++++++++++- 1 file changed, 84 insertions(+), 3 deletions(-) diff --git a/skinStyles/extensions/Echo/ext.echo.special.less b/skinStyles/extensions/Echo/ext.echo.special.less index dfe5878f..198548d3 100644 --- a/skinStyles/extensions/Echo/ext.echo.special.less +++ b/skinStyles/extensions/Echo/ext.echo.special.less @@ -8,9 +8,37 @@ * Date: 2021-08-11 */ +// Disable sticky header since it collides with Echo sticky header +#citizen-body-header-sticky-sentinel { + display: none; +} + /* mw.echo.ui.DatedSubGroupListWidget.less */ +.mw-echo-ui-subGroupListWidget { + &-header-row { + // More aligned + display: flex; + align-items: center; + + &-markAllReadButton { + // Revert responsive font size tweak from Echo + // As it breaks alignment + font-size: revert !important; + } + } +} + .mw-echo-ui-datedSubGroupListWidget { .mw-body-content &-title { + margin: 0; + + &-primary { + // Align with Citizen label styles + color: var( --color-base--subtle ); + font-size: 0.875rem; + letter-spacing: 0.05em; + } + &-secondary { color: var( --color-base--subtle ); } @@ -19,21 +47,63 @@ /* mw.echo.ui.NotificationsInboxWidget.less */ .mw-echo-ui-notificationsInboxWidget { - &-toolbarWrapper { - background: var( --color-surface-0 ); + max-width: none; + + &-sidebar { + padding-top: var( --space-sm ); // align with toolbarWrapper + padding-right: var( --space-lg ); } + + &-main { + &-toolbar-top { + margin-bottom: 0 !important; + + .mw-echo-ui-notificationsInboxWidget-row { + display: table-row !important; + // Fix misalign + text-align: left; + } + } + + .mw-echo-ui-notificationItemWidget { + border-radius: var( --border-radius--small ); + } + } + + &-toolbarWrapper { + max-width: ~'calc( 100vw - var(--padding-page) * 2 )'; + height: auto; + padding: var( --space-sm ) 0; + border-bottom: 1px solid var( --border-color-base ); + // Mimic Citizen sticky header + margin: 0; + margin-bottom: var( --space-md ); + backdrop-filter: saturate( 50% ) blur( 16px ); + background: var( --background-color-overlay ); + box-shadow: none; + overflow-x: auto; + } +} + +.mw-echo-ui-notificationsInboxWidget-cell-placeholder, +.mw-echo-ui-notificationsInboxWidget-main-toolbar-settings, +.mw-echo-ui-notificationsInboxWidget-main-toolbar-pagination { + display: table-cell !important; } /* mw.echo.ui.PageNotificationsOptionWidget.less */ .mw-echo-ui-pageNotificationsOptionWidget { &.oo-ui-optionWidget { + padding: var( --space-xs ) var( --space-sm ); + border-radius: var( --border-radius--small ); + &-highlighted { background-color: var( --color-surface-3 ); color: var( --color-base--emphasized ); } &-selected { - background-color: var( --background-color-primary ); + background-color: var( --background-color-primary--hover ); color: var( --color-primary ); } @@ -56,7 +126,18 @@ /* mw.echo.ui.CrossWikiUnreadFilterWidget.less */ .mw-echo-ui-crossWikiUnreadFilterWidget { + // HACK: Make it sticky + position: sticky; + top: var( --space-sm ); + padding: var( --space-md ); border-color: var( --border-color-base ); + border-radius: var( --border-radius--medium ); + + &-title { + color: var( --color-base--emphasized ); + font-size: var( --font-size-h3 ); + font-weight: var( --font-weight-semibold ); + } &-subtitle { color: var( --color-base--subtle ); From 7bb55c1e4d80d0f1c0973895bae22397898e6171 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Mon, 16 Jan 2023 19:36:07 -0500 Subject: [PATCH 047/124] =?UTF-8?q?chore(release):=20=F0=9F=9A=80=202.3.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 19 +++++++++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- skin.json | 2 +- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ffbaa10..f4aa7e98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,25 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [2.3.3](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/compare/v2.3.2...v2.3.3) (2023-01-17) + + +### Features + +* **Echo:** ✨ tweak Special:Notifications styles ([5c22145](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/5c221452959c891eab7cda043fd24cb9d2270699)) +* **search:** ✨ add search portals to empty state ([4b8e128](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/4b8e128e4b0dbc8b6d507b7789e3f032ee8c8ee1)) + + +### Bug Fixes + +* **Cargo:** 🐛 incorrect hover style for datatable ([f11ad86](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/f11ad86a07ad9cef7ae2fa73b9a99f8199adf540)) +* **core:** 🐛 disable ULS-enhanced language button for now ([e3bf581](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/e3bf5813c8f97f00ce1cbe19a2684d5ce2d8d291)) +* **core:** 🐛 incorrect gallery margin and padding styles ([f40c0db](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/f40c0db9bfdfa1978a90b630d6fe08b6ee38a43f)) +* **core:** 🐛 more defensive check for logo ([7c552fe](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/7c552fe76313ab097c9c8b8c9378b96c505c7d8d)) +* **search:** 🐛 consistent empty messages ([dc01717](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/dc01717c98ad617ec2c53887b9b3d8f7ea7c8ec4)) +* **search:** 🐛 incorrect max height for search suggestions ([7416a7f](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/7416a7f6d13688e635e3031a4eb40d8f5b1a7ecf)) +* **VisualEditor:** 🐛 incorrect layout for header in preview dialog ([5589916](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/5589916bfa3a72f9f9e75574938dfacee1ccca4f)) + ### [2.3.2](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/compare/v2.3.1...v2.3.2) (2023-01-12) diff --git a/package-lock.json b/package-lock.json index 508fc5c9..549bceb8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "mediawiki-skins-Citizen", - "version": "2.3.2", + "version": "2.3.3", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "2.3.2", + "version": "2.3.3", "devDependencies": { "@commitlint/cli": "^17.4.2", "@commitlint/config-conventional": "^17.4.2", diff --git a/package.json b/package.json index 2e9a4276..d410c694 100644 --- a/package.json +++ b/package.json @@ -30,5 +30,5 @@ "stylelint-config-wikimedia": "0.13.1", "svgo": "3.0.2" }, - "version": "2.3.2" + "version": "2.3.3" } diff --git a/skin.json b/skin.json index 62dfe7cd..a721167a 100644 --- a/skin.json +++ b/skin.json @@ -1,6 +1,6 @@ { "name": "Citizen", - "version": "2.3.2", + "version": "2.3.3", "author": [ "[https://www.mediawiki.org/wiki/User:Alistair3149 Alistair3149]", "[https://www.mediawiki.org/wiki/User:Octfx Octfx]", From d63025f08436af5224dc570ad3491030b8842bbe Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Tue, 17 Jan 2023 12:40:18 -0500 Subject: [PATCH 048/124] =?UTF-8?q?fix(pwa):=20=F0=9F=90=9B=20parse=20erro?= =?UTF-8?q?r=20in=20manifest=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- includes/Api/ApiWebappManifest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/Api/ApiWebappManifest.php b/includes/Api/ApiWebappManifest.php index 11b149bb..add41b9e 100644 --- a/includes/Api/ApiWebappManifest.php +++ b/includes/Api/ApiWebappManifest.php @@ -84,7 +84,7 @@ class ApiWebappManifest extends ApiBase { foreach ( $logoKeys as $logoKey ) { // Avoid undefined index - if ( !isset( (string)$logos[$logoKey] ) { + if ( !isset( $logos[$logoKey] ) { continue; } From e40d4e65fac34a21ec3f7a71e2915e7d4ae469dc Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Tue, 17 Jan 2023 14:12:47 -0500 Subject: [PATCH 049/124] =?UTF-8?q?fix(pwa):=20=F0=9F=90=9B=20syntax=20err?= =?UTF-8?q?or=20in=20manifest=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- includes/Api/ApiWebappManifest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/Api/ApiWebappManifest.php b/includes/Api/ApiWebappManifest.php index add41b9e..d79cc79f 100644 --- a/includes/Api/ApiWebappManifest.php +++ b/includes/Api/ApiWebappManifest.php @@ -84,7 +84,7 @@ class ApiWebappManifest extends ApiBase { foreach ( $logoKeys as $logoKey ) { // Avoid undefined index - if ( !isset( $logos[$logoKey] ) { + if ( !isset( $logos[$logoKey] ) ) { continue; } From 04be2a1452751e6da802f5ace6ee96d7ac14c1a3 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Tue, 17 Jan 2023 14:13:02 -0500 Subject: [PATCH 050/124] =?UTF-8?q?chore(release):=20=F0=9F=9A=80=202.3.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 8 ++++++++ package-lock.json | 4 ++-- package.json | 2 +- skin.json | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4aa7e98..19ffdd28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [2.3.4](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/compare/v2.3.3...v2.3.4) (2023-01-17) + + +### Bug Fixes + +* **pwa:** 🐛 parse error in manifest API ([d63025f](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/d63025f08436af5224dc570ad3491030b8842bbe)) +* **pwa:** 🐛 syntax error in manifest API ([e40d4e6](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/e40d4e65fac34a21ec3f7a71e2915e7d4ae469dc)) + ### [2.3.3](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/compare/v2.3.2...v2.3.3) (2023-01-17) diff --git a/package-lock.json b/package-lock.json index 549bceb8..bd5d0345 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "mediawiki-skins-Citizen", - "version": "2.3.3", + "version": "2.3.4", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "2.3.3", + "version": "2.3.4", "devDependencies": { "@commitlint/cli": "^17.4.2", "@commitlint/config-conventional": "^17.4.2", diff --git a/package.json b/package.json index d410c694..ad9a6899 100644 --- a/package.json +++ b/package.json @@ -30,5 +30,5 @@ "stylelint-config-wikimedia": "0.13.1", "svgo": "3.0.2" }, - "version": "2.3.3" + "version": "2.3.4" } diff --git a/skin.json b/skin.json index a721167a..118c02ec 100644 --- a/skin.json +++ b/skin.json @@ -1,6 +1,6 @@ { "name": "Citizen", - "version": "2.3.3", + "version": "2.3.4", "author": [ "[https://www.mediawiki.org/wiki/User:Alistair3149 Alistair3149]", "[https://www.mediawiki.org/wiki/User:Octfx Octfx]", From d73fa67a3184aef1ffe8a4364484acc183662e7b Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Tue, 17 Jan 2023 14:42:49 -0500 Subject: [PATCH 051/124] =?UTF-8?q?feat(pwa):=20=E2=9C=A8=20use=20proper?= =?UTF-8?q?=20manifest=20type=20instead=20of=20json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- includes/Api/ApiFormatManifest.php | 40 ++++++++++++++++++++++++++++++ includes/Api/ApiWebappManifest.php | 9 ++++--- 2 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 includes/Api/ApiFormatManifest.php diff --git a/includes/Api/ApiFormatManifest.php b/includes/Api/ApiFormatManifest.php new file mode 100644 index 00000000..2d5b07f5 --- /dev/null +++ b/includes/Api/ApiFormatManifest.php @@ -0,0 +1,40 @@ +. + * + * @file + */ + +namespace MediaWiki\Skins\Citizen\Api; + +use ApiFormatJson; + +/** + * T282500 + * TODO: This should be merged to core + */ +class ApiFormatManifest extends ApiFormatJson { + /** + * Return the proper content-type + * + * @return string + */ + public function getMimeType() { + return 'application/manifest+json'; + } +} diff --git a/includes/Api/ApiWebappManifest.php b/includes/Api/ApiWebappManifest.php index d79cc79f..ba53b3b5 100644 --- a/includes/Api/ApiWebappManifest.php +++ b/includes/Api/ApiWebappManifest.php @@ -23,7 +23,7 @@ namespace MediaWiki\Skins\Citizen\Api; use ApiBase; -use ApiFormatJson; +use MediaWiki\Skins\Citizen\Api\ApiFormatManifest; use MediaWiki\MediaWikiServices; use SpecialPage; use Title; @@ -31,6 +31,9 @@ use Title; /** * Based on the MobileFrontend extension * Return the webapp manifest for this wiki + * + * T282500 + * TODO: This should be merged to core */ class ApiWebappManifest extends ApiBase { /** @@ -144,9 +147,9 @@ class ApiWebappManifest extends ApiBase { /** * Get the JSON printer * - * @return ApiFormatJson + * @return ApiFormatManifest */ public function getCustomPrinter() { - return new ApiFormatJson( $this->getMain(), 'json' ); + return new ApiFormatManifest( $this->getMain(), 'json' ); } } From e8be32f7c5e1a50e5345cb2b5e54485f0c310060 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 17 Jan 2023 19:43:57 +0000 Subject: [PATCH 052/124] =?UTF-8?q?ci:=20=F0=9F=91=B7=20lint=20code=20to?= =?UTF-8?q?=20MediaWiki=20standards?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Check commit and GitHub actions for more details --- includes/Api/ApiWebappManifest.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/includes/Api/ApiWebappManifest.php b/includes/Api/ApiWebappManifest.php index ba53b3b5..51da50c2 100644 --- a/includes/Api/ApiWebappManifest.php +++ b/includes/Api/ApiWebappManifest.php @@ -23,7 +23,6 @@ namespace MediaWiki\Skins\Citizen\Api; use ApiBase; -use MediaWiki\Skins\Citizen\Api\ApiFormatManifest; use MediaWiki\MediaWikiServices; use SpecialPage; use Title; @@ -31,7 +30,7 @@ use Title; /** * Based on the MobileFrontend extension * Return the webapp manifest for this wiki - * + * * T282500 * TODO: This should be merged to core */ From 01de2ec5f6c47c000c078636e90bde1490b39e50 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Tue, 17 Jan 2023 14:54:11 -0500 Subject: [PATCH 053/124] =?UTF-8?q?refactor(pwa):=20=E2=99=BB=EF=B8=8F=20b?= =?UTF-8?q?etter=20naming=20for=20manifest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Api/{ApiFormatManifest.php => ApiFormatWebmanifest.php} | 2 +- includes/Api/ApiWebappManifest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename includes/Api/{ApiFormatManifest.php => ApiFormatWebmanifest.php} (95%) diff --git a/includes/Api/ApiFormatManifest.php b/includes/Api/ApiFormatWebmanifest.php similarity index 95% rename from includes/Api/ApiFormatManifest.php rename to includes/Api/ApiFormatWebmanifest.php index 2d5b07f5..36a2b3b4 100644 --- a/includes/Api/ApiFormatManifest.php +++ b/includes/Api/ApiFormatWebmanifest.php @@ -28,7 +28,7 @@ use ApiFormatJson; * T282500 * TODO: This should be merged to core */ -class ApiFormatManifest extends ApiFormatJson { +class ApiFormatWebmanifest extends ApiFormatJson { /** * Return the proper content-type * diff --git a/includes/Api/ApiWebappManifest.php b/includes/Api/ApiWebappManifest.php index 51da50c2..45f3a7a7 100644 --- a/includes/Api/ApiWebappManifest.php +++ b/includes/Api/ApiWebappManifest.php @@ -149,6 +149,6 @@ class ApiWebappManifest extends ApiBase { * @return ApiFormatManifest */ public function getCustomPrinter() { - return new ApiFormatManifest( $this->getMain(), 'json' ); + return new ApiFormatWebmanifest( $this->getMain(), 'webmanifest' ); } } From 15ed16da2ab6a1eb296c76b1b1100ff32682a777 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Tue, 17 Jan 2023 15:21:39 -0500 Subject: [PATCH 054/124] =?UTF-8?q?refactor(pwa):=20=E2=99=BB=EF=B8=8F=20u?= =?UTF-8?q?se=20more=20approiate=20function=20to=20set=20maxage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- includes/Api/ApiWebappManifest.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/includes/Api/ApiWebappManifest.php b/includes/Api/ApiWebappManifest.php index 45f3a7a7..bc2f13c5 100644 --- a/includes/Api/ApiWebappManifest.php +++ b/includes/Api/ApiWebappManifest.php @@ -58,7 +58,7 @@ class ApiWebappManifest extends ApiBase { $resultObj->addValue( null, 'shortcuts', $this->getShortcuts() ); $main = $this->getMain(); - $main->setCacheControl( [ 's-maxage' => 86400, 'max-age' => 86400 ] ); + $main->setCacheMaxAge( '604800' ); $main->setCacheMode( 'public' ); } @@ -67,7 +67,6 @@ class ApiWebappManifest extends ApiBase { * * @param MediaWikiServices $services * @param Config $config - * @param MediaWikiServices $services * @return array */ private function getIcons( $config, $services ) { From e4851f9de2bc2cd01f650cb55899de17fcf9d104 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Tue, 17 Jan 2023 16:15:12 -0500 Subject: [PATCH 055/124] =?UTF-8?q?fix(core):=20=F0=9F=90=9B=20stricter=20?= =?UTF-8?q?selector=20for=20sign=20up=20form=20container?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ediawiki.special.userlogin.signup.styles.less | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/skinStyles/mediawiki/special/mediawiki.special.userlogin.signup.styles.less b/skinStyles/mediawiki/special/mediawiki.special.userlogin.signup.styles.less index 223e17a0..be93231d 100644 --- a/skinStyles/mediawiki/special/mediawiki.special.userlogin.signup.styles.less +++ b/skinStyles/mediawiki/special/mediawiki.special.userlogin.signup.styles.less @@ -11,12 +11,6 @@ @import '../../resources/variables.less'; .mw-ui-container { - display: grid; - gap: var( --space-md ); - grid-template-areas: 'message' - 'stats' - 'form'; - // No need for float clear since we are using flex &:after { content: none; @@ -32,6 +26,14 @@ } } +.mw-body-content > .mw-ui-container { + display: grid; + gap: var( --space-md ); + grid-template-areas: 'message' + 'stats' + 'form'; +} + .mw-createacct-benefits { grid-area: stats; @@ -79,7 +81,7 @@ } @media ( min-width: @width-breakpoint-tablet ) { - .mw-ui-container { + .mw-body-content > .mw-ui-container { grid-template-areas: 'message message' 'form stats'; } From e78ebd716568dc1362542f2302ca433174a010d3 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Tue, 17 Jan 2023 16:34:02 -0500 Subject: [PATCH 056/124] =?UTF-8?q?fix(pwa):=20=F0=9F=90=9B=20incorrect=20?= =?UTF-8?q?var=20type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- includes/Api/ApiWebappManifest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/Api/ApiWebappManifest.php b/includes/Api/ApiWebappManifest.php index bc2f13c5..611bbf83 100644 --- a/includes/Api/ApiWebappManifest.php +++ b/includes/Api/ApiWebappManifest.php @@ -58,7 +58,7 @@ class ApiWebappManifest extends ApiBase { $resultObj->addValue( null, 'shortcuts', $this->getShortcuts() ); $main = $this->getMain(); - $main->setCacheMaxAge( '604800' ); + $main->setCacheMaxAge( 604800 ); $main->setCacheMode( 'public' ); } From 68cb9b6c68cb63022f59c77604a34288ca04d751 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Tue, 17 Jan 2023 16:36:56 -0500 Subject: [PATCH 057/124] =?UTF-8?q?fix(pwa):=20=F0=9F=90=9B=20declare=20?= =?UTF-8?q?=20before=20adding=20array?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- includes/Api/ApiWebappManifest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/includes/Api/ApiWebappManifest.php b/includes/Api/ApiWebappManifest.php index 611bbf83..a55f03fa 100644 --- a/includes/Api/ApiWebappManifest.php +++ b/includes/Api/ApiWebappManifest.php @@ -133,6 +133,7 @@ class ApiWebappManifest extends ApiBase { $specialPages = [ 'Search', 'Randompage', 'RecentChanges' ]; foreach ( $specialPages as $specialPage ) { + $shortcut = []; $title = SpecialPage::getSafeTitleFor( $specialPage ); $shortcut['name'] = $title->getBaseText(); $shortcut['url'] = $title->getLocalURL(); From aeb8e160cfccfe6cc0686bbf909045770f9b1a90 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Tue, 17 Jan 2023 16:44:35 -0500 Subject: [PATCH 058/124] =?UTF-8?q?fix(core):=20=F0=9F=90=9B=20increase=20?= =?UTF-8?q?mw-body-header=20z-index?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This should allow modals in mw-body-header to be higher than the custom sticky headers --- resources/skins.citizen.styles/layout.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/skins.citizen.styles/layout.less b/resources/skins.citizen.styles/layout.less index 749767ad..e01051f1 100644 --- a/resources/skins.citizen.styles/layout.less +++ b/resources/skins.citizen.styles/layout.less @@ -17,7 +17,8 @@ .mw-body-header { position: sticky; - z-index: @z-index-page-header; + // So that the modal are above custom sticky headers + z-index: @z-index-page-header + 1; display: flex; flex-wrap: wrap; align-items: center; From 4ae0f0cfcd35177546e342e37f183d05e31fbd02 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Tue, 17 Jan 2023 22:45:51 -0500 Subject: [PATCH 059/124] =?UTF-8?q?refactor(pwa):=20=E2=99=BB=EF=B8=8F=20r?= =?UTF-8?q?ename=20manifest=20classes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- includes/Api/ApiWebappManifest.php | 6 +++--- ...ormatWebmanifest.php => ApiWebappManifestFormatJson.php} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename includes/Api/{ApiFormatWebmanifest.php => ApiWebappManifestFormatJson.php} (94%) diff --git a/includes/Api/ApiWebappManifest.php b/includes/Api/ApiWebappManifest.php index a55f03fa..4f389f61 100644 --- a/includes/Api/ApiWebappManifest.php +++ b/includes/Api/ApiWebappManifest.php @@ -65,8 +65,8 @@ class ApiWebappManifest extends ApiBase { /** * Get icons for manifest * - * @param MediaWikiServices $services * @param Config $config + * @param MediaWikiServices $services * @return array */ private function getIcons( $config, $services ) { @@ -146,9 +146,9 @@ class ApiWebappManifest extends ApiBase { /** * Get the JSON printer * - * @return ApiFormatManifest + * @return ApiWebappManifestFormatJson */ public function getCustomPrinter() { - return new ApiFormatWebmanifest( $this->getMain(), 'webmanifest' ); + return new ApiWebappManifestFormatJson ( $this->getMain(), 'webmanifest' ); } } diff --git a/includes/Api/ApiFormatWebmanifest.php b/includes/Api/ApiWebappManifestFormatJson.php similarity index 94% rename from includes/Api/ApiFormatWebmanifest.php rename to includes/Api/ApiWebappManifestFormatJson.php index 36a2b3b4..0780ede5 100644 --- a/includes/Api/ApiFormatWebmanifest.php +++ b/includes/Api/ApiWebappManifestFormatJson.php @@ -28,7 +28,7 @@ use ApiFormatJson; * T282500 * TODO: This should be merged to core */ -class ApiFormatWebmanifest extends ApiFormatJson { +class ApiWebappManifestFormatJson extends ApiFormatJson { /** * Return the proper content-type * From 7a6dfc6645faa20a8b57e0bbec301a45c2f6b5c4 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Tue, 17 Jan 2023 22:46:14 -0500 Subject: [PATCH 060/124] =?UTF-8?q?fix(core):=20=F0=9F=90=9B=20incorrect?= =?UTF-8?q?=20signup=20stats=20selector?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../special/mediawiki.special.userlogin.signup.styles.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/skinStyles/mediawiki/special/mediawiki.special.userlogin.signup.styles.less b/skinStyles/mediawiki/special/mediawiki.special.userlogin.signup.styles.less index be93231d..2d120d63 100644 --- a/skinStyles/mediawiki/special/mediawiki.special.userlogin.signup.styles.less +++ b/skinStyles/mediawiki/special/mediawiki.special.userlogin.signup.styles.less @@ -35,11 +35,10 @@ } .mw-createacct-benefits { - grid-area: stats; - &-container { padding-bottom: var( --space-lg ); border-bottom: 1px solid var( --border-color-base ); + grid-area: stats; h2 { margin: 0; From 7d2e51574c8231187140670eb84ae8fa37f7a4d5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 18 Jan 2023 03:47:37 +0000 Subject: [PATCH 061/124] =?UTF-8?q?ci:=20=F0=9F=91=B7=20lint=20code=20to?= =?UTF-8?q?=20MediaWiki=20standards?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Check commit and GitHub actions for more details --- includes/Api/ApiWebappManifest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/Api/ApiWebappManifest.php b/includes/Api/ApiWebappManifest.php index 4f389f61..44581fd7 100644 --- a/includes/Api/ApiWebappManifest.php +++ b/includes/Api/ApiWebappManifest.php @@ -146,9 +146,9 @@ class ApiWebappManifest extends ApiBase { /** * Get the JSON printer * - * @return ApiWebappManifestFormatJson + * @return ApiWebappManifestFormatJson */ public function getCustomPrinter() { - return new ApiWebappManifestFormatJson ( $this->getMain(), 'webmanifest' ); + return new ApiWebappManifestFormatJson( $this->getMain(), 'webmanifest' ); } } From 80d40b6c66a7bb20f9b7a834f439b6ff67ca8116 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Jan 2023 19:31:06 -0500 Subject: [PATCH 062/124] chore(deps-dev): bump eslint-config-wikimedia from 0.23.0 to 0.24.0 (#572) Bumps [eslint-config-wikimedia](https://github.com/wikimedia/eslint-config-wikimedia) from 0.23.0 to 0.24.0. - [Release notes](https://github.com/wikimedia/eslint-config-wikimedia/releases) - [Changelog](https://github.com/wikimedia/eslint-config-wikimedia/blob/master/CHANGELOG.md) - [Commits](https://github.com/wikimedia/eslint-config-wikimedia/compare/v0.23.0...v0.24.0) --- updated-dependencies: - dependency-name: eslint-config-wikimedia dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 319 ++++++++++++++++++++++++++++------------------ package.json | 2 +- 2 files changed, 197 insertions(+), 124 deletions(-) diff --git a/package-lock.json b/package-lock.json index bd5d0345..398f4276 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "@commitlint/cli": "^17.4.2", "@commitlint/config-conventional": "^17.4.2", "devmoji": "^2.3.0", - "eslint-config-wikimedia": "0.23.0", + "eslint-config-wikimedia": "0.24.0", "grunt-banana-checker": "0.10.0", "husky": "^8.0.3", "jsdoc": "4.0.0", @@ -464,9 +464,9 @@ } }, "node_modules/@es-joy/jsdoccomment": { - "version": "0.22.2", - "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.22.2.tgz", - "integrity": "sha512-pM6WQKcuAtdYoqCsXSvVSu3Ij8K0HY50L8tIheOKHDl0wH1uA4zbP88etY8SIeP16NVCMCTFU+Q2DahSKheGGQ==", + "version": "0.23.6", + "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.23.6.tgz", + "integrity": "sha512-cCtumxG+qrYORGeOkDQ58GtSt/bb2XiP9GC0x2YduoUEX2EmBQ48FtoZMUs+8wiIdTDN1izUiRUD2FDu+p+Lvg==", "dev": true, "dependencies": { "comment-parser": "1.3.1", @@ -478,39 +478,55 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.2.tgz", - "integrity": "sha512-lTVWHs7O2hjBFZunXTZYnYqtB9GakA1lnxIf+gKq2nY5gxkkNi/lQvveW6t8gFdOHTg6nG50Xs95PrLqVpcaLg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz", + "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==", "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.3.1", - "globals": "^13.9.0", + "espree": "^9.4.0", + "globals": "^13.19.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", - "minimatch": "^3.0.4", + "minimatch": "^3.1.2", "strip-json-comments": "^3.1.1" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.9.5", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz", - "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==", + "version": "0.11.8", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", + "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", "dev": true, "dependencies": { "@humanwhocodes/object-schema": "^1.2.1", "debug": "^4.1.1", - "minimatch": "^3.0.4" + "minimatch": "^3.0.5" }, "engines": { "node": ">=10.10.0" } }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, "node_modules/@humanwhocodes/object-schema": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", @@ -690,9 +706,9 @@ "dev": true }, "node_modules/acorn": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", - "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", + "version": "8.8.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", + "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -2174,13 +2190,15 @@ } }, "node_modules/eslint": { - "version": "8.14.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.14.0.tgz", - "integrity": "sha512-3/CE4aJX7LNEiE3i6FeodHmI/38GZtWCsAtsymScmzYapx8q1nVVb+eLcLSzATmCPXw5pT4TqVs1E0OmxAd9tw==", + "version": "8.32.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz", + "integrity": "sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ==", "dev": true, "dependencies": { - "@eslint/eslintrc": "^1.2.2", - "@humanwhocodes/config-array": "^0.9.2", + "@eslint/eslintrc": "^1.4.1", + "@humanwhocodes/config-array": "^0.11.8", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -2190,30 +2208,32 @@ "eslint-scope": "^7.1.1", "eslint-utils": "^3.0.0", "eslint-visitor-keys": "^3.3.0", - "espree": "^9.3.1", + "espree": "^9.4.0", "esquery": "^1.4.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", - "functional-red-black-tree": "^1.0.1", - "glob-parent": "^6.0.1", - "globals": "^13.6.0", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "grapheme-splitter": "^1.0.4", "ignore": "^5.2.0", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-sdsl": "^4.1.4", "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", - "minimatch": "^3.0.4", + "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.1", "regexpp": "^3.2.0", "strip-ansi": "^6.0.1", "strip-json-comments": "^3.1.0", - "text-table": "^0.2.0", - "v8-compile-cache": "^2.0.3" + "text-table": "^0.2.0" }, "bin": { "eslint": "bin/eslint.js" @@ -2226,16 +2246,16 @@ } }, "node_modules/eslint-config-wikimedia": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.23.0.tgz", - "integrity": "sha512-miZGPrfSZL9RcsSn8OSiQWZpeeMc3xCgIIimNWF6C+8Nfd38gb1FCdcgKQFC7HscFanMQL21DaPErMJVW+FB1Q==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.24.0.tgz", + "integrity": "sha512-8oH/YhJ87ONSmuRfATgx8U7Jcwz3tBemrh6YOezIfj9f2QfE71ZhaKZrNPdfS7vIklLor/cB9vX7sxN10nz8xw==", "dev": true, "dependencies": { "browserslist-config-wikimedia": "^0.4.0", - "eslint": "^8.14.0", + "eslint": "^8.31.0", "eslint-plugin-compat": "^4.0.2", "eslint-plugin-es-x": "^5.2.1", - "eslint-plugin-jsdoc": "^38.1.6", + "eslint-plugin-jsdoc": "39.2.2", "eslint-plugin-json-es": "^1.5.7", "eslint-plugin-mediawiki": "^0.4.0", "eslint-plugin-mocha": "^9.0.0", @@ -2290,27 +2310,41 @@ } }, "node_modules/eslint-plugin-jsdoc": { - "version": "38.1.6", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-38.1.6.tgz", - "integrity": "sha512-n4s95oYlg0L43Bs8C0dkzIldxYf8pLCutC/tCbjIdF7VDiobuzPI+HZn9Q0BvgOvgPNgh5n7CSStql25HUG4Tw==", + "version": "39.2.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.2.2.tgz", + "integrity": "sha512-ybkvja0p9JRzHEd2ST9h+Z47DLOuPyXpeb6r18/zKHdMmggPU1J0/zl+F0phea8ze9rMxi42MJVmGXi2NZ7PpA==", "dev": true, "dependencies": { - "@es-joy/jsdoccomment": "~0.22.1", + "@es-joy/jsdoccomment": "~0.23.1", "comment-parser": "1.3.1", "debug": "^4.3.4", "escape-string-regexp": "^4.0.0", "esquery": "^1.4.0", - "regextras": "^0.8.0", - "semver": "^7.3.5", + "semver": "^7.3.7", "spdx-expression-parse": "^3.0.1" }, "engines": { - "node": "^12 || ^14 || ^16 || ^17" + "node": "^14 || ^16 || ^17" }, "peerDependencies": { "eslint": "^7.0.0 || ^8.0.0" } }, + "node_modules/eslint-plugin-jsdoc/node_modules/semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/eslint-plugin-json-es": { "version": "1.5.7", "resolved": "https://registry.npmjs.org/eslint-plugin-json-es/-/eslint-plugin-json-es-1.5.7.tgz", @@ -2578,17 +2612,20 @@ } }, "node_modules/espree": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz", - "integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==", + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz", + "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==", "dev": true, "dependencies": { - "acorn": "^8.7.0", - "acorn-jsx": "^5.3.1", + "acorn": "^8.8.0", + "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^3.3.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/esquery": { @@ -2838,12 +2875,6 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, - "node_modules/functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", - "dev": true - }, "node_modules/get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -3108,9 +3139,9 @@ } }, "node_modules/globals": { - "version": "13.13.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz", - "integrity": "sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==", + "version": "13.19.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz", + "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -3154,6 +3185,12 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, + "node_modules/grapheme-splitter": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", + "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "dev": true + }, "node_modules/grunt-banana-checker": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/grunt-banana-checker/-/grunt-banana-checker-0.10.0.tgz", @@ -3460,6 +3497,15 @@ "node": ">=8" } }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/is-plain-obj": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", @@ -3523,6 +3569,16 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, + "node_modules/js-sdsl": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz", + "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==", + "dev": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/js-sdsl" + } + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -4816,15 +4872,6 @@ "url": "https://github.com/sponsors/mysticatea" } }, - "node_modules/regextras": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz", - "integrity": "sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==", - "dev": true, - "engines": { - "node": ">=0.1.14" - } - }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -6391,9 +6438,9 @@ } }, "@es-joy/jsdoccomment": { - "version": "0.22.2", - "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.22.2.tgz", - "integrity": "sha512-pM6WQKcuAtdYoqCsXSvVSu3Ij8K0HY50L8tIheOKHDl0wH1uA4zbP88etY8SIeP16NVCMCTFU+Q2DahSKheGGQ==", + "version": "0.23.6", + "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.23.6.tgz", + "integrity": "sha512-cCtumxG+qrYORGeOkDQ58GtSt/bb2XiP9GC0x2YduoUEX2EmBQ48FtoZMUs+8wiIdTDN1izUiRUD2FDu+p+Lvg==", "dev": true, "requires": { "comment-parser": "1.3.1", @@ -6402,33 +6449,39 @@ } }, "@eslint/eslintrc": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.2.tgz", - "integrity": "sha512-lTVWHs7O2hjBFZunXTZYnYqtB9GakA1lnxIf+gKq2nY5gxkkNi/lQvveW6t8gFdOHTg6nG50Xs95PrLqVpcaLg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz", + "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==", "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.3.1", - "globals": "^13.9.0", + "espree": "^9.4.0", + "globals": "^13.19.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", - "minimatch": "^3.0.4", + "minimatch": "^3.1.2", "strip-json-comments": "^3.1.1" } }, "@humanwhocodes/config-array": { - "version": "0.9.5", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz", - "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==", + "version": "0.11.8", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", + "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", "dev": true, "requires": { "@humanwhocodes/object-schema": "^1.2.1", "debug": "^4.1.1", - "minimatch": "^3.0.4" + "minimatch": "^3.0.5" } }, + "@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true + }, "@humanwhocodes/object-schema": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", @@ -6587,9 +6640,9 @@ "dev": true }, "acorn": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", - "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", + "version": "8.8.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", + "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", "dev": true }, "acorn-jsx": { @@ -7727,13 +7780,15 @@ "dev": true }, "eslint": { - "version": "8.14.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.14.0.tgz", - "integrity": "sha512-3/CE4aJX7LNEiE3i6FeodHmI/38GZtWCsAtsymScmzYapx8q1nVVb+eLcLSzATmCPXw5pT4TqVs1E0OmxAd9tw==", + "version": "8.32.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz", + "integrity": "sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ==", "dev": true, "requires": { - "@eslint/eslintrc": "^1.2.2", - "@humanwhocodes/config-array": "^0.9.2", + "@eslint/eslintrc": "^1.4.1", + "@humanwhocodes/config-array": "^0.11.8", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -7743,43 +7798,45 @@ "eslint-scope": "^7.1.1", "eslint-utils": "^3.0.0", "eslint-visitor-keys": "^3.3.0", - "espree": "^9.3.1", + "espree": "^9.4.0", "esquery": "^1.4.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", - "functional-red-black-tree": "^1.0.1", - "glob-parent": "^6.0.1", - "globals": "^13.6.0", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "grapheme-splitter": "^1.0.4", "ignore": "^5.2.0", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-sdsl": "^4.1.4", "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", - "minimatch": "^3.0.4", + "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.1", "regexpp": "^3.2.0", "strip-ansi": "^6.0.1", "strip-json-comments": "^3.1.0", - "text-table": "^0.2.0", - "v8-compile-cache": "^2.0.3" + "text-table": "^0.2.0" } }, "eslint-config-wikimedia": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.23.0.tgz", - "integrity": "sha512-miZGPrfSZL9RcsSn8OSiQWZpeeMc3xCgIIimNWF6C+8Nfd38gb1FCdcgKQFC7HscFanMQL21DaPErMJVW+FB1Q==", + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/eslint-config-wikimedia/-/eslint-config-wikimedia-0.24.0.tgz", + "integrity": "sha512-8oH/YhJ87ONSmuRfATgx8U7Jcwz3tBemrh6YOezIfj9f2QfE71ZhaKZrNPdfS7vIklLor/cB9vX7sxN10nz8xw==", "dev": true, "requires": { "browserslist-config-wikimedia": "^0.4.0", - "eslint": "^8.14.0", + "eslint": "^8.31.0", "eslint-plugin-compat": "^4.0.2", "eslint-plugin-es-x": "^5.2.1", - "eslint-plugin-jsdoc": "^38.1.6", + "eslint-plugin-jsdoc": "39.2.2", "eslint-plugin-json-es": "^1.5.7", "eslint-plugin-mediawiki": "^0.4.0", "eslint-plugin-mocha": "^9.0.0", @@ -7819,19 +7876,29 @@ } }, "eslint-plugin-jsdoc": { - "version": "38.1.6", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-38.1.6.tgz", - "integrity": "sha512-n4s95oYlg0L43Bs8C0dkzIldxYf8pLCutC/tCbjIdF7VDiobuzPI+HZn9Q0BvgOvgPNgh5n7CSStql25HUG4Tw==", + "version": "39.2.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.2.2.tgz", + "integrity": "sha512-ybkvja0p9JRzHEd2ST9h+Z47DLOuPyXpeb6r18/zKHdMmggPU1J0/zl+F0phea8ze9rMxi42MJVmGXi2NZ7PpA==", "dev": true, "requires": { - "@es-joy/jsdoccomment": "~0.22.1", + "@es-joy/jsdoccomment": "~0.23.1", "comment-parser": "1.3.1", "debug": "^4.3.4", "escape-string-regexp": "^4.0.0", "esquery": "^1.4.0", - "regextras": "^0.8.0", - "semver": "^7.3.5", + "semver": "^7.3.7", "spdx-expression-parse": "^3.0.1" + }, + "dependencies": { + "semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + } } }, "eslint-plugin-json-es": { @@ -8016,13 +8083,13 @@ "dev": true }, "espree": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz", - "integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==", + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz", + "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==", "dev": true, "requires": { - "acorn": "^8.7.0", - "acorn-jsx": "^5.3.1", + "acorn": "^8.8.0", + "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^3.3.0" } }, @@ -8223,12 +8290,6 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", - "dev": true - }, "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -8436,9 +8497,9 @@ } }, "globals": { - "version": "13.13.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz", - "integrity": "sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==", + "version": "13.19.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz", + "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -8470,6 +8531,12 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, + "grapheme-splitter": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", + "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "dev": true + }, "grunt-banana-checker": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/grunt-banana-checker/-/grunt-banana-checker-0.10.0.tgz", @@ -8678,6 +8745,12 @@ "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", "dev": true }, + "is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true + }, "is-plain-obj": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", @@ -8723,6 +8796,12 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, + "js-sdsl": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz", + "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==", + "dev": true + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9724,12 +9803,6 @@ "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", "dev": true }, - "regextras": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz", - "integrity": "sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==", - "dev": true - }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", diff --git a/package.json b/package.json index ad9a6899..d90f474b 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@commitlint/cli": "^17.4.2", "@commitlint/config-conventional": "^17.4.2", "devmoji": "^2.3.0", - "eslint-config-wikimedia": "0.23.0", + "eslint-config-wikimedia": "0.24.0", "grunt-banana-checker": "0.10.0", "husky": "^8.0.3", "jsdoc": "4.0.0", From 8cd462b731789341aceec0d296c67d985c575389 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 19 Jan 2023 13:12:49 +0100 Subject: [PATCH 063/124] Localisation updates from https://translatewiki.net. --- i18n/fr.json | 2 ++ i18n/hu.json | 3 +++ i18n/ia.json | 2 ++ i18n/it.json | 1 + i18n/ja.json | 2 ++ i18n/mk.json | 2 ++ i18n/nl.json | 2 ++ i18n/pt.json | 2 ++ i18n/sl.json | 2 ++ 9 files changed, 18 insertions(+) diff --git a/i18n/fr.json b/i18n/fr.json index 4e238820..214d5f54 100644 --- a/i18n/fr.json +++ b/i18n/fr.json @@ -29,7 +29,9 @@ "citizen-action-addsection": "Ajouter un sujet", "citizen-jumptotop": "Retour au début", "citizen-search-fulltext": "Rechercher les pages contenant $1", + "citizen-search-fulltext-empty": "Rechercher du texte dans les pages", "citizen-search-mediasearch": "Rechercher des médias relatifs à $1", + "citizen-search-mediasearch-empty": "Rechercher des médias", "citizen-search-empty-desc": "Taper pour commencer la recherche", "citizen-search-noresults-title": "Oh oh ! Aucun résultat pour $1", "citizen-search-noresults-desc": "Essayer peut-être les options ci-dessous ?", diff --git a/i18n/hu.json b/i18n/hu.json index e99c9a5d..f34a2e97 100644 --- a/i18n/hu.json +++ b/i18n/hu.json @@ -2,6 +2,7 @@ "@metadata": { "authors": [ "Alistair3149", + "Eukarióta", "Hanna Tardos" ] }, @@ -12,6 +13,8 @@ "citizen-page-info-lastmod": "Utolsó módosítás", "citizen-action-addsection": "Új téma nyitása", "citizen-jumptotop": "Vissza a tetejére", + "citizen-search-fulltext-empty": "Szöveg keresése az oldalak szövegében", + "citizen-search-mediasearch-empty": "Média keresése", "prefs-citizen-theme-label": "Téma", "prefs-citizen-theme-option-auto": "Automatikus", "prefs-citizen-theme-option-light": "Világos", diff --git a/i18n/ia.json b/i18n/ia.json index 2bee480a..b4222fc5 100644 --- a/i18n/ia.json +++ b/i18n/ia.json @@ -23,7 +23,9 @@ "citizen-action-addsection": "Adder topico", "citizen-jumptotop": "Retro al initio", "citizen-search-fulltext": "Cercar paginas que contine $1", + "citizen-search-fulltext-empty": "Cercar texto in paginas", "citizen-search-mediasearch": "Cercar multimedia concernente $1", + "citizen-search-mediasearch-empty": "Cercar multimedia", "citizen-search-empty-desc": "Digita pro comenciar a cercar", "citizen-search-noresults-title": "Oh oh! Necun resultato pro $1", "citizen-search-noresults-desc": "Essayar forsan le optiones hic infra?", diff --git a/i18n/it.json b/i18n/it.json index e3570f43..2cefb513 100644 --- a/i18n/it.json +++ b/i18n/it.json @@ -21,6 +21,7 @@ "citizen-footer-tagline": "Modifica questo testo in [[MediaWiki:Citizen-footer-tagline]]", "citizen-action-addsection": "Aggiungi argomento", "citizen-jumptotop": "Torna all'inizio", + "citizen-search-mediasearch-empty": "Ricerca file multimediali", "citizen-tagline-ns-talk": "Pagina di discussione su {{SUBJECTPAGENAME}}", "citizen-tagline-ns-project": "Informazioni su {{SITENAME}}", "citizen-tagline-ns-file": "File su {{SITENAME}}", diff --git a/i18n/ja.json b/i18n/ja.json index 799f298a..25a4079b 100644 --- a/i18n/ja.json +++ b/i18n/ja.json @@ -19,6 +19,8 @@ "citizen-action-addsection": "話題を追加", "citizen-jumptotop": "トップに戻る", "citizen-search-fulltext": "$1を含むページを検索", + "citizen-search-fulltext-empty": "ページ内のテキストを検索する", + "citizen-search-mediasearch-empty": "メディアを検索", "citizen-search-noresults-title": "$1に関する結果はありません", "citizen-search-noresults-desc": "以下のオプションを試す", "prefs-citizen-theme-label": "テーマ", diff --git a/i18n/mk.json b/i18n/mk.json index 6dfe3811..64d8b2f3 100644 --- a/i18n/mk.json +++ b/i18n/mk.json @@ -26,7 +26,9 @@ "citizen-action-addsection": "Додај тема", "citizen-jumptotop": "Најгоре", "citizen-search-fulltext": "Пребарај страници што содржат $1", + "citizen-search-fulltext-empty": "Пребарај текст во страници", "citizen-search-mediasearch": "Пребарајте податотеки поврзани со $1", + "citizen-search-mediasearch-empty": "Пребарај слики/снимки", "citizen-search-empty-desc": "Внесете текст за да почнете да пребарувате", "citizen-search-noresults-title": "За жал, не најдов ништо за $1", "citizen-search-noresults-desc": "Да ги пробаме можностите подолу?", diff --git a/i18n/nl.json b/i18n/nl.json index e1e40d5e..09a65e72 100644 --- a/i18n/nl.json +++ b/i18n/nl.json @@ -19,6 +19,8 @@ "citizen-footer-tagline": "Bewerk deze tekst op [[MediaWiki:Citizen-footer-tagline]]", "citizen-action-addsection": "Onderwerp toevoegen", "citizen-jumptotop": "Terug naar boven", + "citizen-search-fulltext-empty": "Tekst zoeken op pagina's", + "citizen-search-mediasearch-empty": "Media zoeken", "citizen-search-empty-desc": "Type om te beginnen met zoeken", "citizen-tagline-ns-talk": "Overlegpagina van {{SUBJECTPAGENAME}}", "citizen-tagline-ns-project": "Informatie over {{SITENAME}}", diff --git a/i18n/pt.json b/i18n/pt.json index b337cdaa..5dc9383c 100644 --- a/i18n/pt.json +++ b/i18n/pt.json @@ -25,7 +25,9 @@ "citizen-action-addsection": "Adicionar tópico", "citizen-jumptotop": "Voltar ao topo", "citizen-search-fulltext": "Procurar páginas que contenham $1", + "citizen-search-fulltext-empty": "Pesquisar texto nas páginas", "citizen-search-mediasearch": "Procurar conteúdo multimédia relacionado com $1", + "citizen-search-mediasearch-empty": "Pesquisar multimédia", "citizen-search-empty-desc": "Escrever para começar a procurar", "citizen-search-noresults-title": "Não há resultados para $1", "citizen-search-noresults-desc": "Talvez queira tentar as opções abaixo?", diff --git a/i18n/sl.json b/i18n/sl.json index 72f0cf45..032d6820 100644 --- a/i18n/sl.json +++ b/i18n/sl.json @@ -25,7 +25,9 @@ "citizen-action-addsection": "Dodaj temo", "citizen-jumptotop": "Nazaj na vrh", "citizen-search-fulltext": "Poiščite strani, ki vsebujejo $1", + "citizen-search-fulltext-empty": "Iskanje besedila na straneh", "citizen-search-mediasearch": "Iskanje predstavnosti, povezanih z $1", + "citizen-search-mediasearch-empty": "Iskanje predstavnosti", "citizen-search-empty-desc": "Vnesite za začetek iskanja", "citizen-search-noresults-title": "Ojoj! Ni zadetkov za $1", "citizen-search-noresults-desc": "Morda poskusite s spodnjimi možnostmi?", From a7406d8e3247b7a3a1a8a97b51d295e1beb4ad87 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Fri, 20 Jan 2023 20:18:58 -0500 Subject: [PATCH 064/124] =?UTF-8?q?fix(core):=20=F0=9F=90=9B=20default=20t?= =?UTF-8?q?o=20auto=20theme=20unless=20set?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- includes/Hooks/SkinHooks.php | 2 +- resources/skins.citizen.scripts/inline.js | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/includes/Hooks/SkinHooks.php b/includes/Hooks/SkinHooks.php index 196e3544..87bffc5b 100644 --- a/includes/Hooks/SkinHooks.php +++ b/includes/Hooks/SkinHooks.php @@ -62,7 +62,7 @@ class SkinHooks implements $script = sprintf( '%s', $nonce !== false ? sprintf( ' nonce="%s"', $nonce ) : '', - 'window.applyPref=()=>{const a="skin-citizen-",b="skin-citizen-theme",c=a=>window.localStorage.getItem(a),d=c("skin-citizen-theme"),e=()=>{const d={fontsize:"font-size",pagewidth:"--width-layout",lineheight:"--line-height"},e=()=>["auto","dark","light"].map(b=>a+b),f=a=>{let b=document.getElementById("citizen-style");null===b&&(b=document.createElement("style"),b.setAttribute("id","citizen-style"),document.head.appendChild(b)),b.textContent=`:root{${a}}`};try{const g=c(b);let h="";if(null!==g){const b=document.documentElement;b.classList.remove(...e(a)),b.classList.add(a+g)}for(const[b,e]of Object.entries(d)){const d=c(a+b);null!==d&&(h+=`${e}:${d};`)}h&&f(h)}catch(a){}};if("auto"===d){const a=window.matchMedia("(prefers-color-scheme: dark)"),c=a.matches?"dark":"light",d=(a,b)=>window.localStorage.setItem(a,b);d(b,c),e(),a.addEventListener("change",()=>{e()}),d(b,"auto")}else e()},(()=>{window.applyPref()})();' + 'window.applyPref=()=>{const a="skin-citizen-",b="skin-citizen-theme",c=a=>window.localStorage.getItem(a),d=c("skin-citizen-theme")??"auto",e=()=>{const d={fontsize:"font-size",pagewidth:"--width-layout",lineheight:"--line-height"},e=()=>["auto","dark","light"].map(b=>a+b),f=a=>{let b=document.getElementById("citizen-style");null===b&&(b=document.createElement("style"),b.setAttribute("id","citizen-style"),document.head.appendChild(b)),b.textContent=`:root{${a}}`};try{const g=c(b);let h="";if(null!==g){const b=document.documentElement;b.classList.remove(...e(a)),b.classList.add(a+g)}for(const[b,e]of Object.entries(d)){const d=c(a+b);null!==d&&(h+=`${e}:${d};`)}h&&f(h)}catch(a){}};if("auto"===d){const a=window.matchMedia("(prefers-color-scheme: dark)"),c=a.matches?"dark":"light",d=(a,b)=>window.localStorage.setItem(a,b);d(b,c),e(),a.addEventListener("change",()=>{e()}),d(b,"auto")}else e()},(()=>{window.applyPref()})();' ); // phpcs:enable Generic.Files.LineLength.TooLong diff --git a/resources/skins.citizen.scripts/inline.js b/resources/skins.citizen.scripts/inline.js index 04439016..9f3213aa 100644 --- a/resources/skins.citizen.scripts/inline.js +++ b/resources/skins.citizen.scripts/inline.js @@ -1,9 +1,7 @@ /* * Citizen + * * Inline script used in includes/Hooks/SkinHooks.php - * - * https://starcitizen.tools - * * Mangle using https://jscompress.com/ */ window.applyPref = () => { @@ -15,7 +13,8 @@ window.applyPref = () => { return window.localStorage.getItem( key ); }; - const targetTheme = getStorage( themeKey ); + // Default to auto if no key is present + const targetTheme = getStorage( themeKey ) ?? 'auto'; const apply = () => { const cssProps = { From ca503c7f7b51cc368e68af06be0c92c6d6c9e1da Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Sat, 21 Jan 2023 14:11:08 -0500 Subject: [PATCH 065/124] =?UTF-8?q?feat(DiscussionTools):=20=E2=9C=A8=20up?= =?UTF-8?q?date=20DT=20styles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- skin.json | 3 +- .../ext.discussionTools.ReplyWidget.less | 31 ++++--- ...ext.discussionTools.ReplyWidgetVisual.less | 21 +++++ .../ext.discussionTools.init.less | 22 ----- .../ext.discussionTools.init.styles.less | 88 +++++++++++++++++++ 6 files changed, 129 insertions(+), 38 deletions(-) create mode 100644 skinStyles/extensions/DiscussionTools/ext.discussionTools.ReplyWidgetVisual.less delete mode 100644 skinStyles/extensions/DiscussionTools/ext.discussionTools.init.less create mode 100644 skinStyles/extensions/DiscussionTools/ext.discussionTools.init.styles.less diff --git a/README.md b/README.md index d21fe94e..26a0b780 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Name | Grade | Version | Last updated [CodeEditor](https://www.mediawiki.org/wiki/Extension:CodeEditor) | A | REL1_39 `67c012c` | 2022-12-15 [CodeMirror](https://www.mediawiki.org/wiki/Extension:CodeMirror) | A | REL1_35 `a326407` | 2021-08-25 [CookieWarning](https://www.mediawiki.org/wiki/Extension:CookieWarning) | A | REL1_35 `3c2ae6a` | 2022-04-29 -[DiscussionTools](https://www.mediawiki.org/wiki/Extension:DiscussionTools) | A | REL1_35 `7aa0a9b` | 2022-05-06 +[DiscussionTools](https://www.mediawiki.org/wiki/Extension:DiscussionTools) | B | REL1_39 `1aae2cc` | 2023-01-21 [DismissableSiteNotice](https://www.mediawiki.org/wiki/Extension:DismissableSiteNotice) | A | N/A | N/A [Echo](https://www.mediawiki.org/wiki/Extension:Echo) | A | REL1_35 `347c30e` | 2021-08-11 [Flow (StructuredDiscussions)](https://www.mediawiki.org/wiki/Extension:StructuredDiscussions) | B | REL1_35 `e3379f0` | 2022-04-27 diff --git a/skin.json b/skin.json index 118c02ec..1a3625db 100644 --- a/skin.json +++ b/skin.json @@ -309,8 +309,9 @@ "+ext.CodeMirror.lib": "skinStyles/extensions/CodeMirror/ext.CodeMirror.lib.less", "+ext.CodeMirror.mode.mediawiki": "skinStyles/extensions/CodeMirror/ext.CodeMirror.mode.mediawiki.less", "+ext.CodeMirror.visualEditor.init": "skinStyles/extensions/CodeMirror/ext.CodeMirror.visualEditor.init.less", - "+ext.discussionTools.init": "skinStyles/extensions/DiscussionTools/ext.discussionTools.init.less", + "+ext.discussionTools.init.styles": "skinStyles/extensions/DiscussionTools/ext.discussionTools.init.styles.less", "+ext.discussionTools.ReplyWidget": "skinStyles/extensions/DiscussionTools/ext.discussionTools.ReplyWidget.less", + "+ext.discussionTools.ReplyWidgetVisual": "skinStyles/extensions/DiscussionTools/ext.discussionTools.ReplyWidgetVisual.less", "+ext.dismissableSiteNotice.styles": "skinStyles/extensions/DismissableSiteNotice/ext.dismissableSiteNotice.less", "+ext.echo.ui.desktop": "skinStyles/extensions/Echo/ext.echo.ui.desktop.less", "+ext.echo.ui": "skinStyles/extensions/Echo/ext.echo.ui.less", diff --git a/skinStyles/extensions/DiscussionTools/ext.discussionTools.ReplyWidget.less b/skinStyles/extensions/DiscussionTools/ext.discussionTools.ReplyWidget.less index a30f9332..c9babe02 100644 --- a/skinStyles/extensions/DiscussionTools/ext.discussionTools.ReplyWidget.less +++ b/skinStyles/extensions/DiscussionTools/ext.discussionTools.ReplyWidget.less @@ -3,31 +3,34 @@ * * SkinStyles for Extension:DiscussionTools * Module: ext.discussionTools.ReplyWidget - * Version: REL1_35 7aa0a9b + * Version: REL1_39 1aae2cc * - * Date: 2022-05-06 + * Date: 2023-01-21 */ -@import '../../../resources/variables.less'; +.ext-discussiontools-ui-replyWidget { + &-modeTabs { + .ext-discussiontools-ui-modeTab.oo-ui-optionWidget-highlighted:not( :hover ) { + border-radius: var( --border-radius--small ); + box-shadow: inset 0 0 0 2px var( --color-primary ); + color: var( --color-primary ); + } + + .ext-discussiontools-ui-modeTab.oo-ui-widget-disabled { + box-shadow: inset 0 0 0 2px var( --color-primary ); + color: var( --color-primary ); + } + } -.dt-ui-replyWidget { &-footer { color: var( --color-base--subtle ); } &-preview { - border-radius: 0 0 var( --border-radius--medium ) var( --border-radius--medium ); background: var( --color-surface-2 ); - } -} -@media only screen and ( max-width: @width-breakpoint-tablet ) { - .dt-ui-replyWidget { - // HACK: Make the toolbar two line on mobile - // So that they are not overlapping - .ve-ui-targetToolbar > .oo-ui-toolbar-bar { - padding-top: 42px; - text-align: left; + &:before { + color: var( --color-base--subtle ); } } } diff --git a/skinStyles/extensions/DiscussionTools/ext.discussionTools.ReplyWidgetVisual.less b/skinStyles/extensions/DiscussionTools/ext.discussionTools.ReplyWidgetVisual.less new file mode 100644 index 00000000..99d71ec8 --- /dev/null +++ b/skinStyles/extensions/DiscussionTools/ext.discussionTools.ReplyWidgetVisual.less @@ -0,0 +1,21 @@ +/* + * Citizen + * + * SkinStyles for Extension:DiscussionTools + * Module: ext.discussionTools.ReplyWidgetVisual + * Version: REL1_39 1aae2cc + * + * Date: 2023-01-21 +*/ + +.ext-discussiontools-ui-targetWidget { + > .ve-init-target > .ve-ui-surface { + .ve-ui-completionWidget-header > .oo-ui-labelElement-label { + color: var( --color-base ); + + > span { + color: var( --color-base--subtle ); + } + } + } +} diff --git a/skinStyles/extensions/DiscussionTools/ext.discussionTools.init.less b/skinStyles/extensions/DiscussionTools/ext.discussionTools.init.less deleted file mode 100644 index f1c2b1a7..00000000 --- a/skinStyles/extensions/DiscussionTools/ext.discussionTools.init.less +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Citizen - * - * SkinStyles for Extension:DiscussionTools - * Module: ext.discussionTools.init - * Version: REL1_35 7aa0a9b - * - * Date: 2022-05-06 -*/ - -.dt-init-replylink-buttons { - .dt-init-replylink { - // Similar to mw-editsection-bracket - &-bracket { - color: var( --color-base--subtle ); - } - } - - .dt-init-replylink-open & > a { - color: var( --color-base--subtle ); - } -} diff --git a/skinStyles/extensions/DiscussionTools/ext.discussionTools.init.styles.less b/skinStyles/extensions/DiscussionTools/ext.discussionTools.init.styles.less new file mode 100644 index 00000000..b7b8bd45 --- /dev/null +++ b/skinStyles/extensions/DiscussionTools/ext.discussionTools.init.styles.less @@ -0,0 +1,88 @@ +/* + * Citizen + * + * SkinStyles for Extension:DiscussionTools + * Module: ext.discussionTools.init.styles + * Version: REL1_39 1aae2cc + * + * Date: 2023-01-21 +*/ + +.ext-discussiontools-init-replylink-buttons { + .ext-discussiontools-init-replylink { + &-bracket { + color: var( --color-base--subtle ); + } + + &-divider { + color: var( --border-color-base ); + } + } + + .ext-discussiontools-init-replylink-open & > .ext-discussiontools-init-replylink-reply { + color: var( --color-base--subtle ); + } + + &.ext-discussiontools-init-replylink-active > .ext-discussiontools-init-replylink-reply { + color: var( --color-base ); + } +} + +.ext-discussiontools-init-publishedcomment { + background-color: var( --background-color-success ); +} + +.ext-discussiontools-init-targetcomment { + background-color: var( --background-color-primary--hover ); +} + +.ext-discussiontools-init-section-subscribe { + &-bracket { + color: var( --color-base--subtle ); + } + + &-link&-link-pending { + color: var( --color-base--subtle ); + } +} + +.ext-discussiontools-init-pageframe-latestcomment { + color: var( --color-base--subtle ); +} + +.ext-discussiontools-visualenhancements_pageframe-enabled { + .ext-discussiontools-init-sidebar-meta { + color: var( --color-base--subtle ); + } +} + +.ext-discussiontools-visualenhancements-enabled { + .ext-discussiontools-init-section { + border-top-color: var( --border-color-base ); + + &-metaitem { + color: var( --color-base--subtle ); + + & + .ext-discussiontools-init-section-metaitem { + border-left-color: var( --border-color-base ); + } + } + } + + h2.ext-discussiontools-ui-newTopic-sectionTitle .oo-ui-inputWidget-input { + font-family: var( --font-family-base ); + font-weight: var( --font-weight-semibold ); + } +} + +.ext-discussiontools-emptystate { + .mw-parser-output:not( .noarticletext ) & { + border-top-color: var( --border-color-base ); + } +} + +.ext-discussiontools-autotopicsubpopup { + &-title { + font-weight: var( --font-weight-semibold ); + } +} From 08cd314432dc139bca09c03111db70a01ec73802 Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Sat, 21 Jan 2023 14:33:39 -0500 Subject: [PATCH 066/124] =?UTF-8?q?feat(core):=20=E2=9C=A8=20use=20Citizen?= =?UTF-8?q?=20monospace=20fonts=20for=20diff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skinStyles/mediawiki/mediawiki.diff.styles.less | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/skinStyles/mediawiki/mediawiki.diff.styles.less b/skinStyles/mediawiki/mediawiki.diff.styles.less index 3f494c67..9fdbef4e 100644 --- a/skinStyles/mediawiki/mediawiki.diff.styles.less +++ b/skinStyles/mediawiki/mediawiki.diff.styles.less @@ -45,6 +45,16 @@ &-context { font-size: 0.8125rem; // relative font size } + + &-editfont-monospace { + .diff { + &-addedline, + &-deletedline, + &-context { + font-family: var( --font-family-monospace ); + } + } + } } .mw-diff-movedpara-left:after, From 6ce8d2d1f4c6b5ecc8e2ff8f606ed1f279a95d8a Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Sat, 21 Jan 2023 14:34:08 -0500 Subject: [PATCH 067/124] =?UTF-8?q?feat(RevisionSilder):=20=E2=9C=A8=20add?= =?UTF-8?q?=20color=20to=20bar=20chart?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RevisionSlider/ext.RevisionSlider.init.less | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/skinStyles/extensions/RevisionSlider/ext.RevisionSlider.init.less b/skinStyles/extensions/RevisionSlider/ext.RevisionSlider.init.less index 5a312bcf..d21cabdc 100644 --- a/skinStyles/extensions/RevisionSlider/ext.RevisionSlider.init.less +++ b/skinStyles/extensions/RevisionSlider/ext.RevisionSlider.init.less @@ -11,6 +11,16 @@ .mw-revslider-revision { border-color: var( --color-surface-3 ); background-color: var( --color-surface-3 ); + + &.mw-revslider-revision-up { + border-color: var( --color-success ); + background-color: var( --color-success ); + } + + &.mw-revslider-revision-down { + border-color: var( --color-destructive ); + background-color: var( --color-destructive ); + } } .mw-revslider-revision-new, From 63a35d27745a36b7aea7abf2c16533047344b76e Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Sat, 21 Jan 2023 14:51:41 -0500 Subject: [PATCH 068/124] =?UTF-8?q?chore(release):=20=F0=9F=9A=80=202.3.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 20 ++++++++++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- skin.json | 2 +- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19ffdd28..59d543cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,26 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [2.3.5](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/compare/v2.3.4...v2.3.5) (2023-01-21) + + +### Features + +* **core:** ✨ use Citizen monospace fonts for diff ([08cd314](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/08cd314432dc139bca09c03111db70a01ec73802)) +* **DiscussionTools:** ✨ update DT styles ([ca503c7](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/ca503c7f7b51cc368e68af06be0c92c6d6c9e1da)) +* **pwa:** ✨ use proper manifest type instead of json ([d73fa67](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/d73fa67a3184aef1ffe8a4364484acc183662e7b)) +* **RevisionSilder:** ✨ add color to bar chart ([6ce8d2d](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/6ce8d2d1f4c6b5ecc8e2ff8f606ed1f279a95d8a)) + + +### Bug Fixes + +* **core:** 🐛 default to auto theme unless set ([a7406d8](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/a7406d8e3247b7a3a1a8a97b51d295e1beb4ad87)) +* **core:** 🐛 incorrect signup stats selector ([7a6dfc6](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/7a6dfc6645faa20a8b57e0bbec301a45c2f6b5c4)) +* **core:** 🐛 increase mw-body-header z-index ([aeb8e16](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/aeb8e160cfccfe6cc0686bbf909045770f9b1a90)) +* **core:** 🐛 stricter selector for sign up form container ([e4851f9](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/e4851f9de2bc2cd01f650cb55899de17fcf9d104)) +* **pwa:** 🐛 declare before adding array ([68cb9b6](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/68cb9b6c68cb63022f59c77604a34288ca04d751)) +* **pwa:** 🐛 incorrect var type ([e78ebd7](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/e78ebd716568dc1362542f2302ca433174a010d3)) + ### [2.3.4](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/compare/v2.3.3...v2.3.4) (2023-01-17) diff --git a/package-lock.json b/package-lock.json index 398f4276..8df9a5bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "mediawiki-skins-Citizen", - "version": "2.3.4", + "version": "2.3.5", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "2.3.4", + "version": "2.3.5", "devDependencies": { "@commitlint/cli": "^17.4.2", "@commitlint/config-conventional": "^17.4.2", diff --git a/package.json b/package.json index d90f474b..0dc7c9c3 100644 --- a/package.json +++ b/package.json @@ -30,5 +30,5 @@ "stylelint-config-wikimedia": "0.13.1", "svgo": "3.0.2" }, - "version": "2.3.4" + "version": "2.3.5" } diff --git a/skin.json b/skin.json index 1a3625db..bc3b347f 100644 --- a/skin.json +++ b/skin.json @@ -1,6 +1,6 @@ { "name": "Citizen", - "version": "2.3.4", + "version": "2.3.5", "author": [ "[https://www.mediawiki.org/wiki/User:Alistair3149 Alistair3149]", "[https://www.mediawiki.org/wiki/User:Octfx Octfx]", From 8aca2e8b68555790f631176ef03b8e77748b54d6 Mon Sep 17 00:00:00 2001 From: CosmicAlpha Date: Sat, 21 Jan 2023 16:11:41 -0700 Subject: [PATCH 069/124] refactor(core): ensure that shouldShowPageTools() returns a bool (#573) --- includes/Partials/PageTools.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/Partials/PageTools.php b/includes/Partials/PageTools.php index 8878756f..44aac68b 100644 --- a/includes/Partials/PageTools.php +++ b/includes/Partials/PageTools.php @@ -135,7 +135,7 @@ final class PageTools extends Partial { } } - return $condition; + return (bool)$condition; } /** From b1a2604c68a1bb9282fceafdc83e03b61c2e23b0 Mon Sep 17 00:00:00 2001 From: paladox Date: Sat, 21 Jan 2023 23:18:57 +0000 Subject: [PATCH 070/124] ci: test against PHP 8.0, 8.1, and 8.2 (#574) * Test against php 8.0. and 8.1 * Test against PHP 8.3 Co-authored-by: alistair3149 --- .github/workflows/mediawiki.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mediawiki.yml b/.github/workflows/mediawiki.yml index 08aa0d8f..16c6ff8f 100644 --- a/.github/workflows/mediawiki.yml +++ b/.github/workflows/mediawiki.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: ['7.4'] + php-versions: ['8.2', '8.1', '8.0', '7.4'] steps: - name: Cancel Previous Runs uses: styfle/cancel-workflow-action@0.11.0 From 5ebd7ad0255e05eaaa76aae9612b6b954de333ce Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Mon, 23 Jan 2023 00:17:24 -0500 Subject: [PATCH 071/124] =?UTF-8?q?feat(core):=20=E2=9C=A8=20remove=20plai?= =?UTF-8?q?nlist=20styles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It should not be a part of the skin as it belongs to a template --- resources/skins.citizen.styles/common/content.less | 7 ------- 1 file changed, 7 deletions(-) diff --git a/resources/skins.citizen.styles/common/content.less b/resources/skins.citizen.styles/common/content.less index a48c4a50..40536941 100644 --- a/resources/skins.citizen.styles/common/content.less +++ b/resources/skins.citizen.styles/common/content.less @@ -37,10 +37,3 @@ } } } - -.plainlist ol, -.plainlist ul { - margin: 0; - line-height: inherit; - list-style: none none; -} From 304dc4b4ced54a72b9600d4ce5c9cd44899dccf7 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 23 Jan 2023 13:10:04 +0100 Subject: [PATCH 072/124] Localisation updates from https://translatewiki.net. --- i18n/ko.json | 1 + i18n/sh.json | 1 + 2 files changed, 2 insertions(+) diff --git a/i18n/ko.json b/i18n/ko.json index 831c0667..853036f8 100644 --- a/i18n/ko.json +++ b/i18n/ko.json @@ -26,6 +26,7 @@ "citizen-jumptotop": "맨 위로 돌아가기", "citizen-search-fulltext": "$1 포함된 문서 검색", "citizen-search-mediasearch": "$1 관련 미디어 검색", + "citizen-search-mediasearch-empty": "미디어 검색", "citizen-search-empty-desc": "검색을 시작하려면 입력하세요", "citizen-search-noresults-title": "저런! $1 관련 결과가 없습니다", "citizen-search-noresults-desc": "아래 옵션을 시도해 볼까요?", diff --git a/i18n/sh.json b/i18n/sh.json index b6bf5560..c0e9a2fe 100644 --- a/i18n/sh.json +++ b/i18n/sh.json @@ -11,6 +11,7 @@ "citizen-sitestats-images-label": "datoteka", "citizen-sitestats-users-label": "korisnika", "citizen-sitestats-edits-label": "izmjena", + "citizen-page-info-copyright": "Autorska prava", "citizen-page-info-credits": "Zasluge", "citizen-page-info-lastmod": "Posljednja promjena", "citizen-action-addsection": "Dodaj temu", From 393c7e1d764760264919bdd24b860d6e9edc85dc Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Wed, 25 Jan 2023 18:12:04 -0500 Subject: [PATCH 073/124] =?UTF-8?q?refactor(core):=20=E2=99=BB=EF=B8=8F=20?= =?UTF-8?q?use=20core=20selector=20to=20fix=20gallery=20padding?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mediawiki/mediawiki.page.gallery.styles.less | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/skinStyles/mediawiki/mediawiki.page.gallery.styles.less b/skinStyles/mediawiki/mediawiki.page.gallery.styles.less index e8ad0436..23f5bdce 100644 --- a/skinStyles/mediawiki/mediawiki.page.gallery.styles.less +++ b/skinStyles/mediawiki/mediawiki.page.gallery.styles.less @@ -3,19 +3,12 @@ * https://starcitizen.tools */ -ul.gallery { +// T326017 +ul.gallery.gallery.gallery { padding: 0; margin: var( --space-xxs ) 0; } -// TODO: Remove when T327016 is fixed -.mw-content-ltr ul.gallery, -.mw-content-rtl .mw-content-ltr ul.gallery, -.mw-content-rtl ul.gallery, -.mw-content-ltr .mw-content-rtl ul.gallery { - margin: var( --space-xxs ) 0; -} - // Sync with caption styles div.gallerytext { padding: 0; From ef955c28a0a5644a2f95c66eeb18ce0ddf1ab3bb Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Wed, 25 Jan 2023 19:40:52 -0500 Subject: [PATCH 074/124] =?UTF-8?q?feat(core):=20=E2=9C=A8=20use=20MW=20co?= =?UTF-8?q?re=20checkboxHack=20instead?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We no longer need to emulate the same feature when it is in core --- resources/skins.citizen.scripts/checkbox.js | 100 +++++++ .../skins.citizen.scripts/checkboxHack.js | 270 ------------------ resources/skins.citizen.scripts/skin.js | 56 +--- skin.json | 5 +- templates/Drawer.mustache | 2 +- templates/PageTools.mustache | 12 +- templates/PageTools__languages.mustache | 8 +- templates/Search.mustache | 2 +- templates/TableOfContents.mustache | 18 +- templates/UserMenu.mustache | 12 +- 10 files changed, 135 insertions(+), 350 deletions(-) create mode 100644 resources/skins.citizen.scripts/checkbox.js delete mode 100644 resources/skins.citizen.scripts/checkboxHack.js diff --git a/resources/skins.citizen.scripts/checkbox.js b/resources/skins.citizen.scripts/checkbox.js new file mode 100644 index 00000000..0799a51d --- /dev/null +++ b/resources/skins.citizen.scripts/checkbox.js @@ -0,0 +1,100 @@ +/** + * Extend core checkboxHacks + * + * @see https://github.com/wikimedia/Vector/blob/master/resources/skins.vector.js/checkbox.js + */ + +const + checkboxHack = require( 'mediawiki.page.ready' ).checkboxHack, + CHECKBOX_HACK_CONTAINER_SELECTOR = '.mw-checkbox-hack-container', + CHECKBOX_HACK_CHECKBOX_SELECTOR = '.mw-checkbox-hack-checkbox', + CHECKBOX_HACK_BUTTON_SELECTOR = '.mw-checkbox-hack-button', + CHECKBOX_HACK_TARGET_SELECTOR = '.mw-checkbox-hack-target'; + +/** + * Set the checked state and fire the 'input' event. + * Copied from core as it is not accessible outside + * + * @param {HTMLInputElement} checkbox + * @param {boolean} checked + * @return {void} + * @ignore + */ +function setCheckedState( checkbox, checked ) { + /** @type {Event} @ignore */ + checkbox.checked = checked; + // Chrome and Firefox sends the builtin Event with .bubbles == true and .composed == true. + let e; + if ( typeof Event === 'function' ) { + e = new Event( 'input', { bubbles: true, composed: true } ); + } + checkbox.dispatchEvent( e ); +} + +/** + * Dismiss the target when ESCAPE is pressed. + * + * @param {Window} window + * @param {HTMLInputElement} checkbox + * @return {function(): void} Cleanup function that removes the added event listeners. + * @ignore + */ +function bindDismissOnEscape( window, checkbox ) { + const onKeyup = ( /** @type {KeyboardEvent} */ event ) => { + // Only handle ESCAPE + if ( event.key !== 'Escape' ) { + return; + } + setCheckedState( checkbox, false ); + }; + + window.addEventListener( 'keyup', onKeyup, true ); + return function () { + window.removeEventListener( 'keyup', onKeyup ); + }; +} + +/** + * Close all menus through unchecking all checkbox hacks + * + * @return {void} + */ +function uncheckCheckboxHacks() { + const checkboxes = document.querySelectorAll( CHECKBOX_HACK_CHECKBOX_SELECTOR + ':checked' ); + + checkboxes.forEach( ( checkbox ) => { + setCheckedState( checkbox, false ); + } ); +} + +/** + * Enhance dropdownMenu functionality and accessibility using core's checkboxHack. + * Based on Vector + * + * @return {void} + */ +function bind() { + // Search for all dropdown containers using the CHECKBOX_HACK_CONTAINER_SELECTOR. + const containers = document.querySelectorAll( CHECKBOX_HACK_CONTAINER_SELECTOR ); + + containers.forEach( ( container ) => { + const + checkbox = container.querySelector( CHECKBOX_HACK_CHECKBOX_SELECTOR ), + button = container.querySelector( CHECKBOX_HACK_BUTTON_SELECTOR ), + target = container.querySelector( CHECKBOX_HACK_TARGET_SELECTOR ); + + if ( !( checkbox && button && target ) ) { + return; + } + + // Core CheckboxHack + checkboxHack.bind( window, checkbox, button, target ); + // Citizen CheckboxHack + bindDismissOnEscape( window, checkbox ); + } ); +} + +module.exports = { + bind: bind, + uncheckCheckboxHacks: uncheckCheckboxHacks +}; diff --git a/resources/skins.citizen.scripts/checkboxHack.js b/resources/skins.citizen.scripts/checkboxHack.js deleted file mode 100644 index a17da454..00000000 --- a/resources/skins.citizen.scripts/checkboxHack.js +++ /dev/null @@ -1,270 +0,0 @@ -/** - * Based on the core checkboxHack, - * backported because some features are not avaliable in 1.35, - * see https://github.com/wikimedia/mediawiki/blob/master/resources/src/mediawiki.page.ready/checkboxHack.js - * - * TODO: Use core module when we move to 1.39 - */ - -/** - * Revise the button's `aria-expanded` state to match the checked state. - * - * @param {HTMLInputElement} checkbox - * @return {void} - * @ignore - */ -function updateAriaExpanded( checkbox ) { - checkbox.setAttribute( 'aria-expanded', checkbox.checked.toString() ); -} - -/** - * Set the checked state and fire the 'input' event. - * Programmatic changes to checkbox.checked do not trigger an input or change event. - * The input event in turn will call updateAriaExpanded(). - * - * setCheckedState() is called when a user event on some element other than the checkbox - * should result in changing the checkbox state. - * - * Per https://html.spec.whatwg.org/multipage/indices.html#event-input - * Input event is fired at controls when the user changes the value. - * Per https://html.spec.whatwg.org/multipage/input.html#checkbox-state-(type=checkbox):event-input - * Fire an event named input at the element with the bubbles attribute initialized to true. - * - * https://html.spec.whatwg.org/multipage/indices.html#event-change - * For completeness the 'change' event should be fired too, - * however we make no use of the 'change' event, - * nor expect it to be used, thus firing it - * would be unnecessary load. - * - * @param {HTMLInputElement} checkbox - * @param {boolean} checked - * @return {void} - * @ignore - */ -function setCheckedState( checkbox, checked ) { - /** @type {Event} @ignore */ - let e; - checkbox.checked = checked; - // Chrome and Firefox sends the builtin Event with .bubbles == true and .composed == true. - if ( typeof Event === 'function' ) { - e = new Event( 'input', { bubbles: true, composed: true } ); - } else { - // IE 9-11, FF 6-10, Chrome 9-14, Safari 5.1, Opera 11.5, Android 3-4.3 - e = document.createEvent( 'CustomEvent' ); - if ( !e ) { - return; - } - e.initCustomEvent( 'input', true /* canBubble */, false, false ); - } - checkbox.dispatchEvent( e ); -} - -/** - * Returns true if the Event's target is an inclusive descendant of any the checkbox hack's - * constituents (checkbox, button, or target), and false otherwise. - * - * @param {HTMLInputElement} checkbox - * @param {HTMLElement} button - * @param {Node} target - * @param {Event} event - * @return {boolean} - * @ignore - */ -function containsEventTarget( checkbox, button, target, event ) { - return event.target instanceof Node && ( - checkbox.contains( event.target ) || - button.contains( event.target ) || - target.contains( event.target ) - ); -} - -/** - * Dismiss the target when event is outside the checkbox, button, and target. - * In simple terms this closes the target (menu, typically) when clicking somewhere else. - * - * @param {HTMLInputElement} checkbox - * @param {HTMLElement} button - * @param {Node} target - * @param {Event} event - * @return {void} - * @ignore - */ -function dismissIfExternalEventTarget( checkbox, button, target, event ) { - if ( checkbox.checked && !containsEventTarget( checkbox, button, target, event ) ) { - setCheckedState( checkbox, false ); - } -} - -/** - * Update the `aria-expanded` attribute based on checkbox state (target visibility) changes. - * - * @param {HTMLInputElement} checkbox - * @return {function(): void} Cleanup function that removes the added event listeners. - * @ignore - */ -function bindUpdateAriaExpandedOnInput( checkbox ) { - const listener = updateAriaExpanded.bind( undefined, checkbox ); - // Whenever the checkbox state changes, update the `aria-expanded` state. - checkbox.addEventListener( 'input', listener ); - - return function () { - checkbox.removeEventListener( 'input', listener ); - }; -} - -/** - * Manually change the checkbox state to avoid a focus change when using a pointing device. - * - * @param {HTMLInputElement} checkbox - * @param {HTMLElement} button - * @return {function(): void} Cleanup function that removes the added event listeners. - * @ignore - */ -function bindToggleOnClick( checkbox, button ) { - function listener( event ) { - // Do not allow the browser to handle the checkbox. Instead, manually toggle it which does - // not alter focus. - event.preventDefault(); - setCheckedState( checkbox, !checkbox.checked ); - } - button.addEventListener( 'click', listener, true ); - - return function () { - button.removeEventListener( 'click', listener, true ); - }; -} - -/** - * Manually change the checkbox state when the button is focused and Enter is pressed. - * - * @param {HTMLInputElement} checkbox - * @return {function(): void} Cleanup function that removes the added event listeners. - * @ignore - */ -function bindToggleOnEnter( checkbox ) { - function onKeyup( /** @type {KeyboardEvent} @ignore */ event ) { - // Only handle ENTER. - if ( event.key !== 'Enter' ) { - return; - } - - setCheckedState( checkbox, !checkbox.checked ); - } - - checkbox.addEventListener( 'keyup', onKeyup ); - - return function () { - checkbox.removeEventListener( 'keyup', onKeyup ); - }; -} - -/** - * Dismiss the target when clicking elsewhere and update the `aria-expanded` attribute based on - * checkbox state (target visibility). - * - * @param {Window} window - * @param {HTMLInputElement} checkbox - * @param {HTMLElement} button - * @param {Node} target - * @return {function(): void} Cleanup function that removes the added event listeners. - * @ignore - */ -function bindDismissOnClickOutside( window, checkbox, button, target ) { - const listener = dismissIfExternalEventTarget.bind( undefined, checkbox, button, target ); - window.addEventListener( 'click', listener, true ); - - return function () { - window.removeEventListener( 'click', listener, true ); - }; -} - -/** - * Dismiss the target when focusing elsewhere and update the `aria-expanded` attribute based on - * checkbox state (target visibility). - * - * @param {Window} window - * @param {HTMLInputElement} checkbox - * @param {HTMLElement} button - * @param {Node} target - * @return {function(): void} Cleanup function that removes the added event listeners. - * @ignore - */ -function bindDismissOnFocusLoss( window, checkbox, button, target ) { - // If focus is given to any element outside the target, dismiss the target. Setting a focusout - // listener on the target would be preferable, but this interferes with the click listener. - const listener = dismissIfExternalEventTarget.bind( undefined, checkbox, button, target ); - window.addEventListener( 'focusin', listener, true ); - - return function () { - window.removeEventListener( 'focusin', listener, true ); - }; -} - -/** - * Dismiss the target when ESCAPE is pressed. - * NOTE: This is not a part of the core checkboxHack API - * - * @param {Window} window - * @param {HTMLInputElement} checkbox - * @return {function(): void} Cleanup function that removes the added event listeners. - * @ignore - */ -function bindDismissOnEscape( window, checkbox ) { - const onKeyup = ( /** @type {KeyboardEvent} */ event ) => { - // Only handle ESCAPE - if ( event.key !== 'Escape' ) { - return; - } - setCheckedState( checkbox, false ); - }; - - window.addEventListener( 'keyup', onKeyup, true ); - return function () { - window.removeEventListener( 'keyup', onKeyup ); - }; -} - -/** - * Dismiss the target when clicking or focusing elsewhere and update the `aria-expanded` attribute - * based on checkbox state (target visibility) changes made by **the user.** When tapping the button - * itself, clear the focus outline. - * - * This function calls the other bind* functions and is the only expected interaction for most use - * cases. It's constituents are provided distinctly for the other use cases. - * - * @param {Window} window - * @param {HTMLInputElement} checkbox The underlying hidden checkbox that controls target - * visibility. - * @param {HTMLElement} button The visible label icon associated with the checkbox. This button - * toggles the state of the underlying checkbox. - * @param {Node} target The Node to toggle visibility of based on checkbox state. - * @return {function(): void} Cleanup function that removes the added event listeners. - * @ignore - */ -function bind( window, checkbox, button, target ) { - const cleanups = [ - bindUpdateAriaExpandedOnInput( checkbox ), - bindToggleOnClick( checkbox, button ), - bindToggleOnEnter( checkbox ), - bindDismissOnClickOutside( window, checkbox, button, target ), - bindDismissOnFocusLoss( window, checkbox, button, target ), - bindDismissOnEscape( window, checkbox ) - ]; - - return function () { - cleanups.forEach( function ( cleanup ) { - cleanup(); - } ); - }; -} - -module.exports = { - updateAriaExpanded: updateAriaExpanded, - bindUpdateAriaExpandedOnInput: bindUpdateAriaExpandedOnInput, - bindToggleOnClick: bindToggleOnClick, - bindToggleOnEnter: bindToggleOnEnter, - bindDismissOnClickOutside: bindDismissOnClickOutside, - bindDismissOnFocusLoss: bindDismissOnFocusLoss, - bindDismissOnEscape: bindDismissOnEscape, - bind: bind -}; diff --git a/resources/skins.citizen.scripts/skin.js b/resources/skins.citizen.scripts/skin.js index 0858fffe..01e90d42 100644 --- a/resources/skins.citizen.scripts/skin.js +++ b/resources/skins.citizen.scripts/skin.js @@ -1,10 +1,3 @@ -const - checkboxHack = require( './checkboxHack.js' ), - CHECKBOX_HACK_CONTAINER_SELECTOR = '.mw-checkbox-hack-container', - CHECKBOX_HACK_CHECKBOX_SELECTOR = '.mw-checkbox-hack-checkbox', - CHECKBOX_HACK_BUTTON_SELECTOR = '.mw-checkbox-hack-button', - CHECKBOX_HACK_TARGET_SELECTOR = '.mw-checkbox-hack-target'; - /** * Wait for first paint before calling this function. * (see T234570#5779890, T246419). @@ -16,45 +9,6 @@ function enableCssAnimations( document ) { document.documentElement.classList.add( 'citizen-animations-ready' ); } -/** - * Add the ability for users to toggle dropdown menus using the enter key (as - * well as space) using core's checkboxHack. - * - * Based on Vector - * - * @return {void} - */ -function bind() { - // Search for all dropdown containers using the CHECKBOX_HACK_CONTAINER_SELECTOR. - const containers = document.querySelectorAll( CHECKBOX_HACK_CONTAINER_SELECTOR ); - - containers.forEach( ( container ) => { - const - checkbox = container.querySelector( CHECKBOX_HACK_CHECKBOX_SELECTOR ), - button = container.querySelector( CHECKBOX_HACK_BUTTON_SELECTOR ), - target = container.querySelector( CHECKBOX_HACK_TARGET_SELECTOR ); - - if ( !( checkbox && button && target ) ) { - return; - } - - checkboxHack.bind( window, checkbox, button, target ); - } ); -} - -/** - * Close all menus through unchecking all checkbox hacks - * - * @return {void} - */ -function uncheckCheckboxHacks() { - const checkboxes = document.querySelectorAll( CHECKBOX_HACK_CHECKBOX_SELECTOR + ':checked' ); - - checkboxes.forEach( ( checkbox ) => { - /** @type {HTMLInputElement} */ ( checkbox ).checked = false; - } ); -} - /** * Add a class to indicate that sticky header is active * @@ -90,7 +44,6 @@ function initStickyHeader( document ) { document.body.classList.remove( 'citizen-body-header--sticky' ); } ); - observer.observe( sentinel ); } } @@ -114,7 +67,6 @@ function registerServiceWorker() { swUrl = scriptPath + '/load.php?modules=' + SW_MODULE_NAME + '&only=scripts&raw=true&skin=citizen&version=' + version; - navigator.serviceWorker.register( swUrl, { scope: '/' } ); } } @@ -125,14 +77,16 @@ function registerServiceWorker() { * @return {void} */ function main( window ) { - const search = require( './search.js' ); + const + search = require( './search.js' ), + checkbox = require( './checkbox.js' ); enableCssAnimations( window.document ); search.init( window ); initStickyHeader( window.document ); // Set up checkbox hacks - bind(); + checkbox.bind(); // Table of Contents const tocContainer = document.getElementById( 'mw-panel-toc' ); @@ -153,7 +107,7 @@ function main( window ) { window.addEventListener( 'beforeunload', () => { // T295085: Close all dropdown menus when page is unloaded to prevent them // from being open when navigating back to a page. - uncheckCheckboxHacks(); + checkbox.uncheckCheckboxHacks(); // Set up loading indicator document.documentElement.classList.add( 'citizen-loading' ); }, false ); diff --git a/skin.json b/skin.json index bc3b347f..d0bdf174 100644 --- a/skin.json +++ b/skin.json @@ -124,7 +124,7 @@ "name": "resources/skins.citizen.scripts/config.json", "callback": "MediaWiki\\Skins\\Citizen\\Hooks\\ResourceLoaderHooks::getCitizenResourceLoaderConfig" }, - "resources/skins.citizen.scripts/checkboxHack.js", + "resources/skins.citizen.scripts/checkbox.js", "resources/skins.citizen.scripts/scrollObserver.js", "resources/skins.citizen.scripts/sectionObserver.js", "resources/skins.citizen.scripts/search.js", @@ -132,7 +132,8 @@ "resources/skins.citizen.scripts/tableOfContents.js" ], "dependencies": [ - "mediawiki.util" + "mediawiki.util", + "mediawiki.page.ready" ], "targets": [ "desktop", diff --git a/templates/Drawer.mustache b/templates/Drawer.mustache index 73d8eef8..cc190cd0 100644 --- a/templates/Drawer.mustache +++ b/templates/Drawer.mustache @@ -10,6 +10,7 @@ role="button" aria-labelledby="citizen-drawer__buttonCheckbox" aria-haspopup="true"> + {{>Drawer__button}} {{! ID needed for a11y and checkbox hack }} - {{>Drawer__button}} \ No newline at end of file diff --git a/templates/PageTools.mustache b/templates/PageTools.mustache index e96cee5b..ad892e7d 100644 --- a/templates/PageTools.mustache +++ b/templates/PageTools.mustache @@ -20,12 +20,6 @@ role="button" aria-labelledby="page-actions-more__buttonCheckbox" aria-haspopup="true"> - + {{/pagetools-overflow}} \ No newline at end of file diff --git a/templates/PageTools__languages.mustache b/templates/PageTools__languages.mustache index 449c5136..232a3d54 100644 --- a/templates/PageTools__languages.mustache +++ b/templates/PageTools__languages.mustache @@ -11,10 +11,6 @@ role="button" aria-labelledby="citizen-languages__buttonCheckbox" aria-haspopup="true"> - + \ No newline at end of file diff --git a/templates/Search.mustache b/templates/Search.mustache index 9b995e81..18656da9 100644 --- a/templates/Search.mustache +++ b/templates/Search.mustache @@ -14,6 +14,7 @@ role="button" aria-labelledby="citizen-search__buttonCheckbox" aria-haspopup="true"> + {{>Search__button}} - {{>Search__button}} diff --git a/templates/TableOfContents.mustache b/templates/TableOfContents.mustache index a65a75dd..daf80012 100644 --- a/templates/TableOfContents.mustache +++ b/templates/TableOfContents.mustache @@ -7,6 +7,15 @@ role="button" aria-labelledby="citizen-toc__buttonCheckbox" aria-haspopup="true"> + - {{/data-toc}} \ No newline at end of file diff --git a/templates/UserMenu.mustache b/templates/UserMenu.mustache index a4f4d735..de552f64 100644 --- a/templates/UserMenu.mustache +++ b/templates/UserMenu.mustache @@ -9,12 +9,6 @@ role="button" aria-labelledby="citizen-userMenu__buttonCheckbox" aria-haspopup="true"> - + \ No newline at end of file From afcf37d529513fd24acfcd992493a4fb5a0bb80f Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Wed, 25 Jan 2023 20:20:46 -0500 Subject: [PATCH 075/124] =?UTF-8?q?fix(core):=20=F0=9F=90=9B=20checkboxHac?= =?UTF-8?q?k=20buttons=20should=20be=20focusable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So that users can use keyboard to navigate to such button. Previously they all have a display:none property, which makes it impossible to reach with keyboard --- resources/skins.citizen.styles/Menu.less | 36 +++++++++++++++++++ .../skins.citizen.styles/common/common.less | 10 +++--- .../skins.citizen.styles/common/hacks.less | 17 --------- 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/resources/skins.citizen.styles/Menu.less b/resources/skins.citizen.styles/Menu.less index 1ef41e07..3dfa6d3a 100644 --- a/resources/skins.citizen.styles/Menu.less +++ b/resources/skins.citizen.styles/Menu.less @@ -31,6 +31,42 @@ } } +/** + * Invisible checkbox covering the menu button. + */ +.mw-checkbox-hack { + // Has to be visible to be focusable + &-checkbox { + position: absolute; + z-index: 1; + top: 0; + left: 0; + width: 0; + height: 0; + padding: 0; + margin: 0; + opacity: 0; + + // HACK: Fake focus styles + &:focus { + & + .citizen-header__button, + & + .mw-checkbox-hack-button { + outline: 2px solid var( --color-primary ); + outline-offset: 1px; + } + } + } + + &-button { + cursor: pointer; + + // Icons have to use span inside label elements + > span:not( .citizen-ui-icon ) { + .mixin-screen-reader-text; + } + } +} + .mw-portlet { // Hide selected item .selected { diff --git a/resources/skins.citizen.styles/common/common.less b/resources/skins.citizen.styles/common/common.less index a843f353..85c4446a 100644 --- a/resources/skins.citizen.styles/common/common.less +++ b/resources/skins.citizen.styles/common/common.less @@ -20,6 +20,12 @@ body { outline-color: var( --color-primary ); } +// For some reason just overriding the outline-color is not enough +:focus-visible { + outline: 2px solid var( --color-primary ); + outline-offset: 1px; +} + input, select, textarea { @@ -91,10 +97,6 @@ video { max-width: 100%; // Prevent overflow } -:focus-visible { - outline: 1px solid var( --color-primary ); -} - .skin-citizen-dark { color-scheme: dark; diff --git a/resources/skins.citizen.styles/common/hacks.less b/resources/skins.citizen.styles/common/hacks.less index 0902cf66..0c1e59c4 100644 --- a/resources/skins.citizen.styles/common/hacks.less +++ b/resources/skins.citizen.styles/common/hacks.less @@ -3,23 +3,6 @@ a.feedlink { background: none !important; } -// CSS checkbox hack -// TODO: See what MW core offer and maybe we can take it off -.mw-checkbox-hack { - &-checkbox { - display: none; - } - - &-button { - cursor: pointer; - - // Icons have to use span inside label elements - > span:not( .citizen-ui-icon ) { - .mixin-screen-reader-text; - } - } -} - .screen-reader-text { .mixin-screen-reader-text; } From ee4a7eda4f8bc292d39ec1f5e70bb18dcf71d3ab Mon Sep 17 00:00:00 2001 From: alistair3149 Date: Wed, 25 Jan 2023 20:25:40 -0500 Subject: [PATCH 076/124] =?UTF-8?q?refactor(core):=20=E2=99=BB=EF=B8=8F=20?= =?UTF-8?q?rename=20mw-checkbox-hack=20class=20to=20citizen-menu-checkbox?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/skins.citizen.scripts/checkbox.js | 8 ++--- resources/skins.citizen.styles/Header.less | 2 +- resources/skins.citizen.styles/Menu.less | 4 +-- resources/skins.citizen.styles/Pagetools.less | 2 +- templates/Drawer.mustache | 6 ++-- templates/Drawer__button.mustache | 34 +++++++++---------- templates/PageTools.mustache | 8 ++--- templates/PageTools__languages.mustache | 8 ++--- templates/Search.mustache | 6 ++-- templates/Search__button.mustache | 2 +- templates/TableOfContents.mustache | 8 ++--- templates/UserMenu.mustache | 8 ++--- 12 files changed, 48 insertions(+), 48 deletions(-) diff --git a/resources/skins.citizen.scripts/checkbox.js b/resources/skins.citizen.scripts/checkbox.js index 0799a51d..961e985c 100644 --- a/resources/skins.citizen.scripts/checkbox.js +++ b/resources/skins.citizen.scripts/checkbox.js @@ -6,10 +6,10 @@ const checkboxHack = require( 'mediawiki.page.ready' ).checkboxHack, - CHECKBOX_HACK_CONTAINER_SELECTOR = '.mw-checkbox-hack-container', - CHECKBOX_HACK_CHECKBOX_SELECTOR = '.mw-checkbox-hack-checkbox', - CHECKBOX_HACK_BUTTON_SELECTOR = '.mw-checkbox-hack-button', - CHECKBOX_HACK_TARGET_SELECTOR = '.mw-checkbox-hack-target'; + CHECKBOX_HACK_CONTAINER_SELECTOR = '.citizen-menu-checkbox-container', + CHECKBOX_HACK_CHECKBOX_SELECTOR = '.citizen-menu-checkbox-checkbox', + CHECKBOX_HACK_BUTTON_SELECTOR = '.citizen-menu-checkbox-button', + CHECKBOX_HACK_TARGET_SELECTOR = '.citizen-menu-checkbox-target'; /** * Set the checked state and fire the 'input' event. diff --git a/resources/skins.citizen.styles/Header.less b/resources/skins.citizen.styles/Header.less index 97082f15..ac12c475 100644 --- a/resources/skins.citizen.styles/Header.less +++ b/resources/skins.citizen.styles/Header.less @@ -84,7 +84,7 @@ justify-content: space-between; gap: var( --space-xxs ); - .mw-checkbox-hack-checkbox:checked { + .citizen-menu-checkbox-checkbox:checked { ~ .citizen-header__button { background-color: var( --background-color-primary--active ); } diff --git a/resources/skins.citizen.styles/Menu.less b/resources/skins.citizen.styles/Menu.less index 3dfa6d3a..523931e9 100644 --- a/resources/skins.citizen.styles/Menu.less +++ b/resources/skins.citizen.styles/Menu.less @@ -34,7 +34,7 @@ /** * Invisible checkbox covering the menu button. */ -.mw-checkbox-hack { +.citizen-menu-checkbox { // Has to be visible to be focusable &-checkbox { position: absolute; @@ -50,7 +50,7 @@ // HACK: Fake focus styles &:focus { & + .citizen-header__button, - & + .mw-checkbox-hack-button { + & + .citizen-menu-checkbox-button { outline: 2px solid var( --color-primary ); outline-offset: 1px; } diff --git a/resources/skins.citizen.styles/Pagetools.less b/resources/skins.citizen.styles/Pagetools.less index 4e00a4b8..330e1022 100644 --- a/resources/skins.citizen.styles/Pagetools.less +++ b/resources/skins.citizen.styles/Pagetools.less @@ -109,7 +109,7 @@ } // TODO: Merge this with header styles - .mw-checkbox-hack-checkbox:checked ~ .page-actions__button { + .citizen-menu-checkbox-checkbox:checked ~ .page-actions__button { background-color: var( --background-color-primary--active ); } } diff --git a/templates/Drawer.mustache b/templates/Drawer.mustache index cc190cd0..97d523cb 100644 --- a/templates/Drawer.mustache +++ b/templates/Drawer.mustache @@ -2,17 +2,17 @@ string msg-citizen-drawer-toggle The label used by the drawer button. string msg-sitetitle the contents of the sitesubtitle message key }} -
    +
    {{>Drawer__button}} {{! ID needed for a11y and checkbox hack }} -