Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix scrollbar thumb color default is transparent #1761

Merged
merged 1 commit into from
Feb 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/theme/docs/global.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion packages/theme/docs/global.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion packages/theme/system/theme-default.less
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions packages/theme/system/utils/_scrollbar.less
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 2 additions & 0 deletions src/styles/theme.less
Original file line number Diff line number Diff line change
Expand Up @@ -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;
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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

Expand Down
Loading