diff --git a/i18n/zh-hans.json b/i18n/zh-hans.json index 2aa17395..805b37f6 100644 --- a/i18n/zh-hans.json +++ b/i18n/zh-hans.json @@ -11,6 +11,7 @@ "LittlePaw365", "Maitian MaiLin", "StarrySky", + "WaitSpring", "WrOffi", "Xyb", "Yfdyh000", @@ -25,6 +26,7 @@ "citizen.js": "/* 这里所有JavaScript都会加载给Citizen皮肤的用户 */", "citizen-drawer-toggle": "打开/关闭菜单", "citizen-usermenu-toggle": "打开/关闭个人菜单", + "citizen-preferences-toggle": "切换首选项菜单", "citizen-search-poweredby": "由$1提供支持", "citizen-search-poweredby-mediawiki": "MediaWiki", "citizen-search-toggle": "打开/关闭搜索", @@ -52,6 +54,7 @@ "citizen-search-noresults-title": "不妙!没有“$1”的搜索结果", "citizen-search-noresults-desc": "还可以尝试上面的选项", "citizen-share": "分享此页面", + "citizen-share-copied": "网址已复制到剪贴板!", "citizen-tagline-ns-talk": "{{SUBJECTPAGENAME}}的讨论页面", "citizen-tagline-ns-project": "有关{{SITENAME}}的信息", "citizen-tagline-ns-file": "{{SITENAME}}上的文件", diff --git a/package-lock.json b/package-lock.json index 9e4f6a97..38efea10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,13 +8,13 @@ "name": "Citizen", "version": "2.39.2", "devDependencies": { - "@commitlint/cli": "^19.5.0", - "@commitlint/config-conventional": "^19.5.0", + "@commitlint/cli": "^19.6.0", + "@commitlint/config-conventional": "^19.6.0", "@wikimedia/types-wikimedia": "0.4.4", "devmoji": "^2.3.0", "eslint-config-wikimedia": "0.28.2", "grunt-banana-checker": "0.13.0", - "husky": "^9.1.6", + "husky": "^9.1.7", "stylelint": "16.10.0", "stylelint-config-recess-order": "5.1.1", "stylelint-config-wikimedia": "0.17.2", @@ -139,13 +139,13 @@ } }, "node_modules/@commitlint/cli": { - "version": "19.5.0", - "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-19.5.0.tgz", - "integrity": "sha512-gaGqSliGwB86MDmAAKAtV9SV1SHdmN8pnGq4EJU4+hLisQ7IFfx4jvU4s+pk6tl0+9bv6yT+CaZkufOinkSJIQ==", + "version": "19.6.0", + "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-19.6.0.tgz", + "integrity": "sha512-v17BgGD9w5KnthaKxXnEg6KLq6DYiAxyiN44TpiRtqyW8NSq+Kx99mkEG8Qo6uu6cI5eMzMojW2muJxjmPnF8w==", "dev": true, "dependencies": { "@commitlint/format": "^19.5.0", - "@commitlint/lint": "^19.5.0", + "@commitlint/lint": "^19.6.0", "@commitlint/load": "^19.5.0", "@commitlint/read": "^19.5.0", "@commitlint/types": "^19.5.0", @@ -160,9 +160,9 @@ } }, "node_modules/@commitlint/config-conventional": { - "version": "19.5.0", - "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-19.5.0.tgz", - "integrity": "sha512-OBhdtJyHNPryZKg0fFpZNOBM1ZDbntMvqMuSmpfyP86XSfwzGw4CaoYRG4RutUPg0BTK07VMRIkNJT6wi2zthg==", + "version": "19.6.0", + "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-19.6.0.tgz", + "integrity": "sha512-DJT40iMnTYtBtUfw9ApbsLZFke1zKh6llITVJ+x9mtpHD08gsNXaIRqHTmwTZL3dNX5+WoyK7pCN/5zswvkBCQ==", "dev": true, "dependencies": { "@commitlint/types": "^19.5.0", @@ -225,9 +225,9 @@ } }, "node_modules/@commitlint/is-ignored": { - "version": "19.5.0", - "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-19.5.0.tgz", - "integrity": "sha512-0XQ7Llsf9iL/ANtwyZ6G0NGp5Y3EQ8eDQSxv/SRcfJ0awlBY4tHFAvwWbw66FVUaWICH7iE5en+FD9TQsokZ5w==", + "version": "19.6.0", + "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-19.6.0.tgz", + "integrity": "sha512-Ov6iBgxJQFR9koOupDPHvcHU9keFupDgtB3lObdEZDroiG4jj1rzky60fbQozFKVYRTUdrBGICHG0YVmRuAJmw==", "dev": true, "dependencies": { "@commitlint/types": "^19.5.0", @@ -238,14 +238,14 @@ } }, "node_modules/@commitlint/lint": { - "version": "19.5.0", - "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-19.5.0.tgz", - "integrity": "sha512-cAAQwJcRtiBxQWO0eprrAbOurtJz8U6MgYqLz+p9kLElirzSCc0vGMcyCaA1O7AqBuxo11l1XsY3FhOFowLAAg==", + "version": "19.6.0", + "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-19.6.0.tgz", + "integrity": "sha512-LRo7zDkXtcIrpco9RnfhOKeg8PAnE3oDDoalnrVU/EVaKHYBWYL1DlRR7+3AWn0JiBqD8yKOfetVxJGdEtZ0tg==", "dev": true, "dependencies": { - "@commitlint/is-ignored": "^19.5.0", + "@commitlint/is-ignored": "^19.6.0", "@commitlint/parse": "^19.5.0", - "@commitlint/rules": "^19.5.0", + "@commitlint/rules": "^19.6.0", "@commitlint/types": "^19.5.0" }, "engines": { @@ -330,9 +330,9 @@ } }, "node_modules/@commitlint/rules": { - "version": "19.5.0", - "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-19.5.0.tgz", - "integrity": "sha512-hDW5TPyf/h1/EufSHEKSp6Hs+YVsDMHazfJ2azIk9tHPXS6UqSz1dIRs1gpqS3eMXgtkT7JH6TW4IShdqOwhAw==", + "version": "19.6.0", + "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-19.6.0.tgz", + "integrity": "sha512-1f2reW7lbrI0X0ozZMesS/WZxgPa4/wi56vFuJENBmed6mWq5KsheN/nxqnl/C23ioxpPO/PL6tXpiiFy5Bhjw==", "dev": true, "dependencies": { "@commitlint/ensure": "^19.5.0", @@ -2905,9 +2905,9 @@ } }, "node_modules/husky": { - "version": "9.1.6", - "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.6.tgz", - "integrity": "sha512-sqbjZKK7kf44hfdE94EoX8MZNk0n7HeW37O4YrVGCF4wzgQjp+akPAkfUK5LZ6KuR/6sqeAVuXHji+RzQgOn5A==", + "version": "9.1.7", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz", + "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==", "dev": true, "bin": { "husky": "bin.js" diff --git a/package.json b/package.json index 11e8a398..da865fe0 100644 --- a/package.json +++ b/package.json @@ -12,13 +12,13 @@ "prepare": "husky" }, "devDependencies": { - "@commitlint/cli": "^19.5.0", - "@commitlint/config-conventional": "^19.5.0", + "@commitlint/cli": "^19.6.0", + "@commitlint/config-conventional": "^19.6.0", "@wikimedia/types-wikimedia": "0.4.4", "devmoji": "^2.3.0", "eslint-config-wikimedia": "0.28.2", "grunt-banana-checker": "0.13.0", - "husky": "^9.1.6", + "husky": "^9.1.7", "stylelint": "16.10.0", "stylelint-config-recess-order": "5.1.1", "stylelint-config-wikimedia": "0.17.2", diff --git a/skinStyles/extensions/DiscussionTools/ext.discussionTools.init.styles.less b/skinStyles/extensions/DiscussionTools/ext.discussionTools.init.styles.less index 5107e4ef..bb6cce87 100644 --- a/skinStyles/extensions/DiscussionTools/ext.discussionTools.init.styles.less +++ b/skinStyles/extensions/DiscussionTools/ext.discussionTools.init.styles.less @@ -36,6 +36,12 @@ background-color: var( --background-color-progressive-subtle ); } +.ext-discussiontools-init-timestamplink, +.ext-discussiontools-init-timestamplink:visited, +.ext-discussiontools-init-timestamplink:active { + color: var( --color-subtle ); +} + .ext-discussiontools-init-section-subscribe { &.mw-editsection-like { margin-top: 0; @@ -118,11 +124,20 @@ font-weight: var( --font-weight-semi-bold ); } + &-subscribeButton { + order: 9999; + } + &-bar { - margin-top: var( --space-xxs ); + overflow-x: auto; font-size: var( --font-size-x-small ); } + &-metadata { + flex-wrap: nowrap; + white-space: nowrap; + } + &-metaitem { color: var( --color-subtle );