Skip to content

Commit a36d22a

Browse files
huangshuweihuangshuwei
committed
2 parents db065e9 + ef79a14 commit a36d22a

File tree

5 files changed

+49
-30
lines changed

5 files changed

+49
-30
lines changed

‎packages/style/ve-contextmenu.less‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
height: 34px;
3232
justify-content: center;
3333
outline: none;
34+
color: @ve-contextmenu-node-text-color;
3435
cursor: pointer;
3536

3637
&:not(&-disabled):hover {
@@ -39,6 +40,7 @@
3940
}
4041

4142
&-active {
43+
background: @ve-contextmenu-node-hover-background-color;
4244
color: @ve-contextmenu-node-active-text-color;
4345
}
4446

‎packages/style/ve-dropdown.less‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
line-height: 32px;
2626

2727
&:hover {
28-
color: @ve-primary-color;
29-
border-color: @ve-primary-color;
28+
color: @ve-dropdown-item-hover-text-color;
29+
border-color: @ve-dropdown-item-hover-text-color;
3030
}
3131

3232
.ve-dropdown-dt-selected-span {
@@ -85,7 +85,7 @@
8585
background-color: @ve-dropdown-background-color;
8686
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12),
8787
0 0 6px rgba(0, 0, 0, 0.04);
88-
border: 1px solid #d1dbe5;
88+
border: 1px solid @ve-dropdown-item-border-color;
8989

9090
padding: 5px 0px;
9191
width: auto;
@@ -95,6 +95,9 @@
9595

9696
/* 单选 */
9797
.ve-dropdown-items-li {
98+
a {
99+
text-decoration: none;
100+
}
98101
white-space: nowrap;
99102
font-size: 14px;
100103
height: 32px;

‎packages/style/ve-pagination.less‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@
5151
transition: border 0.2s ease-in-out,
5252
background-color 0.2s ease-in-out, box-shadow 0.2s ease-in-out;
5353
border-radius: 4px;
54+
color: @ve-pagination-goto-input-color;
5455
&:focus {
5556
outline: none !important;
56-
border-color: @ve-primary-color;
57+
border-color: @ve-pagination-goto-input-hover-color;
58+
}
59+
&:hover {
60+
border-color: @ve-pagination-goto-input-hover-color;
5761
}
58-
}
59-
60-
.ve-pagination-goto-input:hover {
61-
border-color: @ve-primary-color;
6262
}
6363
}
6464

@@ -80,23 +80,23 @@
8080
}
8181

8282
&:hover {
83-
border-color: @ve-primary-color;
83+
border-color: @ve-pagination-li-color;
8484
a {
85-
color: @ve-primary-color;
85+
color: @ve-pagination-li-color;
8686
}
8787
}
8888

8989
&.ve-pagination-li-active {
90-
border-color: @ve-primary-color;
90+
border-color: @ve-pagination-li-color;
9191
a {
9292
font-weight: bold;
93-
color: @ve-primary-color;
93+
color: @ve-pagination-li-color;
9494
}
9595
&:hover {
96-
border-color: @ve-primary-color;
96+
border-color: @ve-pagination-li-color;
9797
a {
9898
font-weight: bold;
99-
color: @ve-primary-color;
99+
color: @ve-pagination-li-color;
100100
}
101101
}
102102
}
@@ -109,7 +109,7 @@
109109

110110
.ve-pagination-prev:hover i,
111111
.ve-pagination-next:hover i {
112-
color: @ve-primary-color;
112+
color: @ve-pagination-jump-hover-color;
113113
}
114114

115115
.ve-pagination-jump-prev:after,
@@ -131,7 +131,7 @@
131131
.ve-pagination-jump-prev:hover i,
132132
.ve-pagination-jump-next:hover i {
133133
display: inline;
134-
color: @ve-primary-color;
134+
color: @ve-pagination-jump-hover-color;
135135
}
136136

