Skip to content

Commit c914361

Browse files
zzcrzzcr
authored
Merge branch 'opentiny:dev' into dev
2 parents affb2d4 + 2d4d538 commit c914361

File tree

7 files changed

+165
-23
lines changed

7 files changed

+165
-23
lines changed

‎src/action-menu/index.less

+36-14
Original file line numberDiff line numberDiff line change
@@ -20,45 +20,67 @@
2020
.component-css-vars-action-menu();
2121

2222
font-size: var(--ti-action-menu-font-size);
23-
color: var( --ti-action-menu-text-color);
23+
color: var(--ti-action-menu-text-color);
2424

25-
&__wrap{
25+
&__wrap {
2626
display: flex;
2727

28-
.@{action-menu-prefix-cls}__item{
28+
.@{action-menu-prefix-cls}__item {
2929
display: flex;
3030
justify-content: space-between;
3131
align-items: center;
3232

33-
.tiny-svg {
33+
.tiny-svg {
34+
fill: var(--ti-action-menu-text-color);
3435
margin: var(--ti-action-menu-item-svg-margin-top) var(--ti-action-menu-item-svg-margin-right) var(--ti-action-menu-item-svg-margin-bottom) var(--ti-action-menu-item-svg-margin-left);
3536
}
3637

37-
&.@{action-menu-prefix-cls}__item-visable{
38-
.@{dropdown-item-prefix-cls}{
38+
&:hover:not(.is-disabled) {
39+
color: var(--ti-action-menu-item-hover-text-color);
40+
41+
&.@{action-menu-prefix-cls}__item-visable {
42+
.@{dropdown-item-prefix-cls} {
43+
color: var(--ti-action-menu-item-hover-text-color);
44+
}
45+
46+
}
47+
48+
.tiny-svg {
49+
fill: var(--ti-action-menu-item-hover-text-color);
50+
}
51+
}
52+
53+
&.is-disabled:hover{
54+
.@{dropdown-item-prefix-cls} {
55+
color: var(--ti-action-menu-item-disabled-text-color);
56+
}
57+
}
58+
59+
&.@{action-menu-prefix-cls}__item-visable {
60+
.@{dropdown-item-prefix-cls} {
3961
color: var(--ti-action-menu-text-color);
4062
padding: var(--ti-action-menu-item-padding-top) var(--ti-action-menu-item-padding-right) var(--ti-action-menu-item-padding-bottom) var(--ti-action-menu-item-padding-left);
4163

42-
&:hover{
43-
background-color: var( --ti-action-menu-item-hover-bg-color);
64+
&:hover {
65+
background-color: var(--ti-action-menu-item-hover-bg-color);
4466
}
4567
}
4668
}
4769

48-
&.is-disabled{
49-
.@{dropdown-item-prefix-cls}{
70+
&.is-disabled {
71+
.@{dropdown-item-prefix-cls} {
5072
cursor: not-allowed;
5173
color: var(--ti-action-menu-item-disabled-text-color);
5274
}
5375
}
54-
55-
.@{action-menu-prefix-cls}__item-line{
76+
77+
.@{action-menu-prefix-cls}__item-line {
5678
position: relative;
5779
width: 1px;
5880
height: 12px;
59-
background:var(--ti-action-menu-item-line-bg-color);
81+
background: var(--ti-action-menu-item-line-bg-color);
6082
display: inline-block;
6183
}
6284
}
6385
}
64-
}
86+
}

‎src/action-menu/vars.less

+5-4
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111
*/
1212

1313
.component-css-vars-action-menu() {
14-
--ti-action-menu-text-color: var(--ti-base-color-brand-7);
14+
--ti-action-menu-text-color: var(--ti-common-color-text-link);
1515
--ti-action-menu-font-size: var(--ti-common-font-size-base);
16-
--ti-action-menu-item-line-bg-color: var(--ti-base-color-common-1);
17-
--ti-action-menu-item-disabled-text-color: var(--ti-base-color-common-2);
18-
--ti-action-menu-item-hover-bg-color: var(--ti-base-color-transparent);
16+
--ti-action-menu-item-line-bg-color: var(--ti-common-color-line-dividing);
17+
--ti-action-menu-item-disabled-text-color: var(--ti-common-color-text-disabled);
18+
--ti-action-menu-item-hover-bg-color: var(--ti-common-color-transparent);
19+
--ti-action-menu-item-hover-text-color:var(--ti-common-color-text-link-hover);
1920
--ti-action-menu-item-padding-top: 0;
2021
--ti-action-menu-item-padding-right: 0;
2122
--ti-action-menu-item-padding-bottom: 0;

‎src/anchor/index.js

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/**
2+
* Copyright (c) 2022 - present TinyVue Authors.
3+
* Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd.
4+
*
5+
* Use of this source code is governed by an MIT-style license.
6+
*
7+
* THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
8+
* BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
9+
* A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
10+
*
11+
*/
12+
13+
export default {
14+
'tiny-anchor-text-color': '#252b3a',
15+
'tiny-anchor-font-size': '14px',
16+
'tiny-anchor-link-active-bg-color': '#5e7ce0',
17+
'tiny-anchor-link-active-text-color': '#5e7ce0',
18+
'tiny-anchor-orbit-width': '4px',
19+
'tiny-anchor-orbit-bg-color': '#dfe1e6'
20+
}

‎src/anchor/index.less

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
/**
2+
* Copyright (c) 2022 - present TinyVue Authors.
3+
* Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd.
4+
*
5+
* Use of this source code is governed by an MIT-style license.
6+
*
7+
* THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
8+
* BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
9+
* A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
10+
*
11+
*/
12+
13+
@import '../custom.less';
14+
@import './vars.less';
15+
16+
@anchor-prefix-cls: ~'@{css-prefix}anchor';
17+
18+
.@{anchor-prefix-cls} {
19+
&__wrapper {
20+
.component-css-vars-anchor();
21+
}
22+
23+
position: relative;
24+
color: var(--ti-anchor-text-color);
25+
font-size: var(--ti-anchor-font-size);
26+
27+
&-link-mask {
28+
position: absolute;
29+
max-width: 0;
30+
border-top-right-radius: 10px;
31+
border-bottom-right-radius: 10px;
32+
left: var(--ti-anchor-orbit-width / 2);
33+
width: 100%;
34+
background-color: rgba(80, 115, 229, 0.15);
35+
}
36+
37+
&-orbit {
38+
position: absolute;
39+
left: 0;
40+
top: 0;
41+
bottom: 0;
42+
width: var(--ti-anchor-orbit-width);
43+
border-radius: calc(var(--ti-anchor-orbit-width / 2));
44+
background-color: var(--ti-anchor-orbit-bg-color);
45+
&-skid {
46+
position: absolute;
47+
left: 0;
48+
width: var(--ti-anchor-orbit-width);
49+
background-color: var(--ti-anchor-orbit-bg-color);
50+
&--active {
51+
background-color: var(--ti-anchor-link-active-bg-color);
52+
}
53+
}
54+
}
55+
56+
&-link {
57+
margin: 0 0 0 9px;
58+
cursor: pointer;
59+
&-title {
60+
display: block;
61+
max-width: 100%;
62+
padding: 1px 8px 1px 10px;
63+
white-space: nowrap;
64+
text-overflow: ellipsis;
65+
color: var(--ti-anchor-text-color);
66+
&--active {
67+
color: var(--ti-anchor-link-active-text-color);
68+
}
69+
}
70+
}
71+
}
72+
73+
.tiny-anchor-scroll-container {
74+
scroll-behavior: smooth;
75+
}

‎src/anchor/vars.less

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/**
2+
* Copyright (c) 2022 - present TinyVue Authors.
3+
* Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd.
4+
*
5+
* Use of this source code is governed by an MIT-style license.
6+
*
7+
* THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
8+
* BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
9+
* A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
10+
*
11+
*/
12+
13+
.component-css-vars-anchor() {
14+
--ti-anchor-text-color: var(--ti-common-color-info);
15+
--ti-anchor-font-size: var(--ti-common-font-size-1);
16+
--ti-anchor-link-active-bg-color: var(--ti-common-color-bg-emphasize);
17+
--ti-anchor-link-active-text-color: var(--ti-common-color-bg-emphasize);
18+
--ti-anchor-orbit-width: var(--ti-common-size-base);
19+
--ti-anchor-orbit-bg-color: var(--ti-common-color-line-dividing);
20+
}

‎src/button/vars.less

+5-5
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
--ti-button-primary-normal-bg-color: var(--ti-base-color-primary-normal);
6666
--ti-button-primary-hover-bg-color: var(--ti-base-color-primary-hover);
6767
--ti-button-primary-active-bg-color: var(--ti-base-color-primary-active);
68-
--ti-button-primary-disabled-bg-color: var(--ti-base-color-primary-disabled);
68+
--ti-button-primary-disabled-bg-color: var(--ti-common-color-bg-disabled);
6969
--ti-button-primary-text-color: var(--ti-base-color-light);
7070
--ti-button-primary-disabled-text-color: var(--ti-common-color-text-disabled);
7171
--ti-button-primary-disabled-border-color: var(--ti-base-color-primary-disabled-border);
@@ -75,7 +75,7 @@
7575
--ti-button-success-normal-bg-color: var(--ti-base-color-success-normal);
7676
--ti-button-success-hover-bg-color: var(--ti-base-color-success-hover);
7777
--ti-button-success-active-bg-color: var(--ti-base-color-success-active);
78-
--ti-button-success-disabled-bg-color: var(--ti-base-color-success-disabled);
78+
--ti-button-success-disabled-bg-color: var(--ti-common-color-bg-disabled);
7979
--ti-button-success-text-color: var(--ti-base-color-light);
8080
--ti-button-success-disabled-text-color: var(--ti-common-color-text-disabled);
8181
--ti-button-success-disabled-border-color: var(--ti-base-color-success-disabled-border);
@@ -85,7 +85,7 @@
8585
--ti-button-warning-normal-bg-color: var(--ti-base-color-warning-normal);
8686
--ti-button-warning-hover-bg-color: var(--ti-base-color-warning-hover);
8787
--ti-button-warning-active-bg-color: var(--ti-base-color-warning-active);
88-
--ti-button-warning-disabled-bg-color: var(--ti-base-color-warning-disabled);
88+
--ti-button-warning-disabled-bg-color: var(--ti-common-color-bg-disabled);
8989
--ti-button-warning-text-color: var(--ti-base-color-light);
9090
--ti-button-warning-disabled-text-color: var(--ti-common-color-text-disabled);
9191
--ti-button-warning-disabled-border-color: var(--ti-base-color-warning-disabled-border);
@@ -95,7 +95,7 @@
9595
--ti-button-danger-normal-bg-color: var(--ti-base-color-danger-normal);
9696
--ti-button-danger-hover-bg-color: var(--ti-base-color-danger-hover);
9797
--ti-button-danger-active-bg-color: var(--ti-base-color-danger-active);
98-
--ti-button-danger-disabled-bg-color: var(--ti-base-color-danger-disabled);
98+
--ti-button-danger-disabled-bg-color: var(--ti-common-color-bg-disabled);
9999
--ti-button-danger-text-color: var(--ti-base-color-light);
100100
--ti-button-danger-disabled-text-color: var(--ti-common-color-text-disabled);
101101
--ti-button-danger-disabled-border-color: var(--ti-base-color-danger-disabled-border);
@@ -105,7 +105,7 @@
105105
--ti-button-info-normal-bg-color: var(--ti-base-color-info-normal);
106106
--ti-button-info-hover-bg-color: var(--ti-base-color-info-hover);
107107
--ti-button-info-active-bg-color: var(--ti-base-color-info-active);
108-
--ti-button-info-disabled-bg-color: var(--ti-base-color-info-disabled);
108+
--ti-button-info-disabled-bg-color: var(--ti-common-color-bg-disabled);
109109
--ti-button-info-text-color: var(--ti-base-color-light);
110110
--ti-button-info-disabled-text-color: var(--ti-common-color-text-disabled);
111111
--ti-button-info-disabled-border-color: var(--ti-base-color-info-disabled-border);

‎src/dropdown/index.less

+4
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,8 @@
7373
cursor: not-allowed;
7474
color: #bbb
7575
}
76+
77+
&:hover{
78+
cursor: pointer;
79+
}
7680
}

0 commit comments

Comments
 (0)