Skip to content

Commit

Permalink
fix: upgrade css variables (#1273)
Browse files Browse the repository at this point in the history
* fix: upgrade css variables

* refactor: css token using css varibales

* fix: replace token

* test: update snapshot
  • Loading branch information
LeeJim authored Dec 25, 2022
1 parent 2beaddd commit 26e74d9
Show file tree
Hide file tree
Showing 39 changed files with 663 additions and 704 deletions.
18 changes: 9 additions & 9 deletions src/avatar/avatar-group.less
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@import '../common/style/index.less';

//组合头像偏移量
@avatar-group-offset-small: -4px;
@avatar-group-offset-medium: -6px;
@avatar-group-offset-large: -8px;
@avatar-group-offset-small: var(--td-avatar-group-margin-left-small, -4px);
@avatar-group-offset-medium: var(--td-avatar-group-margin-left-medium, -6px);
@avatar-group-offset-large: var(--td-avatar-group-margin-left-large, -8px);

.avatat-offset-left(@offset) {
@{prefix}-avatar {
Expand All @@ -27,29 +27,29 @@

&-offset-left {
&-small {
.avatat-offset-left(var(--td-avatar-group-margin-left-small, @avatar-group-offset-small)); // ‘small’尺寸组合头像左偏移间距
.avatat-offset-left(@avatar-group-offset-small); // ‘small’尺寸组合头像左偏移间距
}

&-medium {
.avatat-offset-left(var(--td-avatar-group-margin-left-medium, @avatar-group-offset-medium)); // ‘medium’尺寸组合头像左偏移间距
.avatat-offset-left(@avatar-group-offset-medium); // ‘medium’尺寸组合头像左偏移间距
}

&-large {
.avatat-offset-left(var(--td-avatar-group-margin-left-large, @avatar-group-offset-large)); // ‘large’尺寸组合头像左偏移间距
.avatat-offset-left(@avatar-group-offset-large); // ‘large’尺寸组合头像左偏移间距
}
}

&-offset-right {
&-small {
.avatat-offset-right(var(--td-avatar-group-margin-left-small, @avatar-group-offset-small)); // ‘small’尺寸组合头像右偏移间距
.avatat-offset-right(@avatar-group-offset-small); // ‘small’尺寸组合头像右偏移间距
}

&-medium {
.avatat-offset-right(var(--td-avatar-group-margin-left-medium, @avatar-group-offset-medium)); // ‘medium’尺寸组合头像右偏移间距
.avatat-offset-right(@avatar-group-offset-medium); // ‘medium’尺寸组合头像右偏移间距
}

&-large {
.avatat-offset-right(var(--td-avatar-group-margin-left-large, @avatar-group-offset-large)); // ‘large’尺寸组合头像右偏移间距
.avatat-offset-right(@avatar-group-offset-large); // ‘large’尺寸组合头像右偏移间距
}
}

Expand Down
80 changes: 40 additions & 40 deletions src/avatar/avatar.less
Original file line number Diff line number Diff line change
@@ -1,61 +1,61 @@
@import '../common/style/index.less';

@avatar-bg-color: @primary-color-2;
@avatar-content-color: @primary-color;
@avatar-small-width: 80rpx;
@avatar-medium-width: 96rpx;
@avatar-large-width: 128rpx;

@avatar-text-small-font-size: @font-size-s;
@avatar-text-medium-font-size: @font-size-base;
@avatar-text-large-font-size: 16px;

@avatar-icon-small-font-size: 40rpx;
@avatar-icon-medium-font-size: 48rpx;
@avatar-icon-large-font-size: 64rpx;

@avatar-border-width-small: 4rpx;
@avatar-border-width-medium: 6rpx;
@avatar-border-width-large: 8rpx;
@avatar-border-color: #fff;
@avatar-circle-border-radius: @radius-circle;
@avatar-round-border-radius: @radius-default;
@avatar-bg-color: var(--td-avatar-bg-color, @primary-color-2);
@avatar-content-color: var(--td-avatar-content-color, @primary-color);
@avatar-small-width: var(--td-avatar-small-width, 80rpx);
@avatar-medium-width: var(--td-avatar-medium-width, 96rpx);
@avatar-large-width: var(--td-avatar-large-width, 128rpx);

@avatar-text-small-font-size: var(--td-avatar-text-small-font-size, @font-size-s);
@avatar-text-medium-font-size: var(--td-avatar-text-medium-font-size, @font-size-base);
@avatar-text-large-font-size: var(--td-avatar-text-large-font-size, 16px);

@avatar-icon-small-font-size: var(--td-avatar-icon-small-font-size, 40rpx);
@avatar-icon-medium-font-size: var(--td-avatar-icon-medium-font-size, 48rpx);
@avatar-icon-large-font-size: var(--td-avatar-icon-large-font-size, 64rpx);

@avatar-border-width-small: var(--td-avatar-border-width-small, 4rpx);
@avatar-border-width-medium: var(--td-avatar-border-width-medium, 6rpx);
@avatar-border-width-large: var(--td-avatar-border-width-large, 8rpx);
@avatar-border-color: var(--td-avatar-border-color, #fff);
@avatar-circle-border-radius: var(--td-avatar-circle-border-radius, @radius-circle);
@avatar-round-border-radius: var(--td-avatar-round-border-radius, @radius-default);

.@{prefix}-avatar {
display: flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
background-color: var(--td-avatar-bg-color, @avatar-bg-color); // 头像背景颜色
color: var(--td-avatar-content-color, @avatar-content-color); // 头像内容(文字、图标)颜色
background-color: @avatar-bg-color;
color: @avatar-content-color;

&.@{prefix}-size-l {
width: var(--td-avatar-large-width, @avatar-large-width); // ‘large'尺寸头像宽高
height: var(--td-avatar-large-width, @avatar-large-width);
font-size: var(--td-avatar-text-large-font-size, @avatar-text-large-font-size); // ‘large'尺寸头像文本大小
width: @avatar-large-width;
height: @avatar-large-width;
font-size: @avatar-text-large-font-size;

.@{prefix}-avatar__icon {
font-size: var(--td-avatar-icon-large-font-size, @avatar-icon-large-font-size); // ‘large'尺寸头像图标大小
font-size: @avatar-icon-large-font-size;
}
}

&.@{prefix}-size-m {
width: var(--td-avatar-medium-width, @avatar-medium-width); // ‘medium’尺寸头像宽高
height: var(--td-avatar-medium-width, @avatar-medium-width);
font-size: var(--td-avatar-text-medium-font-size, @avatar-text-medium-font-size); // ‘medium'尺寸头像文本大小
width: @avatar-medium-width;
height: @avatar-medium-width;
font-size: @avatar-text-medium-font-size;

.@{prefix}-avatar__icon {
font-size: var(--ts-avatar-icon-medium-font-size, @avatar-icon-medium-font-size); // ‘medium'尺寸头像图标大小
font-size: @avatar-icon-medium-font-size;
}
}

&.@{prefix}-size-s {
width: var(--td-avatar-small-width, @avatar-small-width); // ‘small’尺寸头像宽高
height: var(--td-avatar-small-width, @avatar-small-width);
font-size: var(--td-avatar-text-small-font-size, @avatar-text-small-font-size); // ‘small'尺寸头像文本大小
width: @avatar-small-width;
height: @avatar-small-width;
font-size: @avatar-text-small-font-size;

.@{prefix}-avatar__icon {
font-size: var(--td-avatar-icon-small-font-size, @avatar-icon-small-font-size); // ‘small'尺寸头像图标大小
font-size: @avatar-icon-small-font-size;
}
}

Expand All @@ -66,12 +66,12 @@
}

&--circle {
border-radius: var(--td-avatar-circle-border-radius, @avatar-circle-border-radius); // ‘circle’类型头像圆角大小
border-radius: @avatar-circle-border-radius;
overflow: hidden;
}

&--round {
border-radius: var(--td-avatar-round-border-radius, @avatar-round-border-radius); // ‘round’类型头像圆角大小
border-radius: @avatar-round-border-radius;
overflow: hidden;
}

Expand All @@ -90,18 +90,18 @@

//头像边框
&--border {
border-color: var(--td-avatar-border-color, @avatar-border-color); // 头像边框颜色
border-color: @avatar-border-color;
border-style: solid;
&--small {
border-width: var(--td-avatar-border-width-small, @avatar-border-width-small); // ‘small'尺寸头像边框宽度
border-width: @avatar-border-width-small;
}

&--medium {
border-width: var(--td-avatar-border-width-medium, @avatar-border-width-medium); // ‘medium'尺寸头像边框宽度
border-width: @avatar-border-width-medium;
}

&--large {
border-width: var(--td-avatar-border-width-large, @avatar-border-width-large); // ‘large'尺寸头像边框宽度
border-width: @avatar-border-width-large;
}
}
}
2 changes: 1 addition & 1 deletion src/back-top/back-top.less
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

&__icon:not(:empty) + &__text--half-round,
&__icon:not(:empty) + &__text--half-round-dark {
margin-left: (@spacer / 2);
margin-left: 8rpx;
}

&__icon {
Expand Down
Loading

0 comments on commit 26e74d9

Please sign in to comment.