137137
.ve-pagination-disabled {

‎packages/theme-dark/var.less‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
@ve-primary-color: #262626;
1+
@ve-primary-color: #121212;
2+
@ve-secondary-color: #363636;
23
@ve-dark-text-color: #ffffffd9;
34
@ve-default-font-size: 14px;
45

@@ -35,7 +36,11 @@
3536
@ve-pagination-item-border-color: #434343;
3637
@ve-pagination-item-background-color: @ve-primary-color;
3738
@ve-pagination-item-text-color: @ve-dark-text-color;
39+
@ve-pagination-li-color: @ve-dark-text-color;
40+
@ve-pagination-jump-hover-color: @ve-dark-text-color;
3841
@ve-pagination-goto-background-color: #141414;
42+
@ve-pagination-goto-input-color: @ve-dark-text-color;
43+
@ve-pagination-goto-input-hover-color: @ve-dark-text-color;
3944

4045
/* ve-checkbox */
4146
@ve-checkbox-checked-background-color: #108ee9;
@@ -50,26 +55,28 @@
5055

5156
/* ve-dropdown */
5257
@ve-dropdown-z-index: 999;
53-
@ve-dropdown-background-color: @ve-primary-color;
58+
@ve-dropdown-background-color: @ve-secondary-color;
5459
@ve-dropdown-border-color: #434343;
5560
@ve-dropdown-text-color: @ve-dark-text-color;
56-
@ve-dropdown-item-background-color: @ve-primary-color;
57-
@ve-dropdown-item-active-background-color: #434343;
58-
@ve-dropdown-item-hover-background-color: #434343;
61+
@ve-dropdown-item-background-color: @ve-secondary-color;
62+
@ve-dropdown-item-border-color: @ve-secondary-color;
63+
@ve-dropdown-item-active-background-color: #666666;
64+
@ve-dropdown-item-hover-background-color: #464646;
5965
@ve-dropdown-item-hover-text-color: @ve-dark-text-color;
60-
@ve-dropdown-active-text-color: #108ee9;
66+
@ve-dropdown-active-text-color: @ve-dark-text-color;
6167

6268
/* ve-contextmenu */
63-
@ve-contextmenu-background-color: #fff;
64-
@ve-contextmenu-border-color: #e4e7ed;
69+
@ve-contextmenu-background-color: @ve-secondary-color;
70+
@ve-contextmenu-border-color: @ve-secondary-color;
6571
@ve-contextmenu-border-radius: 4px;
6672
@ve-contextmenu-box-shadow-color: #0000001a;
6773
@ve-contextmenu-min-width: 180px;
6874
@ve-contextmenu-min-height: 50px;
69-
@ve-contextmenu-node-hover-background-color: #f5f7fa;
70-
@ve-contextmenu-node-hover-text-color: #409eff;
71-
@ve-contextmenu-node-active-text-color: #409eff;
75+
@ve-contextmenu-node-separator-line-color: hsla(0,0%,100%,.12);
76+
@ve-contextmenu-node-hover-background-color: #666666;
77+
@ve-contextmenu-node-text-color: @ve-dark-text-color;
78+
@ve-contextmenu-node-hover-text-color: @ve-dark-text-color;
79+
@ve-contextmenu-node-active-text-color: @ve-dark-text-color;
7280
@ve-contextmenu-node-disabled-text-color: #c0c4cc;
73-
@ve-contextmenu-node-icon-postfix-color: #666;
81+
@ve-contextmenu-node-icon-postfix-color: @ve-dark-text-color;
7482
@ve-contextmenu-node-disabled-icon-postfix-color: #c0c4cc;
75-
@ve-contextmenu-node-separator-line-color: #eee;

‎packages/theme-default/var.less‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,12 @@
3434
@ve-pagination-background-color: #fff;
3535
@ve-pagination-item-border-color: #c8cdd4;
3636
@ve-pagination-item-background-color: #fff;
37+
@ve-pagination-li-color: @ve-primary-color;
38+
@ve-pagination-jump-hover-color: @ve-primary-color;
3739
@ve-pagination-item-text-color: @ve-default-text-color;
3840
@ve-pagination-goto-background-color: #fff;
41+
@ve-pagination-goto-input-color: @ve-default-text-color;
42+
@ve-pagination-goto-input-hover-color: @ve-primary-color;
3943

4044
/* ve-checkbox */
4145
@ve-checkbox-checked-background-color: @ve-primary-color;
@@ -54,9 +58,10 @@
5458
@ve-dropdown-border-color: #c8cdd4;
5559
@ve-dropdown-text-color: @ve-default-text-color;
5660
@ve-dropdown-item-background-color: #fff;
61+
@ve-dropdown-item-border-color: #d1dbe5;
5762
@ve-dropdown-item-active-background-color: #e6f7ff;
5863
@ve-dropdown-item-hover-background-color: #f3f3f3;
59-
@ve-dropdown-item-hover-text-color: @ve-default-text-color;
64+
@ve-dropdown-item-hover-text-color: @ve-primary-color;
6065
@ve-dropdown-active-text-color: @ve-primary-color;
6166

6267
/* ve-contextmenu */
@@ -66,7 +71,9 @@
6671
@ve-contextmenu-box-shadow-color: #0000001a;
6772
@ve-contextmenu-min-width: 180px;
6873
@ve-contextmenu-min-height: 50px;
74+
@ve-contextmenu-node-label-text-color: @ve-primary-color;
6975
@ve-contextmenu-node-hover-background-color: #f5f7fa;
76+
@ve-contextmenu-node-text-color: @ve-default-text-color;
7077
@ve-contextmenu-node-hover-text-color: #409eff;
7178
@ve-contextmenu-node-active-text-color: #409eff;
7279
@ve-contextmenu-node-disabled-text-color: #c0c4cc;

0 commit comments

Comments
 (0)