Fork
/
mediawiki-skins-Citizen
派生自 Mirror/mediawiki-skins-Citizen
2
0
派生 0
代码 工单 合并请求 版本发布 百科 动态

fix: 🐛 merge from <https://git.qiuwen.wiki/Mirror/mediawiki-skins-Citizen> 

Signed-off-by: WaitSpring <me@waitspring.com>
这个提交包含在：
WaitSpring 2022-12-30 12:05:02 +08:00
父节点 b0376c4153 79b8836e5a
当前提交 cc914110cb
共有 45 个文件被更改，包括 550 次插入 和 282 次删除
显示统计 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

8
.github/workflows/mediawiki.yml vendored
查看文件

@ -40,7 +40,7 @@ jobs:
# Check for changed files # Check for changed files
- name: Check for PHP changes - name: Check for PHP changes
id: changed-php id: changed-php
uses: tj-actions/changed-files@v34 uses: tj-actions/changed-files@v35
with: with:
since_last_remote_commit: "true" since_last_remote_commit: "true"
files: | files: |
@ -48,7 +48,7 @@ jobs:
- name: Check for script changes - name: Check for script changes
id: changed-script id: changed-script
uses: tj-actions/changed-files@v34 uses: tj-actions/changed-files@v35
with: with:
since_last_remote_commit: "true" since_last_remote_commit: "true"
files: | files: |
@ -56,7 +56,7 @@ jobs:
- name: Check for stylesheet changes - name: Check for stylesheet changes
id: changed-stylesheet id: changed-stylesheet
uses: tj-actions/changed-files@v34 uses: tj-actions/changed-files@v35
with: with:
since_last_remote_commit: "true" since_last_remote_commit: "true"
files: | files: |
@ -67,7 +67,7 @@ jobs:
- name: Check for i18n changes - name: Check for i18n changes
id: changed-i18n id: changed-i18n
uses: tj-actions/changed-files@v34 uses: tj-actions/changed-files@v35
with: with:
since_last_remote_commit: "true" since_last_remote_commit: "true"
files: | files: |

25
CHANGELOG.md
查看文件

@ -2,6 +2,31 @@
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. 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.0](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/compare/v2.2.0...v2.3.0) (2022-12-14)
### Features
* **AdvancedSearch:** ✨ update AdvancedSearch styles ([88fca93](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/88fca93c469f7e2918b3b68a6a0381f4a3e5e800))
* **core:** ✨ align inconsistent search styles ([653ba19](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/653ba1913051ef11306de4fd8bda4cc56f44d37b))
* **core:** ✨ deprecate background-color-framed and input ([37cdf91](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/37cdf912571cd8b3b4c19cc45a09b123d0b83476))
* **core:** ✨ do not hardcode min-width for page tools menu ([0187478](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/0187478d1aa69bfa2f699fb4790cadc8491c98fd))
* **core:** ✨ do not set fieldset font size ([224c190](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/224c190a475e5079e5e0e8332442643c5e2b571f))
* **core:** ✨ dynamic dark theme color based on primary hue ([3414d59](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/3414d5964375de829c129c39d680ef3c9e6b743b))
* **core:** ✨ tweak notification styles ([529fe22](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/529fe221de103bf68302f06cf5a3e941f2206e04))
* **MediaSearch:** ✨ add grade A support for MediaSearch ([9b9916d](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/9b9916d61bea955f3208e2f1fdb728b63918c66b))
* **search:** ✨ add MediaSearch to typeahead ([203b0b4](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/203b0b42c3a388684a51f231d993788632b92ae8))
### Bug Fixes
* **AdvancedSearch:** 🐛 1px layout shift in preloader ([3517453](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/351745374155fe292dd487f0e6f3ea6dd3782765))
* **core:** 🐛 do not make search create and exist link into a card ([80a35ea](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/80a35ea571f8d7ef864b332add827368bc9b0440))
* **core:** 🐛 do not use CSS containment for body content ([7a59e9c](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/7a59e9c2d720d99a4fe0aa31b2ff83b1c56922b9))
* **core:** 🐛 incorrect z-index in changelist title ([c4bd384](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/c4bd3842358920752d8f0abf5a768846b1b2f03f))
* **search:** 🐛 do not collapse whitespace in label text node ([c2da5c5](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/c2da5c5ade34d0895932a0d120908f02fadb0a28))
* **search:** 🐛 incorrect full text search URL ([074df52](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/commit/074df5272c2cc7739967ded992b48e5bf45da806))
## [2.2.0](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/compare/v2.1.0...v2.2.0) (2022-12-08) ## [2.2.0](https://github.com/StarCitizenTools/mediawiki-skins-Citizen/compare/v2.1.0...v2.2.0) (2022-12-08)
### Features ### Features

3
README.md
查看文件

