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

Feature/web/sticky tool #1241

Merged
merged 27 commits into from
Apr 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9b3fce2
feat: 部分样式
ZekunWu Feb 26, 2023
3ef309c
feat: 尝试百分比尺寸
Feb 27, 2023
5c913f1
feat: 完善css
Feb 28, 2023
4ae7a69
feat: 样式调整
Mar 1, 2023
9bfc75c
Merge branch 'develop' into feature/web/StickyTool
Mar 6, 2023
ccf7a5f
fix: 删除wxss文件
Mar 6, 2023
e3b90f7
Merge branch 'develop' into feature/web/StickyTool
Mar 10, 2023
dd601f6
Merge branch 'develop' into feature/web/StickyTool
ZekunWu Mar 13, 2023
d4f3fe0
fix: lint
ZekunWu Mar 13, 2023
62b8f09
Merge branch 'develop' into feature/web/StickyTool
ZekunWu Mar 13, 2023
767d455
fix: 改用全局变量
ZekunWu Mar 13, 2023
64d30a3
Merge branch 'feature/web/StickyTool' of https://github.com/ZekunWu/t…
ZekunWu Mar 14, 2023
9028762
Merge branch 'develop' into feature/web/StickyTool
ZekunWu Mar 14, 2023
7e21bc3
feat: 修改布局方式
ZekunWu Mar 15, 2023
79d7a05
Merge branch 'feature/web/StickyTool' of https://github.com/ZekunWu/t…
ZekunWu Mar 15, 2023
90a783d
Merge branch 'develop' into feature/web/StickyTool
ZekunWu Mar 15, 2023
6d3ca4c
Merge branch 'feature/web/StickyTool' of https://github.com/ZekunWu/t…
Mar 22, 2023
e52f282
feat: 暂存尝试联动backtop
Mar 24, 2023
e486e56
feat: 初始化sticky-tool demo文档
Mar 28, 2023
f81aa1d
Merge branch 'develop' into feature/web/StickyTool
Mar 28, 2023
8b0ee98
chore: update description
uyarn Mar 28, 2023
5cb2535
Merge branch 'feature/web/StickyTool' of https://github.com/ZekunWu/t…
Mar 31, 2023
11e3feb
fix: 修改视觉提出的样式问题
Mar 31, 2023
27d1179
Merge branch 'develop' into feature/web/StickyTool
Apr 3, 2023
24c139c
fix: lint:fix
Apr 3, 2023
a2e8267
fix: lint:fix
Apr 3, 2023
fc16900
fix: 颜色修复
Apr 3, 2023
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
6 changes: 6 additions & 0 deletions style/web/components/sticky-tool/_index.less
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
border: @sticky-tool-border;
box-shadow: @sticky-tool-shadow;

&-popup-content {
box-shadow: @sticky-tool-popup-shadow;
font-size: @sticky-tool-popup-font-size;
color: @sticky-tool-popup-color;
}

.sticky-item-basic();

&--square {
Expand Down
3 changes: 3 additions & 0 deletions style/web/components/sticky-tool/_mixin.less
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
margin: @sticky-item-margin;
text-align: center;
font-size: @sticky-item-font-size;
color: @sticky-item-text-color;

&:hover {
cursor: pointer;
Expand All @@ -19,6 +20,7 @@
width: @sticky-item-icon-size;
height: @sticky-item-icon-size;
margin: @sticky-item-icon-margin-normal;
color: @sticky-item-icon-color;
}
}

Expand All @@ -30,6 +32,7 @@
width: @sticky-item-icon-size;
height: @sticky-item-icon-size;
margin: @sticky-item-icon-margin-compact;
color: @sticky-item-icon-color;
}
}

Expand Down
6 changes: 6 additions & 0 deletions style/web/components/sticky-tool/_var.less
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
@sticky-tool-background: @bg-color-container;
@sticky-tool-border: @component-border;
@sticky-tool-shadow: @shadow-3;
@sticky-tool-popup-shadow: @shadow-3;
@sticky-tool-popup-font-size: @font-size-s;
@sticky-tool-popup-color: @text-color-secondary;

// sticky-tool shape=square
@sticky-tool-border-radius-square: @border-radius-medium;
Expand All @@ -30,7 +33,10 @@
@sticky-item-label-height: @comp-size-xxs;
@sticky-item-label-margin-top: @comp-margin-xxs;
@sticky-item-font-size: @font-size-s;
@sticky-item-text-color: @text-color-secondary;
@sticky-item-icon-size: @icon-l;
@sticky-item-icon-color: @text-color-primary;

// sticky-tool type=normal
@sticky-item-size-normal: @comp-size-xxxl;
@sticky-item-icon-margin-normal: @comp-margin-s @comp-margin-l 0 @comp-margin-l;
Expand Down