Skip to content

Commit

Permalink
feat(module:theme): add scrollbar style service of div (#267)
Browse files Browse the repository at this point in the history
  • Loading branch information
cipchk authored Nov 8, 2018
1 parent 9cd3671 commit 161d328
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 13 deletions.
1 change: 1 addition & 0 deletions packages/theme/docs/tools.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@ DEMO:
| `point` | `cursor: pointer` |
| `no-resize` | Setting does not allow adjustment elements |
| `bg-center` | Background image is vertically centered |
| `scrollbar` | Custom scrollbar for a div |

## Widgets

Expand Down
1 change: 1 addition & 0 deletions packages/theme/docs/tools.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@ Ant Design 是以 `14px` 为基准字号。
| `point` | `cursor: pointer` |
| `no-resize` | 设置不允许调整元素 |
| `bg-center` | 背景图垂直居中 |
| `scrollbar` | 美化 div 滚动条 |

## 小部件

Expand Down
45 changes: 33 additions & 12 deletions packages/theme/styles/app/widgets/scrollbar.less
Original file line number Diff line number Diff line change
@@ -1,17 +1,38 @@
.scrollbar-mixin(@enabled) when(@enabled=true) {
body::-webkit-scrollbar {
height: @scrollbar-width;
width: @scrollbar-height;
.scrollbar-style-mixin(@element-name) {
@{element-name} {
&::-webkit-scrollbar {
height: @scrollbar-width;
width: @scrollbar-height;
}
&::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 @scrollbar-width @scrollbar-track-color;
}
&::-webkit-scrollbar-thumb {
background-color: @scrollbar-thumb-color;
outline: 1px solid #333;
}
}
}

body::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 @scrollbar-width @scrollbar-track-color;
}
// body scrollbar
.scrollbar-mixin(@enabled) when(@enabled=true) {
.scrollbar-style-mixin(body);
}
.scrollbar-mixin(@scrollbar-enabled);

body::-webkit-scrollbar-thumb {
background-color: @scrollbar-thumb-color;
outline: 1px solid #333;
// 自定义div scrollbar
@scrollbar-prefix: ~'.scrollbar';

.scrollbar-style-mixin(@scrollbar-prefix);
@{scrollbar-prefix} {
overflow: auto;

&-x {
overflow-x: auto;
overflow-y: hidden;
}
&-y {
overflow-x: hidden;
overflow-y: auto;
}
}

.scrollbar-mixin(@scrollbar-enabled);
2 changes: 1 addition & 1 deletion scripts/ci/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ travisFoldStart "publish.dist"
echo "===== Release version does not need to change version ====="
else
echo "Replace build version..."
sed -i "s/${buildVersion}/${buildVersionName}/g" $(find . -type f -not -path '*\/.*')
sed -i "s/${buildVersion}/${buildVersionName}/g" $(find . -type f -not -path '*\/.*' -name 'theme.js' -o -name 'package.json')
fi

echo "Updated the build version in every file to include the SHA of the latest commit."
Expand Down

0 comments on commit 161d328

Please sign in to comment.