Skip to content

Commit dcb3963

Browse files
committed
Merge remote-tracking branch 'remote/develop' into develop
2 parents 2384e20 + 97c93be commit dcb3963

File tree

8 files changed

+92
-2
lines changed

8 files changed

+92
-2
lines changed

src/avatar/style/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import { css, globalCSS } from 'omi';
22

33
import avatarStyle from '../../_common/style/web/components/avatar/_index.less';
4+
import wcStyles from './wc.less';
45

56
export const styleSheet = css`
67
${avatarStyle}
8+
${wcStyles}
79
`;
810

911
globalCSS(styleSheet);

src/avatar/style/wc.less

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
@import "../../_common/style/web/base.less";
2+
@import "../../_common/style/web/components/avatar/_mixin.less";
3+
4+
// for web-component
5+
.@{prefix}-avatar-group {
6+
&.@{prefix}-avatar--offset-right {
7+
& @{prefix}-avatar-light-dom {
8+
&:not(:last-child) {
9+
.avatar-group-offset-right(@avatar-group-offset-medium);
10+
&.@{prefix}-size-s {
11+
.avatar-group-offset-right(@avatar-group-offset-small);
12+
}
13+
&.@{prefix}-size-l {
14+
.avatar-group-offset-right(@avatar-group-offset-large);
15+
}
16+
}
17+
}
18+
}
19+
&.@{prefix}-avatar--offset-left {
20+
& @{prefix}-avatar-light-dom {
21+
&:not(:first-child) {
22+
.avatar-group-size--left();
23+
}
24+
}
25+
}
26+
}

src/dialog/style/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ import { css, globalCSS } from 'omi';
33
// 为了做主题切换
44
import styles from '../../_common/style/web/components/dialog/_index.less';
55
import dialogStyles from './dialog.less';
6+
import wcStyles from './wc.less';
67

78
export const styleSheet = css`
89
${styles}
910
${dialogStyles}
11+
${wcStyles}
1012
`;
1113

1214
globalCSS(styleSheet);

src/dialog/style/wc.less

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
@import "../../_common/style/web/base.less";
2+
@import "../../_common/style/web/components/dialog/_var.less";
3+
4+
// for web-component
5+
.@{prefix}-dialog {
6+
// icon theme
7+
t-icon-info-circle.@{prefix}-is-info {
8+
color: @dialog-info-icon-color;
9+
}
10+
11+
t-icon-check-circle.@{prefix}-is-success {
12+
color: @dialog-success-icon-color;
13+
}
14+
15+
t-icon-error-circle.@{prefix}-is-warning {
16+
color: @dialog-warning-icon-color;
17+
}
18+
19+
t-icon-error-circle.@{prefix}-is-error {
20+
color: @dialog-error-icon-color;
21+
}
22+
23+
&__header {
24+
t-icon-check-circle,
25+
t-icon-info-circle,
26+
t-icon-error-circle {
27+
font-size: @dialog-icon-size;
28+
display: inline-flex;
29+
align-items: center;
30+
margin-right: @dialog-header-icon-margin-right;
31+
flex-shrink: 0;
32+
}
33+
}
34+
35+
&__footer {
36+
.@{prefix}-button + .@{prefix}-button,
37+
.@{prefix}-dialog__button + .@{prefix}-dialog__button {
38+
margin-left: @dialog-footer-button-margin-left;
39+
}
40+
}
41+
}

src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,4 @@ export * from './tag-input';
4242
export * from './textarea';
4343
export * from './tooltip';
4444
export * from './upload';
45-
export * from './vue';
4645
export * from './watermark';

src/list/style/wc.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
@import "../../_common/style/web/base.less";
32
@import "../../_common/style/web/components/list/_var.less";
43

src/slider/style/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ import { css, globalCSS } from 'omi';
22

33
// 为了做主题切换
44
import styles from '../../_common/style/web/components/slider/_index.less';
5+
import wcStyles from './wc.less';
56

67
export const styleSheet = css`
78
${styles}
9+
${wcStyles}
810
`;
911

1012
globalCSS(styleSheet);

src/slider/style/wc.less

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
@import "../../_common/style/web/base.less";
2+
@import "../../_common/style/web/components/slider/_var.less";
3+
4+
.@{prefix}-slider--vertical .@{prefix}-slider__button-wrapper,
5+
.@{prefix}-slider__button-wrapper--vertical {
6+
top: auto;
7+
position: absolute;
8+
z-index: 2;
9+
left: 50%;
10+
transform: translate(-50%, 50%);
11+
background-color: transparent;
12+
text-align: center;
13+
user-select: none;
14+
line-height: normal;
15+
outline: none;
16+
cursor: pointer;
17+
display: flex;
18+
align-items: center;
19+
}

0 commit comments

Comments
 (0)