@ -39,7 +39,7 @@ OOUI | A | 0.44.3 | 2022-11-30
Name | Grade | Version | Last updated Name | Grade | Version | Last updated
:--- | :--- | :--- | :--- :--- | :--- | :--- | :---
[AdvancedSearch](https://www.mediawiki.org/wiki/Extension:AdvancedSearch) | B | REL1_35 `fae6250` | 2021-08-26 [AdvancedSearch](https://www.mediawiki.org/wiki/Extension:AdvancedSearch) | B | REL1_39 `3a0eed7` | 2022-12-12
[AJAXPoll](https://www.mediawiki.org/wiki/Extension:AJAXPoll) | A | REL1_39 `8429d8d` | 2022-10-25 [AJAXPoll](https://www.mediawiki.org/wiki/Extension:AJAXPoll) | A | REL1_39 `8429d8d` | 2022-10-25
[ApprovedRevs](https://www.mediawiki.org/wiki/Extension:Approved_Revs) | B | N/A | N/A [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 [Babel](https://www.mediawiki.org/wiki/Extension:Babel) | B | MLEB 2021.07 | 2021-07-29
@ -49,6 +49,7 @@ Name | Grade | Version | Last updated
[CentralNotice](https://www.mediawiki.org/wiki/Extension:CentralNotice) | B | REL1_35 `4aa2a8f` | 2022-06-16 [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 [Cite](https://www.mediawiki.org/wiki/Extension:Cite) | A | N/A | N/A
[CleanChanges](https://www.mediawiki.org/wiki/Extension:CleanChanges) | B | MLEB 2021.07 | 2021-07-29 [CleanChanges](https://www.mediawiki.org/wiki/Extension:CleanChanges) | B | MLEB 2021.07 | 2021-07-29
[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 [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 [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) | A | REL1_35 `7aa0a9b` | 2022-05-06

2
i18n/bn.json
查看文件

@ -11,7 +11,7 @@
"citizen-action-addsection": "আলোচনা যোগ করুন", "citizen-action-addsection": "আলোচনা যোগ করুন",
"citizen-jumptotop": "উপরে চলুন", "citizen-jumptotop": "উপরে চলুন",
"citizen-search-fulltext": "এটি থাকা পাতাগুলিতে অনুসন্ধান করুন:", "citizen-search-fulltext": "এটি থাকা পাতাগুলিতে অনুসন্ধান করুন:",
"citizen-search-fulltext-empty": "অনুসন্ধান শুরু করতে কিছু লিখুন", "citizen-search-empty-desc": "অনুসন্ধান শুরু করতে কিছু লিখুন",
"citizen-tagline-ns-mediawiki": "মিডিয়াউইকি ইন্টারফেস পাতা", "citizen-tagline-ns-mediawiki": "মিডিয়াউইকি ইন্টারফেস পাতা",
"citizen-tagline-ns-template": "টেমপ্লেট পাতা", "citizen-tagline-ns-template": "টেমপ্লেট পাতা",
"citizen-tagline-ns-help": "সাহায্য পাতা", "citizen-tagline-ns-help": "সাহায্য পাতা",

2
i18n/ckb.json
查看文件

@ -14,7 +14,7 @@
"citizen-action-addsection": "بابەت دابنێ", "citizen-action-addsection": "بابەت دابنێ",
"citizen-jumptotop": "گەڕانەوە بۆ سەرەوە", "citizen-jumptotop": "گەڕانەوە بۆ سەرەوە",
"citizen-search-fulltext": "گەڕان لە ناوەڕۆکی لاپەڕەکان", "citizen-search-fulltext": "گەڕان لە ناوەڕۆکی لاپەڕەکان",
"citizen-search-fulltext-empty": "بنوسە بۆ گەڕان", "citizen-search-empty-desc": "بنوسە بۆ گەڕان",
"citizen-tagline-ns-talk": "لاپەڕەی گفتوگۆی {{SUBJECTPAGENAME}}", "citizen-tagline-ns-talk": "لاپەڕەی گفتوگۆی {{SUBJECTPAGENAME}}",
"citizen-tagline-ns-project": "زانیاری لەبارەی {{SITENAME}}", "citizen-tagline-ns-project": "زانیاری لەبارەی {{SITENAME}}",
"citizen-tagline-ns-file": "پەڕگە لەسەر {{SITENAME}}", "citizen-tagline-ns-file": "پەڕگە لەسەر {{SITENAME}}",

2
i18n/de.json
查看文件

@ -26,7 +26,7 @@
"citizen-action-addsection": "Thema hinzufügen", "citizen-action-addsection": "Thema hinzufügen",
"citizen-jumptotop": "Zurück nach oben", "citizen-jumptotop": "Zurück nach oben",
"citizen-search-fulltext": "Suche nach Seiten mit", "citizen-search-fulltext": "Suche nach Seiten mit",
"citizen-search-fulltext-empty": "Tippe, um zu suchen zu beginnen", "citizen-search-empty-desc": "Tippe, um zu suchen zu beginnen",
"citizen-tagline-ns-talk": "Diskussionsseite von {{SUBJECTPAGENAME}}", "citizen-tagline-ns-talk": "Diskussionsseite von {{SUBJECTPAGENAME}}",
"citizen-tagline-ns-project": "Informationen über {{SITENAME}}", "citizen-tagline-ns-project": "Informationen über {{SITENAME}}",
"citizen-tagline-ns-file": "Datei auf {{SITENAME}}", "citizen-tagline-ns-file": "Datei auf {{SITENAME}}",

3
i18n/en.json
查看文件

@ -21,7 +21,8 @@
"citizen-action-addsection": "Add topic", "citizen-action-addsection": "Add topic",
"citizen-jumptotop": "Back to top", "citizen-jumptotop": "Back to top",
"citizen-search-fulltext": "Search for pages containing $1", "citizen-search-fulltext": "Search for pages containing $1",
"citizen-search-fulltext-empty": "Type to start searching", "citizen-search-mediasearch": "Search for media related to $1",
"citizen-search-empty-desc": "Type to start searching",
"citizen-search-noresults-title": "Uh oh! No results for $1", "citizen-search-noresults-title": "Uh oh! No results for $1",
"citizen-search-noresults-desc": "Maybe try the options below?", "citizen-search-noresults-desc": "Maybe try the options below?",
"citizen-tagline-ns-talk": "Discussion page of {{SUBJECTPAGENAME}}", "citizen-tagline-ns-talk": "Discussion page of {{SUBJECTPAGENAME}}",

3
i18n/fr.json
查看文件

@ -23,7 +23,8 @@
"citizen-action-addsection": "Ajouter un sujet", "citizen-action-addsection": "Ajouter un sujet",
"citizen-jumptotop": "Retour au début", "citizen-jumptotop": "Retour au début",
"citizen-search-fulltext": "Rechercher les pages contenant $1", "citizen-search-fulltext": "Rechercher les pages contenant $1",
"citizen-search-fulltext-empty": "Taper pour commencer la recherche", "citizen-search-mediasearch": "Rechercher des médias relatifs à $1",
"citizen-search-empty-desc": "Taper pour commencer la recherche",
"citizen-search-noresults-title": "Oh oh ! Aucun résultat pour $1", "citizen-search-noresults-title": "Oh oh ! Aucun résultat pour $1",
"citizen-search-noresults-desc": "Essayer peut-être les options ci-dessous ?", "citizen-search-noresults-desc": "Essayer peut-être les options ci-dessous ?",
"citizen-tagline-ns-talk": "Page de discussion de {{SUBJECTPAGENAME}}", "citizen-tagline-ns-talk": "Page de discussion de {{SUBJECTPAGENAME}}",

2
i18n/kk-cyrl.json
查看文件

@ -21,7 +21,7 @@
"citizen-action-addsection": "Тақырып қосу", "citizen-action-addsection": "Тақырып қосу",
"citizen-jumptotop": "Жоғары қайту", "citizen-jumptotop": "Жоғары қайту",
"citizen-search-fulltext": "Осы сөз(дер) бар беттерді іздеу", "citizen-search-fulltext": "Осы сөз(дер) бар беттерді іздеу",
"citizen-search-fulltext-empty": "Іздей бастау үшін теріңіз", "citizen-search-empty-desc": "Іздей бастау үшін теріңіз",
"citizen-tagline-ns-talk": "{{SUBJECTPAGENAME}} дегеннің талқылау беті", "citizen-tagline-ns-talk": "{{SUBJECTPAGENAME}} дегеннің талқылау беті",
"citizen-tagline-ns-project": "{{SITENAME}} туралы мәлімет", "citizen-tagline-ns-project": "{{SITENAME}} туралы мәлімет",
"citizen-tagline-ns-file": "{{SITENAME}} жобасындағы файл", "citizen-tagline-ns-file": "{{SITENAME}} жобасындағы файл",

3
i18n/mk.json
查看文件

@ -20,7 +20,8 @@
"citizen-action-addsection": "Додај тема", "citizen-action-addsection": "Додај тема",
"citizen-jumptotop": "Најгоре", "citizen-jumptotop": "Најгоре",
"citizen-search-fulltext": "Пребарај страници што содржат $1", "citizen-search-fulltext": "Пребарај страници што содржат $1",
"citizen-search-fulltext-empty": "Внесете текст за да почнете да пребарувате", "citizen-search-mediasearch": "Пребарајте податотеки поврзани со $1",
"citizen-search-empty-desc": "Внесете текст за да почнете да пребарувате",
"citizen-search-noresults-title": "За жал, не најдов ништо за $1", "citizen-search-noresults-title": "За жал, не најдов ништо за $1",
"citizen-search-noresults-desc": "Да ги пробаме можностите подолу?", "citizen-search-noresults-desc": "Да ги пробаме можностите подолу?",
"citizen-tagline-ns-talk": "Разговорна страница на {{SUBJECTPAGENAME}}", "citizen-tagline-ns-talk": "Разговорна страница на {{SUBJECTPAGENAME}}",

2
i18n/nl.json
查看文件

@ -13,7 +13,7 @@
"citizen-page-info-lastmod": "Laatste wijziging", "citizen-page-info-lastmod": "Laatste wijziging",
"citizen-action-addsection": "Onderwerp toevoegen", "citizen-action-addsection": "Onderwerp toevoegen",
"citizen-jumptotop": "Terug naar boven", "citizen-jumptotop": "Terug naar boven",
"citizen-search-fulltext-empty": "Type om te beginnen met zoeken", "citizen-search-empty-desc": "Type om te beginnen met zoeken",
"citizen-tagline-ns-talk": "Overlegpagina van {{SUBJECTPAGENAME}}", "citizen-tagline-ns-talk": "Overlegpagina van {{SUBJECTPAGENAME}}",
"citizen-tagline-ns-project": "Informatie over {{SITENAME}}", "citizen-tagline-ns-project": "Informatie over {{SITENAME}}",
"citizen-tagline-ns-file": "Bestand op {{SITENAME}}", "citizen-tagline-ns-file": "Bestand op {{SITENAME}}",

2
i18n/pl.json
查看文件

@ -20,7 +20,7 @@
"citizen-action-addsection": "Dodaj temat", "citizen-action-addsection": "Dodaj temat",
"citizen-jumptotop": "Powrót do góry", "citizen-jumptotop": "Powrót do góry",
"citizen-search-fulltext": "Szukaj stron zawierających tekst $1", "citizen-search-fulltext": "Szukaj stron zawierających tekst $1",
"citizen-search-fulltext-empty": "Zacznij pisać, aby wyszukiwać", "citizen-search-empty-desc": "Zacznij pisać, aby wyszukiwać",
"citizen-search-noresults-title": "O nie! Nie ma wyników dla $1", "citizen-search-noresults-title": "O nie! Nie ma wyników dla $1",
"citizen-search-noresults-desc": "Może wypróbuj poniższe opcje?", "citizen-search-noresults-desc": "Może wypróbuj poniższe opcje?",
"citizen-tagline-ns-talk": "Strona dyskusji o „{{SUBJECTPAGENAME}}”", "citizen-tagline-ns-talk": "Strona dyskusji o „{{SUBJECTPAGENAME}}”",

2
i18n/pt-br.json
查看文件

@ -24,7 +24,7 @@
"citizen-action-addsection": "Adicionar tópico", "citizen-action-addsection": "Adicionar tópico",
"citizen-jumptotop": "Voltar ao topo", "citizen-jumptotop": "Voltar ao topo",
"citizen-search-fulltext": "Pesquisar por páginas que contenham", "citizen-search-fulltext": "Pesquisar por páginas que contenham",
"citizen-search-fulltext-empty": "Tipo para começar a pesquisar", "citizen-search-empty-desc": "Tipo para começar a pesquisar",
"citizen-search-noresults-title": "Uh oh! Nenhum resultado para $1", "citizen-search-noresults-title": "Uh oh! Nenhum resultado para $1",
"citizen-search-noresults-desc": "Talvez tente as opções abaixo?", "citizen-search-noresults-desc": "Talvez tente as opções abaixo?",
"citizen-tagline-ns-talk": "Página de discussão de {{SUBJECTPAGENAME}}", "citizen-tagline-ns-talk": "Página de discussão de {{SUBJECTPAGENAME}}",

3
i18n/pt.json
查看文件

@ -20,7 +20,8 @@
"citizen-action-addsection": "Adicionar tópico", "citizen-action-addsection": "Adicionar tópico",
"citizen-jumptotop": "Voltar ao topo", "citizen-jumptotop": "Voltar ao topo",
"citizen-search-fulltext": "Procurar páginas que contenham $1", "citizen-search-fulltext": "Procurar páginas que contenham $1",
"citizen-search-fulltext-empty": "Escrever para começar a procurar", "citizen-search-mediasearch": "Procurar conteúdo multimédia relacionado com $1",
"citizen-search-empty-desc": "Escrever para começar a procurar",
"citizen-search-noresults-title": "Não há resultados para $1", "citizen-search-noresults-title": "Não há resultados para $1",
"citizen-search-noresults-desc": "Talvez queira tentar as opções abaixo?", "citizen-search-noresults-desc": "Talvez queira tentar as opções abaixo?",
"citizen-tagline-ns-talk": "Página de discussão de {{SUBJECTPAGENAME}}", "citizen-tagline-ns-talk": "Página de discussão de {{SUBJECTPAGENAME}}",

6
i18n/qqq.json
查看文件

@ -3,11 +3,12 @@
"authors": [ "authors": [
"Abijeet Patro", "Abijeet Patro",
"Alistair3149", "Alistair3149",
"Amire80",
"[https://www.mediawiki.org/wiki/User:Alistair3149 Alistair3149]", "[https://www.mediawiki.org/wiki/User:Alistair3149 Alistair3149]",
"[https://www.mediawiki.org/wiki/User:Octfx Octfx]" "[https://www.mediawiki.org/wiki/User:Octfx Octfx]"
] ]
}, },
"skinname-citizen": "{{name}}", "skinname-citizen": "{{name}}\n\n\"Citizen\" refers to the name of the video game [[:w:en:Star Citizen|Star Citizen]].",
"citizen-skin-desc": "{{desc|what=skin|name=Citizen|url=https://github.com/StarCitizenTools/mediawiki-skins-Citizen}}", "citizen-skin-desc": "{{desc|what=skin|name=Citizen|url=https://github.com/StarCitizenTools/mediawiki-skins-Citizen}}",
"citizen-prefs-talkpage": "Link to the Citizen talk page which is shown before the preview link in skin preferences. See T307113 for more information.", "citizen-prefs-talkpage": "Link to the Citizen talk page which is shown before the preview link in skin preferences. See T307113 for more information.",
"citizen.css": "{{optional}}", "citizen.css": "{{optional}}",
@ -23,7 +24,8 @@
"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-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-jumptotop": "Label for link to jump to top of page",
"citizen-search-fulltext": "Fulltext search suggestion", "citizen-search-fulltext": "Fulltext search suggestion",
"citizen-search-fulltext-empty": "Helper text in the search suggestion when there are no search query", "citizen-search-mediasearch": "MediaSearch suggestion",
"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-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", "citizen-search-noresults-desc": "Description in the search suggestion when there are no search results",
"citizen-tagline-ns-talk": "Tagline for pages in talk namespace", "citizen-tagline-ns-talk": "Tagline for pages in talk namespace",

2
i18n/roa-tara.json
查看文件

@ -14,7 +14,7 @@
"citizen-action-addsection": "Aggiunge 'n'argomende", "citizen-action-addsection": "Aggiunge 'n'argomende",
"citizen-jumptotop": "Tuèrne sus", "citizen-jumptotop": "Tuèrne sus",
"citizen-search-fulltext": "Cirche le pàggene ca tènene", "citizen-search-fulltext": "Cirche le pàggene ca tènene",
"citizen-search-fulltext-empty": "Scrive pe accumenzà 'a recerche", "citizen-search-empty-desc": "Scrive pe accumenzà 'a recerche",
"citizen-tagline-ns-talk": "Pàgene de le 'ngazzaminde de {{SUBJECTPAGENAME}}", "citizen-tagline-ns-talk": "Pàgene de le 'ngazzaminde de {{SUBJECTPAGENAME}}",
"citizen-tagline-ns-project": "'Mbormaizune sus a {{SITENAME}}", "citizen-tagline-ns-project": "'Mbormaizune sus a {{SITENAME}}",
"citizen-tagline-ns-file": "Fail sus a {{SITENAME}}", "citizen-tagline-ns-file": "Fail sus a {{SITENAME}}",

2
i18n/ru.json
查看文件

@ -21,7 +21,7 @@
"citizen-action-addsection": "Добавить тему", "citizen-action-addsection": "Добавить тему",
"citizen-jumptotop": "Вернуться наверх", "citizen-jumptotop": "Вернуться наверх",
"citizen-search-fulltext": "Поиск страниц, содержащих", "citizen-search-fulltext": "Поиск страниц, содержащих",
"citizen-search-fulltext-empty": "Введите текст", "citizen-search-empty-desc": "Введите текст",
"citizen-tagline-ns-talk": "Обсуждение страницы {{SUBJECTPAGENAME}}", "citizen-tagline-ns-talk": "Обсуждение страницы {{SUBJECTPAGENAME}}",
"citizen-tagline-ns-project": "Информация о {{SITENAME}}", "citizen-tagline-ns-project": "Информация о {{SITENAME}}",
"citizen-tagline-ns-file": "Файл на {{SITENAME}}", "citizen-tagline-ns-file": "Файл на {{SITENAME}}",

3
i18n/sl.json
查看文件

@ -20,7 +20,8 @@
"citizen-action-addsection": "Dodaj temo", "citizen-action-addsection": "Dodaj temo",
"citizen-jumptotop": "Nazaj na vrh", "citizen-jumptotop": "Nazaj na vrh",
"citizen-search-fulltext": "Poiščite strani, ki vsebujejo $1", "citizen-search-fulltext": "Poiščite strani, ki vsebujejo $1",
"citizen-search-fulltext-empty": "Vnesite za začetek iskanja", "citizen-search-mediasearch": "Iskanje predstavnosti, povezanih z $1",
"citizen-search-empty-desc": "Vnesite za začetek iskanja",
"citizen-search-noresults-title": "Ojoj! Ni zadetkov za $1", "citizen-search-noresults-title": "Ojoj! Ni zadetkov za $1",
"citizen-search-noresults-desc": "Morda poskusite s spodnjimi možnostmi?", "citizen-search-noresults-desc": "Morda poskusite s spodnjimi možnostmi?",
"citizen-tagline-ns-talk": "Pogovorna stran {{SUBJECTPAGENAME}}", "citizen-tagline-ns-talk": "Pogovorna stran {{SUBJECTPAGENAME}}",

2
i18n/tr.json
查看文件

@ -23,7 +23,7 @@
"citizen-action-addsection": "Konu ekle", "citizen-action-addsection": "Konu ekle",
"citizen-jumptotop": "Başa dön", "citizen-jumptotop": "Başa dön",
"citizen-search-fulltext": "İçeren sayfaları ara", "citizen-search-fulltext": "İçeren sayfaları ara",
"citizen-search-fulltext-empty": "Aramaya başlamak için yazın", "citizen-search-empty-desc": "Aramaya başlamak için yazın",
"citizen-tagline-ns-talk": "{{SUBJECTPAGENAME}} tartışma sayfası", "citizen-tagline-ns-talk": "{{SUBJECTPAGENAME}} tartışma sayfası",
"citizen-tagline-ns-project": "{{SITENAME}} hakkında bilgi", "citizen-tagline-ns-project": "{{SITENAME}} hakkında bilgi",
"citizen-tagline-ns-file": "{{SITENAME}} sitesindeki dosya", "citizen-tagline-ns-file": "{{SITENAME}} sitesindeki dosya",

2
i18n/uk.json
查看文件

@ -16,7 +16,7 @@
"citizen-action-addsection": "Додати тему", "citizen-action-addsection": "Додати тему",
"citizen-jumptotop": "Повернутись угору", "citizen-jumptotop": "Повернутись угору",
"citizen-search-fulltext": "Пошук сторінок, що містять", "citizen-search-fulltext": "Пошук сторінок, що містять",
"citizen-search-fulltext-empty": "Введіть, щоб почати пошук", "citizen-search-empty-desc": "Введіть, щоб почати пошук",
"citizen-tagline-ns-talk": "Сторінка обговорення {{SUBJECTPAGENAME}}", "citizen-tagline-ns-talk": "Сторінка обговорення {{SUBJECTPAGENAME}}",
"citizen-tagline-ns-project": "Інформація про {{SITENAME}}", "citizen-tagline-ns-project": "Інформація про {{SITENAME}}",
"citizen-tagline-ns-file": "Файл на {{SITENAME}}", "citizen-tagline-ns-file": "Файл на {{SITENAME}}",

2
i18n/yue.json
查看文件

@ -21,7 +21,7 @@
"citizen-action-addsection": "加主題", "citizen-action-addsection": "加主題",
"citizen-jumptotop": "返到上面", "citizen-jumptotop": "返到上面",
"citizen-search-fulltext": "喺每頁入面喥搵$1", "citizen-search-fulltext": "喺每頁入面喥搵$1",
"citizen-search-fulltext-empty": "打字開始搵", "citizen-search-empty-desc": "打字開始搵",
"citizen-tagline-ns-talk": "{{SUBJECTPAGENAME}}嘅討論頁", "citizen-tagline-ns-talk": "{{SUBJECTPAGENAME}}嘅討論頁",
"citizen-tagline-ns-project": "關於{{SITENAME}}嘅資料", "citizen-tagline-ns-project": "關於{{SITENAME}}嘅資料",
"citizen-tagline-ns-file": "喺{{SITENAME}}嘅檔案", "citizen-tagline-ns-file": "喺{{SITENAME}}嘅檔案",

2
i18n/zh-hans.json
查看文件

@ -28,7 +28,7 @@
"citizen-action-addsection": "添加话题", "citizen-action-addsection": "添加话题",
"citizen-jumptotop": "回到顶部", "citizen-jumptotop": "回到顶部",
"citizen-search-fulltext": "搜索包含“$1”的页面", "citizen-search-fulltext": "搜索包含“$1”的页面",
"citizen-search-fulltext-empty": "键入以开始搜索", "citizen-search-empty-desc": "键入以开始搜索",
"citizen-search-noresults-title": "抱歉！没有找到“$1”的搜索结果", "citizen-search-noresults-title": "抱歉！没有找到“$1”的搜索结果",
"citizen-search-noresults-desc": "也许可以试试下面的选项？", "citizen-search-noresults-desc": "也许可以试试下面的选项？",
"citizen-tagline-ns-talk": "{{SUBJECTPAGENAME}}的讨论页", "citizen-tagline-ns-talk": "{{SUBJECTPAGENAME}}的讨论页",

2
i18n/zh-hant.json
查看文件

@ -26,7 +26,7 @@
"citizen-action-addsection": "新增話題", "citizen-action-addsection": "新增話題",
"citizen-jumptotop": "返回頂端", "citizen-jumptotop": "返回頂端",
"citizen-search-fulltext": "搜尋包含「$1」的頁面：", "citizen-search-fulltext": "搜尋包含「$1」的頁面：",
"citizen-search-fulltext-empty": "輸入以開始搜尋", "citizen-search-empty-desc": "輸入以開始搜尋",
"citizen-search-noresults-title": "呃哦！ $1沒有結果", "citizen-search-noresults-title": "呃哦！ $1沒有結果",
"citizen-search-noresults-desc": "也許試試下面的選項？", "citizen-search-noresults-desc": "也許試試下面的選項？",
"citizen-tagline-ns-talk": "{{SUBJECTPAGENAME}}的討論頁", "citizen-tagline-ns-talk": "{{SUBJECTPAGENAME}}的討論頁",

5
i18n/zh-hk.json
查看文件

@ -5,7 +5,8 @@
"Diskdance", "Diskdance",
"LuciferianThomas", "LuciferianThomas",
"Tranve", "Tranve",
"Winston Sung" "Winston Sung",
"捍粵者"
] ]
}, },
"skinname-citizen": "公民（Citizen）", "skinname-citizen": "公民（Citizen）",
@ -21,7 +22,7 @@
"citizen-action-addsection": "新增話題", "citizen-action-addsection": "新增話題",
"citizen-jumptotop": "返回頂端", "citizen-jumptotop": "返回頂端",
"citizen-search-fulltext": "搜尋包含", "citizen-search-fulltext": "搜尋包含",
"citizen-search-fulltext-empty": "輸入開始搜尋", "citizen-search-empty-desc": "輸入開始搜尋",
"citizen-tagline-ns-talk": "{{SUBJECTPAGENAME}}的討論頁面", "citizen-tagline-ns-talk": "{{SUBJECTPAGENAME}}的討論頁面",
"citizen-tagline-ns-project": "關於{{SITENAME}}的資訊", "citizen-tagline-ns-project": "關於{{SITENAME}}的資訊",
"citizen-tagline-ns-file": "{{SITENAME}}上的檔案", "citizen-tagline-ns-file": "{{SITENAME}}上的檔案",

2
includes/Hooks/ResourceLoaderHooks.php
查看文件

@ -26,6 +26,7 @@ declare( strict_types=1 );
namespace MediaWiki\Skins\Citizen\Hooks; namespace MediaWiki\Skins\Citizen\Hooks;
use Config; use Config;
use ExtensionRegistry;
use MediaWiki\ResourceLoader as RL; use MediaWiki\ResourceLoader as RL;
/** /**
@ -64,6 +65,7 @@ class ResourceLoaderHooks {
'wgCitizenMaxSearchResults' => $config->get( 'CitizenMaxSearchResults' ), 'wgCitizenMaxSearchResults' => $config->get( 'CitizenMaxSearchResults' ),
'wgScriptPath' => $config->get( 'ScriptPath' ), 'wgScriptPath' => $config->get( 'ScriptPath' ),
'wgSearchSuggestCacheExpiry' => $config->get( 'SearchSuggestCacheExpiry' ), 'wgSearchSuggestCacheExpiry' => $config->get( 'SearchSuggestCacheExpiry' ),
'isMediaSearchExtensionEnabled' => ExtensionRegistry::getInstance()->isLoaded( 'MediaSearch' ),
]; ];
} }
} }

4
package-lock.json 自动生成的
查看文件

@ -1,11 +1,11 @@
{ {
"name": "mediawiki-skins-Citizen", "name": "mediawiki-skins-Citizen",
"version": "2.2.0", "version": "2.3.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"version": "2.2.0", "version": "2.3.0",
"devDependencies": { "devDependencies": {
"@commitlint/cli": "^17.3.0", "@commitlint/cli": "^17.3.0",
"@commitlint/config-conventional": "^17.3.0", "@commitlint/config-conventional": "^17.3.0",

2
package.json
查看文件

@ -30,5 +30,5 @@
"stylelint-config-wikimedia": "0.13.1", "stylelint-config-wikimedia": "0.13.1",
"svgo": "3.0.2" "svgo": "3.0.2"
}, },
"version": "2.2.0" "version": "2.3.0"
} }

119
resources/skins.citizen.search/skins.citizen.search.less
查看文件

@ -9,46 +9,20 @@
box-sizing: border-box; box-sizing: border-box;
padding: 0.75rem 0 0 0; padding: 0.75rem 0 0 0;
margin: -0.75rem 0 0 0; // Reset <ol> styles margin: -0.75rem 0 0 0; // Reset <ol> styles
overscroll-behavior: contain;
//border-radius: 0 0 var( --border-radius--medium ) var( --border-radius--medium ); //border-radius: 0 0 var( --border-radius--medium ) var( --border-radius--medium );
.citizen-card; .citizen-card;
.citizen-card-hide( 50% 0, Y, false ); .citizen-card-hide( 50% 0, Y, false );
// Well this won't be loaded before .citizen-animation-ready anyways // Well this won't be loaded before .citizen-animation-ready anyways
.citizen-card-transition(); .citizen-card-transition();
&__placeholder {
.citizen-typeahead {
&__content {
flex-direction: column;
padding: var( --space-xl ) 0;
text-align: center;
}
&__thumbnail {
margin-bottom: var( --space-sm );
}
}
}
&__item { &__item {
&--active {
background-color: var( --background-color-primary--hover );
}
.citizen-typeahead { .citizen-typeahead {
&__thumbnail { &__thumbnail {
margin-right: var( --space-sm ); margin-right: var( --space-sm );
background-color: #eaecf0;
background-position: center;
background-size: cover;
&.citizen-ui-icon { &.citizen-ui-icon {
width: 70px; width: 100%; // reset width
height: 60px;
background-color: var( --color-surface-3 );
&:before {
background-size: 20px;
}
} }
} }
@ -56,13 +30,71 @@
white-space: nowrap; white-space: nowrap;
} }
} }
}
&__placeholder, &--active {
&__item { background-color: var( --background-color-primary--hover );
}
&--hidden { &--hidden {
display: none; display: none;
} }
&--placeholder {
.citizen-typeahead {
&__content {
flex-direction: column;
padding: var( --space-xl ) 0;
text-align: center;
}
&__thumbnail {
margin-bottom: var( --space-sm );
}
}
}
&--page {
.citizen-typeahead {
&__thumbnail {
background-color: #eaecf0;
background-position: center;
background-size: cover;
&.citizen-ui-icon {
height: 60px;
background-color: var( --color-surface-3 );
&:before {
background-size: 20px;
}
}
}
}
}
&--tool {
.citizen-typeahead {
&__content {
padding: var( --space-sm ) 0;
border-top: 1px solid var( --border-color-base );
}
&__thumbnail {
height: var( --size-icon );
background-color: transparent;
}
&__description {
color: var( --color-base );
}
}
+ .citizen-typeahead__item--tool {
.citizen-typeahead__content {
border-top: 0;
}
}
}
} }
&__content { &__content {
@ -107,6 +139,11 @@
font-weight: var( --font-weight-medium ); font-weight: var( --font-weight-medium );
} }
&__query {
color: var( --color-base--emphasized );
font-weight: var( --font-weight-semibold );
}
&__label { &__label {
display: flex; display: flex;
margin-left: var( --space-xs ); margin-left: var( --space-xs );
@ -155,26 +192,6 @@
} }
} }
#citizen-typeahead-fulltext {
.citizen-typeahead {
&__content {
padding: var( --space-md ) 0;
border-top: 1px solid var( --border-color-base );
}
&__thumbnail {
height: var( --size-icon );
background-color: transparent;
}
&__description {
strong {
color: var( --color-base--emphasized );
}
}
}
}
// HACK: This is as close as we can to detect whether there is a keyboard in CSS // HACK: This is as close as we can to detect whether there is a keyboard in CSS
@media ( hover: hover ) and ( pointer: fine ) { @media ( hover: hover ) and ( pointer: fine ) {
.citizen-typeahead { .citizen-typeahead {

4
resources/skins.citizen.search/templates/typeahead.mustache
查看文件

@ -5,12 +5,12 @@
<ol id="searchform-suggestions" class="citizen-typeahead" role="listbox"> <ol id="searchform-suggestions" class="citizen-typeahead" role="listbox">
{{! Empty state }} {{! Empty state }}
<li class="citizen-typeahead__placeholder citizen-typeahead__placeholder--noQuery"> <li class="citizen-typeahead__item--placeholder">
<div class="citizen-typeahead__content"> <div class="citizen-typeahead__content">
<div class="citizen-typeahead__thumbnail citizen-ui-icon articlesSearch mw-ui-icon-wikimedia-articlesSearch"></div> <div class="citizen-typeahead__thumbnail citizen-ui-icon articlesSearch mw-ui-icon-wikimedia-articlesSearch"></div>
<div class="citizen-typeahead__text"> <div class="citizen-typeahead__text">
<div class="citizen-typeahead__title">{{msg-searchsuggest-search}}</div> <div class="citizen-typeahead__title">{{msg-searchsuggest-search}}</div>
<div class="citizen-typeahead__description">{{msg-citizen-search-fulltext-empty}}</div> <div class="citizen-typeahead__description">{{msg-citizen-search-empty-desc}}</div>
</div> </div>
</div> </div>
</li> </li>

271
resources/skins.citizen.search/typeahead.js
查看文件

@ -1,14 +1,21 @@
/* eslint-disable es-x/no-symbol-prototype-description */ /* eslint-disable es-x/no-symbol-prototype-description */
const const
config = require( './config.json' ),
PREFIX = 'citizen-typeahead', PREFIX = 'citizen-typeahead',
SEARCH_LOADING_CLASS = 'citizen-loading'; SEARCH_LOADING_CLASS = 'citizen-loading',
ITEM_CLASS = `${PREFIX}__item`,
ACTIVE_CLASS = `${ITEM_CLASS}--active`,
HIDDEN_CLASS = `${ITEM_CLASS}--hidden`;
/**
* Config object from getCitizenSearchResourceLoaderConfig()
*/
const config = require( './config.json' );
const activeIndex = { const activeIndex = {
index: -1, index: -1,
max: config.wgCitizenMaxSearchResults + 1, max: config.wgCitizenMaxSearchResults + 1,
setMax: function ( x ) { setMax: function ( x ) {
this.max = x + 1; this.max = x;
}, },
increment: function ( i ) { increment: function ( i ) {
this.index += i; this.index += i;
@ -31,15 +38,28 @@ const activeIndex = {
} }
}; };
let typeahead, searchInput; let /** @type {HTMLElement | undefined} */ typeahead;
let /** @type {HTMLElement | undefined} */ searchInput;
/* /**
* @typedef {Object} MenuItemData
* @property {string} id
* @property {string} type
* @property {string} link
* @property {string} icon
* @property {string} thumbnail
* @property {string} title
* @property {string} label
* @property {string} description
*/
/**
* Sets an 'ACTIVE_CLASS' on the element
*
* @param {HTMLElement} element * @param {HTMLElement} element
* @return {void}
*/ */
function toggleActive( element ) { function toggleActive( element ) {
const ACTIVE_CLASS = PREFIX + '__item--active'; const typeaheadItems = typeahead.querySelectorAll( `.${ITEM_CLASS}` );
const typeaheadItems = typeahead.querySelectorAll( '.' + PREFIX + '__item' );
for ( let i = 0; i < typeaheadItems.length; i++ ) { for ( let i = 0; i < typeaheadItems.length; i++ ) {
if ( element !== typeaheadItems[ i ] ) { if ( element !== typeaheadItems[ i ] ) {
@ -54,7 +74,6 @@ function toggleActive( element ) {
} }
} }
} }
/* eslint-enable mediawiki/class-doc */
} }
/** /**
@ -69,7 +88,7 @@ function keyboardEvents( event ) {
} }
// Is children slower? // Is children slower?
const typeaheadItems = typeahead.querySelectorAll( '.' + PREFIX + '__item' ); const typeaheadItems = typeahead.querySelectorAll( `.${ITEM_CLASS}` );
if ( event.key === 'ArrowDown' || event.key === 'ArrowUp' ) { if ( event.key === 'ArrowDown' || event.key === 'ArrowUp' ) {
if ( event.key === 'ArrowDown' ) { if ( event.key === 'ArrowDown' ) {
@ -83,7 +102,7 @@ function keyboardEvents( event ) {
} }
if ( typeaheadItems[ activeIndex.index ] ) { if ( typeaheadItems[ activeIndex.index ] ) {
const link = typeaheadItems[ activeIndex.index ].querySelector( '.' + PREFIX + '__content' ); const link = typeaheadItems[ activeIndex.index ].querySelector( `.${PREFIX}__content` );
if ( event.key === 'Enter' && link instanceof HTMLAnchorElement ) { if ( event.key === 'Enter' && link instanceof HTMLAnchorElement ) {
event.preventDefault(); event.preventDefault();
link.click(); link.click();
@ -91,23 +110,10 @@ function keyboardEvents( event ) {
} }
} }
/* /**
* Attach mouse eventlistener to all typeahead items
*
* @return {void}
*/
function attachMouseListener() {
const items = typeahead.querySelectorAll( '.' + PREFIX + '__item' );
items.forEach( ( item ) => {
bindMouseHoverEvent( item );
} );
}
/*
* Bind mouseenter and mouseleave event to reproduce mouse hover event * Bind mouseenter and mouseleave event to reproduce mouse hover event
* *
* @param {HTMLElement} element * @param {HTMLElement} element
* @return {void}
*/ */
function bindMouseHoverEvent( element ) { function bindMouseHoverEvent( element ) {
element.addEventListener( 'mouseenter', ( event ) => { element.addEventListener( 'mouseenter', ( event ) => {
@ -120,33 +126,24 @@ function bindMouseHoverEvent( element ) {
/** /**
* Remove all existing suggestions from typeahead * Remove all existing suggestions from typeahead
*
* @return {void}
*/ */
function clearSuggestions() { function clearSuggestions() {
const typeaheadItems = typeahead.children, const typeaheadItems = typeahead.children;
nonSuggestionCount = 3;
if ( typeaheadItems.length > nonSuggestionCount ) { if ( typeaheadItems.length > 0 ) {
// Splice would be cleaner but it is slower (?) // Do all the work in document fragment then replace the whole list
const fragment = new DocumentFragment(), // It is more performant this way
nonSuggestionItems = [ ...typeaheadItems ].slice( const
typeaheadItems.length - nonSuggestionCount, typeaheadItems.length fragment = new DocumentFragment(),
); template = document.getElementById( `${PREFIX}-template` );
nonSuggestionItems.forEach( ( item ) => { [ ...typeaheadItems ].forEach( ( item ) => {
fragment.append( item ); if ( !item.classList.contains( `${ITEM_CLASS}--page` ) ) {
} ); fragment.append( item );
// TODO: Just use replaceChildren when browser support is >90%
if ( typeof typeahead.replaceChildren !== 'undefined' ) {
typeahead.replaceChildren( fragment );
} else {
while ( typeahead.hasChildNodes() ) {
typeahead.removeChild( typeahead.lastChild );
} }
typeahead.appendChild( fragment ); } );
} fragment.append( template );
typeahead.replaceChildren( fragment );
} }
// Remove loading animation // Remove loading animation
@ -161,23 +158,36 @@ function clearSuggestions() {
* @param {string} searchQuery * @param {string} searchQuery
* @param {string} htmlSafeSearchQuery * @param {string} htmlSafeSearchQuery
* @param {HTMLElement} placeholder * @param {HTMLElement} placeholder
* @return {void}
*/ */
function getSuggestions( searchQuery, htmlSafeSearchQuery, placeholder ) { function getSuggestions( searchQuery, htmlSafeSearchQuery, placeholder ) {
const renderSuggestions = ( results ) => { const renderSuggestions = ( results ) => {
if ( results.length > 0 ) { if ( results.length > 0 ) {
const const
fragment = document.createDocumentFragment(), fragment = document.createDocumentFragment(),
suggestionLinkPrefix = config.wgScriptPath + '/index.php?title=Special:Search&search='; suggestionLinkPrefix = `${config.wgScriptPath}/index.php?title=Special:Search&search=`;
/**
* Return the redirect title with search query highlight
*
* @param {string} text
* @return {string}
*/
const highlightTitle = ( text ) => { const highlightTitle = ( text ) => {
const regex = new RegExp( mw.util.escapeRegExp( htmlSafeSearchQuery ), 'i' ); const regex = new RegExp( mw.util.escapeRegExp( htmlSafeSearchQuery ), 'i' );
return text.replace( regex, '<span class="' + PREFIX + '__highlight">$&</span>' ); return text.replace( regex, `<span class="${PREFIX}__highlight">$&</span>` );
}; };
/**
* Return the HTML of the redirect label
*
* @param {string} title
* @param {string} matchedTitle
* @return {string}
*/
const getRedirectLabel = ( title, matchedTitle ) => { const getRedirectLabel = ( title, matchedTitle ) => {
// Check if the redirect is useful /**
// See T303013 * Check if the redirect is useful (T303013)
*
* @return {boolean}
*/
const isRedirectUseful = () => { const isRedirectUseful = () => {
// Change to lowercase then remove space and dashes // Change to lowercase then remove space and dashes
const cleanup = ( text ) => { const cleanup = ( text ) => {
@ -187,21 +197,20 @@ function getSuggestions( searchQuery, htmlSafeSearchQuery, placeholder ) {
cleanTitle = cleanup( title ), cleanTitle = cleanup( title ),
cleanMatchedTitle = cleanup( matchedTitle ); cleanMatchedTitle = cleanup( matchedTitle );
// eslint-disable-next-line max-len, es-x/no-array-prototype-includes return !(
return !( cleanTitle.includes( cleanMatchedTitle ) || cleanMatchedTitle.includes( cleanTitle ) ); cleanTitle.includes( cleanMatchedTitle ) ||
cleanMatchedTitle.includes( cleanTitle )
);
}; };
let html = ''; let html = '';
// Result is a redirect // Result is a redirect
// Show the redirect title and highlight it // Show the redirect title and highlight it
if ( matchedTitle && isRedirectUseful() ) { if ( matchedTitle && isRedirectUseful() ) {
html = '<div class="' + PREFIX + '__labelItem" title="' + mw.message( 'search-redirect', matchedTitle ).plain() + '">' + html = `<div class="${PREFIX}__labelItem" title="${mw.message( 'search-redirect', matchedTitle ).plain()}">
/* Article redirect icon */ <span class="citizen-ui-icon mw-ui-icon-wikimedia-articleRedirect"></span>
'<span class="citizen-ui-icon mw-ui-icon-wikimedia-articleRedirect"></span>' + <span>${highlightTitle( matchedTitle )}</span>
/* Since we are matching that redirect title, it should be highlighted */ </div>`;
highlightTitle( matchedTitle ) +
'</div>';
} }
return html; return html;
@ -210,7 +219,8 @@ function getSuggestions( searchQuery, htmlSafeSearchQuery, placeholder ) {
// Create suggestion items // Create suggestion items
results.forEach( ( result, index ) => { results.forEach( ( result, index ) => {
const data = { const data = {
id: PREFIX + '-suggestion-' + index, id: `${PREFIX}-suggestion-${index}`,
type: 'page',
link: suggestionLinkPrefix + encodeURIComponent( result.key ), link: suggestionLinkPrefix + encodeURIComponent( result.key ),
title: highlightTitle( result.title ), title: highlightTitle( result.title ),
// Just to be safe, not sure if the default API is HTML escaped // Just to be safe, not sure if the default API is HTML escaped
@ -228,7 +238,7 @@ function getSuggestions( searchQuery, htmlSafeSearchQuery, placeholder ) {
fragment.append( getMenuItem( data ) ); fragment.append( getMenuItem( data ) );
} ); } );
// Hide placeholder // Hide placeholder
placeholder.classList.add( PREFIX + '__placeholder--hidden' ); placeholder.classList.add( HIDDEN_CLASS );
typeahead.prepend( fragment ); typeahead.prepend( fragment );
} else { } else {
// Update placeholder with no result content // Update placeholder with no result content
@ -236,11 +246,12 @@ function getSuggestions( searchQuery, htmlSafeSearchQuery, placeholder ) {
placeholder, placeholder,
{ {
icon: 'articleNotFound', icon: 'articleNotFound',
class: PREFIX + '__placeholder ' + PREFIX + '__placeholder--noResult', type: 'placeholder',
title: mw.message( 'citizen-search-noresults-title', htmlSafeSearchQuery ).text(), title: mw.message( 'citizen-search-noresults-title', htmlSafeSearchQuery ).text(),
description: mw.message( 'citizen-search-noresults-desc' ).text() description: mw.message( 'citizen-search-noresults-desc' ).text()
} }
); );
placeholder.classList.remove( HIDDEN_CLASS );
} }
}; };
@ -267,16 +278,14 @@ function getSuggestions( searchQuery, htmlSafeSearchQuery, placeholder ) {
clearSuggestions(); clearSuggestions();
if ( results !== null ) { if ( results !== null ) {
renderSuggestions( results ); renderSuggestions( results );
attachMouseListener();
} }
activeIndex.setMax( results.length );
} ).catch( ( error ) => { } ).catch( ( error ) => {
searchInput.removeEventListener( 'input', abortFetch ); searchInput.removeEventListener( 'input', abortFetch );
searchInput.parentNode.classList.remove( SEARCH_LOADING_CLASS ); searchInput.parentNode.classList.remove( SEARCH_LOADING_CLASS );
// User can trigger the abort when the fetch event is pending // User can trigger the abort when the fetch event is pending
// There is no need for an error // There is no need for an error
if ( error.name !== 'AbortError' ) { if ( error.name !== 'AbortError' ) {
const message = 'Uh oh, a wild error appears! ' + error; const message = `Uh oh, a wild error appears! ${error}`;
throw new Error( message ); throw new Error( message );
} }
} ); } );
@ -286,41 +295,41 @@ function getSuggestions( searchQuery, htmlSafeSearchQuery, placeholder ) {
* Update menu item element * Update menu item element
* *
* @param {HTMLElement} item * @param {HTMLElement} item
* @param {Object} data * @param {MenuItemData} data
* @return {void}
*/ */
function updateMenuItem( item, data ) { function updateMenuItem( item, data ) {
if ( data.id ) { if ( data.id ) {
item.setAttribute( 'id', data.id ); item.setAttribute( 'id', data.id );
} }
if ( data.class ) { if ( data.type ) {
// So that it can overwrite the original class item.classList.add( `${ITEM_CLASS}--${data.type}` );
// We use that in placeholder
item.setAttribute( 'class', data.class );
} }
if ( data.link ) { if ( data.link ) {
const link = item.querySelector( '.' + PREFIX + '__content' ); const link = item.querySelector( `.${PREFIX}__content` );
link.setAttribute( 'href', data.link ); link.setAttribute( 'href', data.link );
} }
if ( data.icon || data.thumbnail ) { if ( data.icon || data.thumbnail ) {
const thumbnail = item.querySelector( '.' + PREFIX + '__thumbnail' ); const thumbnail = item.querySelector( `.${PREFIX}__thumbnail` );
if ( data.thumbnail ) { if ( data.thumbnail ) {
thumbnail.style.backgroundImage = 'url(' + data.thumbnail + ')'; thumbnail.style.backgroundImage = `url('${data.thumbnail}')`;
} else { } else {
// FIXME: There is probably a cleaner way thumbnail.classList.add(
thumbnail.setAttribute( 'class', PREFIX + '__thumbnail citizen-ui-icon mw-ui-icon-wikimedia-' + data.icon ); `${PREFIX}__thumbnail`,
'citizen-ui-icon',
`mw-ui-icon-wikimedia-${data.icon}`
);
} }
} }
if ( data.title ) { if ( data.title ) {
const title = item.querySelector( '.' + PREFIX + '__title' ); const title = item.querySelector( `.${PREFIX}__title` );
title.innerHTML = data.title; title.innerHTML = data.title;
} }
if ( data.label ) { if ( data.label ) {
const label = item.querySelector( '.' + PREFIX + '__label' ); const label = item.querySelector( `.${PREFIX}__label` );
label.innerHTML = data.label; label.innerHTML = data.label;
} }
if ( data.description ) { if ( data.description ) {
const description = item.querySelector( '.' + PREFIX + '__description' ); const description = item.querySelector( `.${PREFIX}__description` );
description.innerHTML = data.description; description.innerHTML = data.description;
} }
} }
@ -328,11 +337,11 @@ function updateMenuItem( item, data ) {
/** /**
* Generate menu item HTML using the existing template * Generate menu item HTML using the existing template
* *
* @param {Object} data * @param {MenuItemData} data
* @return {HTMLElement|void} * @return {HTMLElement|void}
*/ */
function getMenuItem( data ) { function getMenuItem( data ) {
const template = document.getElementById( PREFIX + '-template' ); const template = document.getElementById( `${PREFIX}-template` );
// Shouldn't happen but just to be safe // Shouldn't happen but just to be safe
if ( !( template instanceof HTMLTemplateElement ) ) { if ( !( template instanceof HTMLTemplateElement ) ) {
@ -341,8 +350,9 @@ function getMenuItem( data ) {
const const
fragment = template.content.cloneNode( true ), fragment = template.content.cloneNode( true ),
item = fragment.querySelector( '.' + PREFIX + '__item' ); item = fragment.querySelector( `.${ITEM_CLASS}` );
updateMenuItem( item, data ); updateMenuItem( item, data );
bindMouseHoverEvent( item );
return fragment; return fragment;
} }
@ -350,47 +360,74 @@ function getMenuItem( data ) {
* Update the typeahead element * Update the typeahead element
* *
* @param {Object} messages * @param {Object} messages
* @return {void}
*/ */
function updateTypeahead( messages ) { function updateTypeahead( messages ) {
const const
searchQuery = searchInput.value, searchQuery = searchInput.value,
htmlSafeSearchQuery = mw.html.escape( searchQuery ), htmlSafeSearchQuery = mw.html.escape( searchQuery ),
hasQuery = searchQuery.length > 0, hasQuery = searchQuery.length > 0,
placeholder = typeahead.querySelector( '.' + PREFIX + '__placeholder' ); placeholder = typeahead.querySelector( `.${ITEM_CLASS}--placeholder` );
const updateFullTextSearchItem = () => { /**
* Update a tool item or create it if it does not exist
*
* @param {Object} data
*/
const updateToolItem = ( data ) => {
const const
FULLTEXT_ID = PREFIX + '-fulltext', itemId = `${PREFIX}-${data.id}`,
HIDDEN_CLASS = PREFIX + '__item--hidden'; query = `<span class="citizen-typeahead__query">${htmlSafeSearchQuery}</span>`,
itemLink = data.link + htmlSafeSearchQuery,
/* eslint-disable-next-line mediawiki/msg-doc */
itemDesc = mw.message( data.msg, query );
const let item = document.getElementById( itemId );
fulltextEl = document.getElementById( FULLTEXT_ID ),
highlightedQuery = '<strong>' + htmlSafeSearchQuery + '</strong>',
fulltextText = mw.message( 'citizen-search-fulltext', highlightedQuery );
const item = getMenuItem( {
icon: 'articleSearch',
id: FULLTEXT_ID,
link: config.wgScriptPath + '/index.php?title=Special:Search&fulltext=1&search=' + htmlSafeSearchQuery,
description: fulltextText
} );
// Update existing element instead of creating a new one // Update existing element instead of creating a new one
if ( fulltextEl ) { if ( item ) {
updateMenuItem( fulltextEl, { description: fulltextText } ); // FIXME: Probably more efficient to just replace the query than the whole messaage?
updateMenuItem(
item,
{
link: itemLink,
description: itemDesc
}
);
// FIXME: There is probably a more efficient way // FIXME: There is probably a more efficient way
if ( hasQuery ) { if ( hasQuery ) {
fulltextEl.classList.remove( HIDDEN_CLASS ); item.classList.remove( HIDDEN_CLASS );
} else { } else {
fulltextEl.classList.add( HIDDEN_CLASS ); item.classList.add( HIDDEN_CLASS );
} }
} else { } else {
item = getMenuItem( {
icon: data.icon,
id: itemId,
type: 'tool',
link: itemLink,
description: itemDesc
} );
typeahead.append( item ); typeahead.append( item );
} }
}; };
updateFullTextSearchItem(); // Fulltext search
updateToolItem( {
id: 'fulltext',
link: `${config.wgScriptPath}/index.php?title=Special:Search&fulltext=1&search=`,
icon: 'articleSearch',
msg: 'citizen-search-fulltext'
} );
// MediaSearch
if ( config.isMediaSearchExtensionEnabled ) {
updateToolItem( {
id: 'mediasearch',
link: `${config.wgScriptPath}/index.php?title=Special:MediaSearch&type=image&search=`,
icon: 'imageGallery',
msg: 'citizen-search-mediasearch'
} );
}
if ( hasQuery ) { if ( hasQuery ) {
getSuggestions( searchQuery, htmlSafeSearchQuery, placeholder ); getSuggestions( searchQuery, htmlSafeSearchQuery, placeholder );
@ -401,34 +438,35 @@ function updateTypeahead( messages ) {
placeholder, placeholder,
{ {
icon: 'articlesSearch', icon: 'articlesSearch',
class: PREFIX + '__placeholder ' + PREFIX + '__placeholder--noQuery', title: messages.emptyTitle,
title: messages.searchsuggestSearch, description: messages.emptyDesc
description: messages.fulltextEmpty
} }
); );
placeholder.classList.remove( HIDDEN_CLASS );
} }
// -1 as there is a template element
activeIndex.setMax( typeahead.children.length - 1 );
} }
/** /**
* @param {HTMLElement} searchForm * @param {HTMLElement} searchForm
* @param {HTMLInputElement} input * @param {HTMLInputElement} input
* @return {void}
*/ */
function initTypeahead( searchForm, input ) { function initTypeahead( searchForm, input ) {
const EXPANDED_CLASS = 'citizen-typeahead--expanded'; const EXPANDED_CLASS = 'citizen-typeahead--expanded';
const const
messages = { messages = {
fulltextEmpty: mw.message( 'citizen-search-fulltext-empty' ).text(), emptyTitle: mw.message( 'searchsuggest-search' ).text(),
searchsuggestSearch: mw.message( 'searchsuggest-search' ).text() emptyDesc: mw.message( 'citizen-search-empty-desc' ).text()
}, },
template = mw.template.get( template = mw.template.get(
'skins.citizen.search', 'skins.citizen.search',
'resources/skins.citizen.search/templates/typeahead.mustache' 'resources/skins.citizen.search/templates/typeahead.mustache'
), ),
data = { data = {
'msg-citizen-search-fulltext-empty': messages.fulltextEmpty, 'msg-searchsuggest-search': messages.emptyTitle,
'msg-searchsuggest-search': messages.searchsuggestSearch 'msg-citizen-search-empty-desc': messages.emptyDesc
}; };
const onBlur = ( event ) => { const onBlur = ( event ) => {
@ -463,9 +501,6 @@ function initTypeahead( searchForm, input ) {
searchInput.setAttribute( 'aria-autocomplete', 'list' ); searchInput.setAttribute( 'aria-autocomplete', 'list' );
searchInput.setAttribute( 'aria-controls', 'searchform-suggestions' ); searchInput.setAttribute( 'aria-controls', 'searchform-suggestions' );
// Attach mouse listener to inital typeahead items
attachMouseListener();
// Since searchInput is focused before the event listener is set up // Since searchInput is focused before the event listener is set up
onFocus(); onFocus();
searchInput.addEventListener( 'focus', onFocus ); searchInput.addEventListener( 'focus', onFocus );

3
resources/skins.citizen.styles/StickyHeader.less
查看文件

@ -45,10 +45,13 @@
.page-heading { .page-heading {
position: relative; position: relative;
min-width: 0;
} }
.firstHeading { .firstHeading {
overflow: hidden;
font-size: var( --font-size-h3 ); font-size: var( --font-size-h3 );
text-overflow: ellipsis;
} }
.citizen-jumptotop { .citizen-jumptotop {

4
resources/skins.citizen.styles/common/cssvariables.less
查看文件

@ -12,10 +12,6 @@
--background-color-overlay: @background-color-overlay; --background-color-overlay: @background-color-overlay;
--background-color-overlay--lighter: @background-color-overlay--lighter; --background-color-overlay--lighter: @background-color-overlay--lighter;
--background-color-framed: @background-color-framed;
--background-color-framed--hover: @background-color-framed--hover;
--background-color-framed--active: @background-color-framed--active;
--background-color-input: @background-color-input;
--background-color-icon: @background-color-icon; --background-color-icon: @background-color-icon;
--background-color-icon--hover: @background-color-icon--hover; --background-color-icon--hover: @background-color-icon--hover;
--background-color-icon--active: @background-color-icon--active; --background-color-icon--active: @background-color-icon--active;

2
resources/skins.citizen.styles/common/scrollbar.less
查看文件

@ -15,7 +15,7 @@
transition: @transition-background; transition: @transition-background;
&:hover { &:hover {
background: var( --background-color-framed ); background: var( --background-color-quiet--hover );
} }
} }

6
resources/skins.citizen.styles/skinning/content.tables.less
查看文件

@ -55,9 +55,3 @@
padding: var( --space-xs ) var( --space-sm ); padding: var( --space-xs ) var( --space-sm );
} }
} }
@media ( max-width: @width-breakpoint-desktop-wide ) {
table.wikiatble {
white-space: nowrap;
}
}

1
resources/skins.citizen.styles/skinning/elements.less
查看文件

@ -191,7 +191,6 @@ fieldset {
padding: var( --space-xs ) var( --space-md ); padding: var( --space-xs ) var( --space-md );
border: 1px solid var( --border-color-base ); border: 1px solid var( --border-color-base );
margin: var( --space-md ) 0; margin: var( --space-md ) 0;
font-size: 0.875rem;
} }
legend { legend {

10
resources/skins.citizen.styles/skinning/interface-subtitle.less
查看文件

@ -20,6 +20,16 @@
line-height: var( --line-height-xs ); line-height: var( --line-height-xs );
} }
#contentSub,
#contentSub2 {
margin-bottom: var( --space-md );
}
// Reduced spacing if both sub1 and 2 exists
#contentSub + #contentSub2 {
margin-top: ~'calc( var( --space-xs ) * -1 )';
}
span.subpages { span.subpages {
display: block; display: block;
} }

26
resources/variables.less
查看文件

@ -101,20 +101,6 @@
@color-syntax-violet: #945eb8; @color-syntax-violet: #945eb8;
@color-syntax-grey: #90a4ae; @color-syntax-grey: #90a4ae;
/* Dark theme */
@diff-hoverstate-dark: 4;
@color-primary__l-dark: 60%;
@color-surface-0-dark: ~'hsl( 210, 27%, 10% )';
@color-surface-1-dark: ~'hsl( 212, 15%, 17% )';
@color-surface-2-dark: ~'hsl( 208, 14%, 18% )';
@color-surface-3-dark: ~'hsl( 210, 11%, 21% )';
@color-surface-4-dark: ~'hsl( 210, 10%, 24% )';
@color-surface-2-dark--hover: ~'hsl( 208, 14%, 'unit( 18 + @diff-hoverstate-dark, % )~' )';
@color-surface-2-dark--active: ~'hsl( 208, 14%, 'unit( 18 - @diff-hoverstate-dark, % )~' )';
/* /*
* Syntax highlight colors * Syntax highlight colors
* Based on Material Theme Palenight * Based on Material Theme Palenight
@ -140,7 +126,7 @@
* referring to them as applied further below. * referring to them as applied further below.
*/ */
@color-base0: #000; // = HSB 0°, 0%, 0% // @color-base0: #000; // = HSB 0°, 0%, 0%
@color-base10: #202122; // = HSB 210°, 6%, 13% @color-base10: #202122; // = HSB 210°, 6%, 13%
@color-base20: #54595d; // = HSB 207°, 10%, 36%; WCAG 2.0 level AAA 7.09:1 contrast ratio on `#fff` @color-base20: #54595d; // = HSB 207°, 10%, 36%; WCAG 2.0 level AAA 7.09:1 contrast ratio on `#fff`
@color-base30: #72777d; // = HSB 210°, 9%, 49%; WCAG 2.0 level AA at 4.52:1 contrast ratio on `#fff` @color-base30: #72777d; // = HSB 210°, 9%, 49%; WCAG 2.0 level AA at 4.52:1 contrast ratio on `#fff`
@ -174,12 +160,6 @@
@background-color-overlay: rgba( 255, 255, 255, 0.95 ); //base100 95% opacity @background-color-overlay: rgba( 255, 255, 255, 0.95 ); //base100 95% opacity
@background-color-overlay--lighter: rgba( 255, 255, 255, 0.6 ); @background-color-overlay--lighter: rgba( 255, 255, 255, 0.6 );
@background-color-framed: @color-base90;
@background-color-framed--hover: @color-base100;
@background-color-framed--active: @color-base70;
@background-color-input: rgba( 255, 255, 255, 0.5 );
@background-color-icon: rgba( 0, 0, 0, 0.6 ); @background-color-icon: rgba( 0, 0, 0, 0.6 );
@background-color-icon--hover: rgba( 0, 0, 0, 0.8 ); @background-color-icon--hover: rgba( 0, 0, 0, 0.8 );
@background-color-icon--active: rgba( 0, 0, 0, 1 ); @background-color-icon--active: rgba( 0, 0, 0, 1 );
@ -233,7 +213,9 @@
@size-icon: 1.25rem; @size-icon: 1.25rem;
// Not in the header section it is also used outside of header // Not in the header section it is also used outside of header
@header-size: 3.5rem; @header-size: 3.5rem;
@width-layout: @width-breakpoint-desktop - 2 * @padding-page; // 67.5rem at 16px font size
// We use px because it would be frustrating if max-width changes with font size
@width-layout: 1080px;
// TODO: Revise this number, fixed value isn't great but we need it for b // TODO: Revise this number, fixed value isn't great but we need it for b
@width-toc: 240px; @width-toc: 240px;

8
skin.json
查看文件

@ -1,6 +1,6 @@
{ {
"name": "Citizen", "name": "Citizen",
"version": "2.2.0", "version": "2.3.0",
"author": [ "author": [
"[https://www.mediawiki.org/wiki/User:Alistair3149 Alistair3149]", "[https://www.mediawiki.org/wiki/User:Alistair3149 Alistair3149]",
"[https://www.mediawiki.org/wiki/User:Octfx Octfx]", "[https://www.mediawiki.org/wiki/User:Octfx Octfx]",
@ -138,7 +138,8 @@
], ],
"messages": [ "messages": [
"citizen-search-fulltext", "citizen-search-fulltext",
"citizen-search-fulltext-empty", "citizen-search-mediasearch",
"citizen-search-empty-desc",
"citizen-search-noresults-title", "citizen-search-noresults-title",
"citizen-search-noresults-desc", "citizen-search-noresults-desc",
"search-redirect", "search-redirect",
@ -182,6 +183,7 @@
"edit", "edit",
"editLock", "editLock",
"ellipsis", "ellipsis",
"help",
"history", "history",
"home", "home",
"image", "image",
@ -235,6 +237,8 @@
"+ext.centralNotice.display": "skinStyles/extensions/CentralNotice/ext.centralNotice.display.less", "+ext.centralNotice.display": "skinStyles/extensions/CentralNotice/ext.centralNotice.display.less",
"+ext.cite.styles": "skinStyles/extensions/Cite/ext.cite.styles.less", "+ext.cite.styles": "skinStyles/extensions/Cite/ext.cite.styles.less",
"+ext.cleanchanges.uls": "skinStyles/extensions/CleanChanges/ext.cleanchanges.uls.less", "+ext.cleanchanges.uls": "skinStyles/extensions/CleanChanges/ext.cleanchanges.uls.less",
"+ext.codeEditor.ace": "skinStyles/extensions/CodeEditor/ext.codeEditor.ace.less",
"+jquery.codeEditor": "skinStyles/extensions/CodeEditor/jquery.codeEditor.less",
"+ext.CodeMirror.lib": "skinStyles/extensions/CodeMirror/ext.CodeMirror.lib.less", "+ext.CodeMirror.lib": "skinStyles/extensions/CodeMirror/ext.CodeMirror.lib.less",
"+ext.CodeMirror.mode.mediawiki": "skinStyles/extensions/CodeMirror/ext.CodeMirror.mode.mediawiki.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.CodeMirror.visualEditor.init": "skinStyles/extensions/CodeMirror/ext.CodeMirror.visualEditor.init.less",

12
skinStyles/extensions/AdvancedSearch/ext.advancedSearch.initialstyles.less
查看文件

@ -3,13 +3,21 @@
* *
* SkinStyles for Extension:AdvancedSearch * SkinStyles for Extension:AdvancedSearch
* Module: ext.advancedSearch.initialstyles * Module: ext.advancedSearch.initialstyles
* Version: REL1_35 fae6250 * Version: REL1_39 3a0eed7
* *
* Date: 2021-08-26 * Date: 2022-12-12
*/ */
.client-js { .client-js {
.mw-search-form-wrapper {
min-height: 121.56px; // This is quite hacky
}
.mw-search-spinner { .mw-search-spinner {
top: 5em;
// Very hacky since it might be wrong because of font size
left: 23em;
&:before, &:before,
&:after, &:after,
& .mw-search-spinner-bounce { & .mw-search-spinner-bounce {

103
skinStyles/extensions/AdvancedSearch/ext.advancedSearch.styles.less
查看文件

@ -3,54 +3,123 @@
* *
* SkinStyles for Extension:AdvancedSearch * SkinStyles for Extension:AdvancedSearch
* Module: ext.advancedSearch.styles * Module: ext.advancedSearch.styles
* Version: REL1_35 fae6250 * Version: REL1_39 3a0eed7
* *
* Date: 2021-08-26 * Date: 2022-12-12
*/ */
.mw-advancedSearch-container {
border-bottom: 1px solid var( --border-color-base );
margin-top: var( --space-xs );
}
// Align with Citizen label styles
.mw-advancedSearch-searchPreview-label,
.advancedsearch-namespacesPreview-label {
margin-right: var( --space-xs );
color: var( --color-base--subtle );
font-size: 0.875rem;
font-weight: var( --font-weight-normal );
letter-spacing: 0.05em;
}
.mw-advancedSearch-fieldContainer { .mw-advancedSearch-fieldContainer {
border-color: var( --border-color-base ); max-width: none;
background: transparent; border: 0;
border-radius: var( --border-radius--small );
margin-top: 0;
background: var( --color-surface-2 );
fieldset { fieldset {
border-color: var( --border-color-base ); border-top-color: var( --border-color-base );
margin-top: var( --space-md );
} }
.oo-ui-labelElement > .oo-ui-fieldsetLayout-header > .oo-ui-labelElement-label { .oo-ui-labelElement > .oo-ui-fieldsetLayout-header > .oo-ui-labelElement-label {
background: var( --color-surface-0 ); // the parent containers are transparent background: var( --color-surface-2 );
color: var( --color-base--subtle ); color: var( --color-base--subtle );
font-size: 0.875rem;
font-weight: var( --font-weight-normal );
letter-spacing: 0.05em;
} }
} }
.mw-advancedSearch-expandablePane-options,
.mw-advancedSearch-expandablePane-namespaces {
max-width: none;
padding-top: 0; // padding handled through container
}
.mw-advancedSearch-expandablePane-button { .mw-advancedSearch-expandablePane-button {
&.oo-ui-widget-enabled.oo-ui-buttonWidget { &.oo-ui-widget-enabled.oo-ui-buttonWidget {
&.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button { > .oo-ui-buttonElement-button {
background-color: var( --color-surface-2 ); padding-left: 0;
border-color: transparent;
background-color: transparent;
&:hover {
background-color: var( --background-color-quiet--hover );
color: inherit;
}
// Added active state
&:active {
background-color: var( --background-color-quiet--active );
}
// HACK: Flip indicator when expanded
.oo-ui-indicator-down {
transition: opacity 100ms, transform 250ms ease;
}
&[ aria-expanded='true' ] {
.oo-ui-indicator-down {
transform: rotate3d( 1, 0, 0, 180deg );
}
}
} }
> .oo-ui-buttonElement-button { &.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button {
&:hover { background-color: transparent;
background-color: var( --color-surface-2--hover );
color: var( --color-base );
}
} }
} }
} }
.mw-advancedSearch-namespace-selection-header {
> .mw-advancedSearch-namespace-search-in-label {
font-weight: var( --font-weight-semibold );
}
}
.mw-advancedSearch-namespace-selection { .mw-advancedSearch-namespace-selection {
border-color: var( --border-color-base ); max-width: none;
border: 0;
border-radius: var( --border-radius--small );
margin-top: 0;
background: var( --color-surface-2 ); background: var( --color-surface-2 );
} }
.mw-advancedSearch-namespace-border { .mw-advancedSearch-namespace-border {
border-color: var( --border-color-base ); border-top: 1px solid var( --border-color-base );
border-bottom: 0;
}
.mw-advancedSearch-namespaceFilter.oo-ui-tagMultiselectWidget {
max-width: none;
}
.mw-advancedSearch-namespaceFilter .oo-ui-tagMultiselectWidget-handle {
border-radius: 0 0 var( --border-radius--small ) var( --border-radius--small );
}
.mw-advancedSearch-namespaceFilter .oo-ui-tagMultiselectWidget-input .oo-ui-inputWidget-input {
background-color: var( --color-surface-0 );
} }
// that's how nested the background-color property of a tagWidget is
.oo-ui-tagMultiselectWidget.oo-ui-widget-enabled.oo-ui-tagMultiselectWidget-outlined .oo-ui-tagItemWidget.oo-ui-widget-enabled { .oo-ui-tagMultiselectWidget.oo-ui-widget-enabled.oo-ui-tagMultiselectWidget-outlined .oo-ui-tagItemWidget.oo-ui-widget-enabled {
&.selected { &.selected {
border-color: var( --color-primary ); border-color: var( --color-primary );
background-color: var( --color-surface-3 ); background-color: var( --background-color-primary--hover );
} }
} }

52
skinStyles/extensions/CodeEditor/ext.codeEditor.ace.less 普通文件
查看文件

@ -0,0 +1,52 @@
/*
* Citizen
*
* SkinStyles for Extension:CodeEditor
* Module: ext.codeEditor.ace
* Version: REL1_39 67c012c
*
* Date: 2022-12-15
*/
@import '../../../resources/variables.less';
// FIXME: Implemement same syntax higlight color as CodeMirror and SyntaxHighlight
.ace {
&-tm {
background-color: transparent;
color: var( --color-base--emphasized );
.ace {
&_gutter {
background-color: transparent;
color: var( --color-base--subtle );
&-active-line {
background-color: var( --background-color-quiet--hover );
}
}
&_marker-layer {
.ace {
&_active-line {
background-color: var( --background-color-quiet--hover );
}
}
}
&_print-margin {
background: var( --border-color-base );
}
&_cursor {
color: var( --color-base--emphasized );
}
}
}
&_gutter {
&-cell {
color: var( --color-base--subtle );
}
}
}

56
skinStyles/extensions/CodeEditor/jquery.codeEditor.less 普通文件
查看文件

@ -0,0 +1,56 @@
/*
* Citizen
*
* SkinStyles for Extension:CodeEditor
* Module: jquery.codeEditor
* Version: REL1_39 67c012c
*
* Date: 2022-12-15
*/
.wikiEditor-ui .ace_editor {
font-family: var( --font-family-monospace );
}
.codeEditor-status {
position: relative;
width: auto; // so it won't overflow
padding-top: 8px; // Make space for resize indicator
padding-right: var( --space-xs );
padding-left: var( --space-xs );
border-top-color: var( --border-color-base );
background-color: var( --color-surface-2 );
color: var( --color-base--subtle );
line-height: var( --line-height-sm );
// HACK: Add resize indicator
&:after {
position: absolute;
top: 1px; // counter border top
right: 0;
left: 0;
width: 52px;
height: 4px;
border-radius: var( --border-radius--pill );
margin: 2px auto;
background: var( --color-base--subtle );
content: '';
}
&-worker,
&-line,
&-message {
padding: 0 var( --space-xs );
}
&-message {
border-color: var( --border-color-base );
color: var( --color-base--emphasized );
}
}
// So that it connects with CodeEditor's status bar
.skin-citizen .mw-editform .editOptions {
border-top-left-radius: 0;
border-top-right-radius: 0;
}

10
skinStyles/extensions/UploadWizard/ext.uploadWizard.less
查看文件

@ -30,11 +30,11 @@
} }
.mwe-upwiz-file.odd .mwe-upwiz-visible-file { .mwe-upwiz-file.odd .mwe-upwiz-visible-file {
background: var( --background-color-framed ); background: var( --color-surface-2 );
} }
#mwe-upwiz-deeds-thumbnails { #mwe-upwiz-deeds-thumbnails {
background-color: var( --background-color-framed ); background-color: var( --color-surface-2 );
} }
.mwe-upwiz-thumbnail-link canvas, .mwe-upwiz-thumbnail-link canvas,
@ -44,7 +44,7 @@
.mwe-upwiz-singleLanguageInputWidget { .mwe-upwiz-singleLanguageInputWidget {
border-color: var( --border-color-base ); border-color: var( --border-color-base );
background-color: var( --background-color-framed ); background-color: var( --color-surface-2 );
} }
.mwe-upwiz-copyMetadataWidget { .mwe-upwiz-copyMetadataWidget {
@ -64,7 +64,7 @@
} }
.arrowSteps li { .arrowSteps li {
background-color: var( --background-color-framed ); background-color: var( --color-surface-2 );
color: var( --color-base--subtle ); color: var( --color-base--subtle );
} }
@ -74,7 +74,7 @@
} }
.arrowSteps li.arrow:after { .arrowSteps li.arrow:after {
border-left-color: var( --background-color-framed ); border-left-color: var( --color-surface-2 );
} }
.arrowSteps li.arrow:before { .arrowSteps li.arrow:before {

32
skinStyles/extensions/WSSearchFront/ext.WSSearchFront.module.less
查看文件

@ -9,14 +9,14 @@
*/ */
:root { :root {
--tint-1: var( --background-color-framed ); --tint-1: var( --color-surface-2 );
--border-1: 1px solid var( --background-color-framed--active ); --border-1: 1px solid var( --color-surface-2--active );
} }
.wssearch--filter-options-search, .wssearch--filter-options-search,
.wssearch--search-input { .wssearch--search-input {
border: 1px solid var( --border-color-base ); border: 1px solid var( --border-color-base );
background-color: var( --background-color-framed ); background-color: var( --color-surface-2 );
color: var( --color-base ); color: var( --color-base );
&:hover { &:hover {
@ -41,7 +41,7 @@
&:focus { &:focus {
border-color: var( --color-base ); border-color: var( --color-base );
box-shadow: inset 0 0 0 1px var( --base-color ), inset 0 0 0 2px var( --background-color-framed ); box-shadow: inset 0 0 0 1px var( --base-color ), inset 0 0 0 2px var( --color-surface-2 );
} }
&:active { &:active {
@ -52,12 +52,12 @@
} }
.wssearch--selected-filter { .wssearch--selected-filter {
background-color: var( --background-color-framed ); background-color: var( --color-surface-2 );
transition: background-color 0.1s, color 0.1s, border-color 0.1s, box-shadow 0.1s; transition: background-color 0.1s, color 0.1s, border-color 0.1s, box-shadow 0.1s;
&:hover { &:hover {
border-color: var( --base-color-lighter ); border-color: var( --base-color-lighter );
background-color: var( --background-color-framed--hover ); background-color: var( --color-surface-2--hover );
} }
&:after { &:after {
@ -80,7 +80,7 @@
&:focus { &:focus {
border-color: var( --color-base ); border-color: var( --color-base );
background-color: var( --color-base ); background-color: var( --color-base );
box-shadow: inset 0 0 0 1px var( --base-color ), inset 0 0 0 2px var( --background-color-framed ); box-shadow: inset 0 0 0 1px var( --base-color ), inset 0 0 0 2px var( --color-surface-2 );
} }
} }
@ -119,7 +119,7 @@
&:active, &:active,
&:focus { &:focus {
border-color: var( --color-base ); border-color: var( --color-base );
box-shadow: inset 0 0 0 1px var( --base-color ), inset 0 0 0 2px var( --background-color-framed ); box-shadow: inset 0 0 0 1px var( --base-color ), inset 0 0 0 2px var( --color-surface-2 );
} }
} }
@ -146,13 +146,13 @@
.wssearch--order__option, .wssearch--order__option,
.wssearch--size__option { .wssearch--size__option {
background-color: var( --background-color-framed ); background-color: var( --color-surface-2 );
color: var( --color-base--emphasized ); color: var( --color-base--emphasized );
} }
.wssearch-hit-prop-loading-bg { .wssearch-hit-prop-loading-bg {
background: linear-gradient( 135deg, var( --background-color-framed ) 25%, transparent 0, transparent 50%, var( --background-color-framed ) 0, var( --background-color-framed ) 75%, transparent 0, transparent ); background: linear-gradient( 135deg, var( --color-surface-2 ) 25%, transparent 0, transparent 50%, var( --color-surface-2 ) 0, var( --color-surface-2 ) 75%, transparent 0, transparent );
background-color: var( --background-color-framed--active ); background-color: var( --color-surface-2--active );
} }
.wssearch--hit-pill { .wssearch--hit-pill {
@ -222,7 +222,7 @@
} }
.wssearch--checkbox { .wssearch--checkbox {
background-color: var( --background-color-framed ); background-color: var( --color-surface-2 );
color: var( --color-base--emphasized ); color: var( --color-base--emphasized );
&:hover { &:hover {
@ -235,11 +235,11 @@
} }
&.wssearch--checkbox-selected:hover { &.wssearch--checkbox-selected:hover {
background-color: var( --background-color-framed ); background-color: var( --color-surface-2 );
} }
&:not( :last-child ) { &:not( :last-child ) {
border-bottom: 1px solid var( --background-color-framed--active ); border-bottom: 1px solid var( --color-surface-2--active );
} }
&-count { &-count {
@ -276,7 +276,7 @@
&:active, &:active,
&:focus { &:focus {
border-color: var( --color-base ); border-color: var( --color-base );
box-shadow: inset 0 0 0 1px var( --base-color ), inset 0 0 0 2px var( --background-color-framed ); box-shadow: inset 0 0 0 1px var( --base-color ), inset 0 0 0 2px var( --color-surface-2 );
} }
} }
@ -290,7 +290,7 @@
} }
&__header > * { &__header > * {
background-color: var( --background-color-framed--active ); background-color: var( --color-surface-2--active );
} }
} }

15
skinStyles/mediawiki/special/mediawiki.special.search.styles.less
查看文件

@ -102,7 +102,7 @@
.results-info { .results-info {
color: var( --color-base--subtle ); color: var( --color-base--subtle );
font-size: 0.8125rem; font-size: 0.875rem;
white-space: nowrap; white-space: nowrap;
} }
@ -133,10 +133,12 @@
.mw-search-createlink, .mw-search-createlink,
.mw-search-exists { .mw-search-exists {
padding: var( --space-sm ) var( --space-md ); // These can generate a empty card when there are no text content
border-radius: var( --border-radius--small ); // FIXME: re-enable when this is addressed in core
// padding: var( --space-sm ) var( --space-md );
// background: var( --color-surface-2 );
// border-radius: var( --border-radius--small );
margin-top: 0 !important; margin-top: 0 !important;
background: var( --color-surface-2 );
color: var( --color-base--emphasized ); color: var( --color-base--emphasized );
} }
@ -172,6 +174,11 @@
.searchmatch { .searchmatch {
color: var( --color-base--emphasized ); color: var( --color-base--emphasized );
font-weight: var( --font-weight-semibold ); font-weight: var( --font-weight-semibold );
a & {
// If searchmatch is part of the link (usually title), use link color
color: inherit;
}
} }
.searchresults { .searchresults {