Skip to content

Commit

Permalink
Feature/web/sticky tool (Tencent#1241)
Browse files Browse the repository at this point in the history
* feat: 部分样式

* feat: 尝试百分比尺寸

* feat: 完善css

* feat: 样式调整

* fix: 删除wxss文件

* fix: lint

* fix: 改用全局变量

* feat: 修改布局方式

* feat: 暂存尝试联动backtop

* feat: 初始化sticky-tool demo文档

* chore: update description

* fix: lint:fix

* fix: lint:fix

* fix: 颜色修复

---------

Co-authored-by: yiranwu <[email protected]>
Co-authored-by: yuyang <[email protected]>
  • Loading branch information
3 people authored and oljc committed May 9, 2023
1 parent 8424078 commit b2e10eb
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 0 deletions.
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

0 comments on commit b2e10eb

Please sign in to comment.