From 6861343bbe3219dd588cb7ffc062984fa8a3a64e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=A1=E8=89=B2?= Date: Fri, 2 Feb 2024 14:57:26 +0800 Subject: [PATCH] fix: fix scrollbar thumb color default is transparent (#1761) --- package.json | 2 +- packages/theme/docs/global.en-US.md | 2 +- packages/theme/docs/global.zh-CN.md | 2 +- packages/theme/system/theme-default.less | 2 +- packages/theme/system/utils/_scrollbar.less | 10 ++++++---- src/styles/theme.less | 2 ++ yarn.lock | 10 +++++----- 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 0b0b64c17..c3e7756ce 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "extend": "^3.0.2", "file-saver": "^2.0.5", "ng-github-button": "^17.0.0", - "ng-zorro-antd": "^17.1.0", + "ng-zorro-antd": "^17.2.0", "@angular/cdk": "^17.1.0", "ngx-countdown": "^17.1.1", "ngx-highlight-js": "^17.0.0", diff --git a/packages/theme/docs/global.en-US.md b/packages/theme/docs/global.en-US.md index 22d30920b..578522689 100644 --- a/packages/theme/docs/global.en-US.md +++ b/packages/theme/docs/global.en-US.md @@ -53,7 +53,7 @@ title: Global Parameters | `@scrollbar-width` | `6px` | Scroll bar width | | `@scrollbar-height` | `6px` | Scroll bar height | | `@scrollbar-track-color` | `rgba(0, 0, 0, 0.3)` | Scrollbar track color | -| `@scrollbar-thumb-color` | `#6e6e6e` | Scrollbar thumb color | +| `@scrollbar-thumb-color` | `transparent` | Scrollbar thumb color | | `@scrollbar-table-enabled` | `false` | Enable landscaping scrollbars of nz-table | | `@rtl-enabled` | `false` | Wheter support RTL | | `@enabled-util-align` | `true` | Whether to enable tools align | diff --git a/packages/theme/docs/global.zh-CN.md b/packages/theme/docs/global.zh-CN.md index 3fc6bf7b2..1d7d36411 100644 --- a/packages/theme/docs/global.zh-CN.md +++ b/packages/theme/docs/global.zh-CN.md @@ -53,7 +53,7 @@ title: 全局参数 | `@scrollbar-width` | `6px` | 美化滚动条宽度 | | `@scrollbar-height` | `6px` | 美化滚动条高度 | | `@scrollbar-track-color` | `rgba(0, 0, 0, 0.3)` | 美化滚动条的轨道颜色 | -| `@scrollbar-thumb-color` | `#6e6e6e` | 美化滚动条小方块颜色 | +| `@scrollbar-thumb-color` | `transparent` | 美化滚动条小方块颜色 | | `@scrollbar-table-enabled` | `false` | 启用美化表格滚动条 | | `@rtl-enabled` | `false` | 是否支持 RTL | | `@enabled-util-align` | `true` | 是否启用工具类 align | diff --git a/packages/theme/system/theme-default.less b/packages/theme/system/theme-default.less index eb662a318..f25b00397 100644 --- a/packages/theme/system/theme-default.less +++ b/packages/theme/system/theme-default.less @@ -146,7 +146,7 @@ @scrollbar-width: 6px; @scrollbar-height: 6px; @scrollbar-track-color: rgba(0, 0, 0, 0.3); -@scrollbar-thumb-color: #6e6e6e; +@scrollbar-thumb-color: transparent; @scrollbar-table-enabled: false; // type diff --git a/packages/theme/system/utils/_scrollbar.less b/packages/theme/system/utils/_scrollbar.less index e43476046..4e24e4738 100644 --- a/packages/theme/system/utils/_scrollbar.less +++ b/packages/theme/system/utils/_scrollbar.less @@ -39,10 +39,12 @@ } // scrollbar -// TODO: (.nz-measure-scrollbar-placeholder) https://github.com/NG-ZORRO/ng-zorro-antd/pull/2617 -.scrollbar-mixin( - ~'body, @{scrollbar-prefix}, .@{ant-prefix}-dialog-wrap, .@{ant-prefix}-drawer-body, .@{ant-prefix}-drawer-wrapper-body, .@{ant-prefix}-anchor-wrapper, textarea.@{ant-prefix}-input' -); +.scrollbar-default-mixin(@enabled) when(@enabled=true) { + .scrollbar-mixin( + ~'body, @{scrollbar-prefix}, .@{ant-prefix}-dialog-wrap, .@{ant-prefix}-drawer-body, .@{ant-prefix}-drawer-wrapper-body, .@{ant-prefix}-anchor-wrapper, textarea.@{ant-prefix}-input' + ); +} +.scrollbar-default-mixin(@scrollbar-enabled); // table .scrollbar-table-mixin(@enabled) when(@enabled=true) { diff --git a/src/styles/theme.less b/src/styles/theme.less index 316e19ad3..2b2a1d960 100644 --- a/src/styles/theme.less +++ b/src/styles/theme.less @@ -7,3 +7,5 @@ @site-header-box-shadow: 0 2px 8px rgba(240, 241, 242, 65); @site-markdown-code-bg: #f2f4f5; @site-mobile: 1200px; + +@scrollbar-enabled: false; diff --git a/yarn.lock b/yarn.lock index ebc69b87e..39b60a0e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6984,7 +6984,7 @@ __metadata: ng-github-button: "npm:^17.0.0" ng-less-javascript-enabled-patch: "npm:17.0.2" ng-packagr: "npm:^17.1.0" - ng-zorro-antd: "npm:^17.1.0" + ng-zorro-antd: "npm:^17.2.0" ngx-countdown: "npm:^17.1.1" ngx-highlight-js: "npm:^17.0.0" ngx-tinymce: "npm:^17.0.0" @@ -12448,9 +12448,9 @@ __metadata: languageName: node linkType: hard -"ng-zorro-antd@npm:^17.1.0": - version: 17.1.0 - resolution: "ng-zorro-antd@npm:17.1.0" +"ng-zorro-antd@npm:^17.2.0": + version: 17.2.0 + resolution: "ng-zorro-antd@npm:17.2.0" dependencies: "@angular/cdk": "npm:^17.0.0" "@ant-design/icons-angular": "npm:^17.0.0" @@ -12463,7 +12463,7 @@ __metadata: "@angular/forms": ^17.0.0 "@angular/platform-browser": ^17.0.0 "@angular/router": ^17.0.0 - checksum: adfa1258912046dc171b1834756dca7149a382f58832dc37499f257d1d4456d257309be8161254eae883c7d3f87911e77f7738ed14491d596543a75d72fd49cb + checksum: d73a14650bb9f635bf6fe2e51e1c302052b243d3ad660fce5201fcb3d4da60c554de57a5c281ea11b150b6009ec2bd8c78cff016d8281841b1518eceeeb32126 languageName: node linkType: hard