tntd 2.8.0-beta.10 → 2.8.0-beta.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/es/modal/style/confirm.less +6 -6
  2. package/es/tag/color.less +11 -1
  3. package/es/tag/tag.less +40 -5
  4. package/lib/modal/style/confirm.less +6 -6
  5. package/lib/tag/color.less +11 -1
  6. package/lib/tag/tag.less +40 -5
  7. package/package.json +1 -1
package/es/modal/style/confirm.less CHANGED
@@ -13,11 +13,6 @@
13
13
 
14
14
  .@{ant-prefix}-modal-body {
15
15
  padding: @padding-base;
16
-
17
- .anticon {
18
- font-size: @heading-2-size;
19
- margin-right: @margin-xs;
20
- }
21
16
  }
22
17
 
23
18
  &-body-wrapper {
@@ -32,12 +27,17 @@
32
27
  overflow: hidden;
33
28
  color: @heading-color;
34
29
  font-weight: 500;
35
- font-size: @heading-3-size;
30
+ font-size: @font-size-lg;
36
31
  line-height: @heading-3-line-height;
37
32
  font-family: PingFang SC;
38
33
  margin: @margin-xxs 0;
39
34
  }
40
35
 
36
+ .anticon {
37
+ font-size: @heading-2-size;
38
+ margin-right: @margin-xs;
39
+ }
40
+
41
41
  .@{confirm-prefix-cls}-content {
42
42
  margin-top: @margin-xxs;
43
43
  color: @text-color-secondary;
package/es/tag/color.less CHANGED
@@ -1,43 +1,53 @@
1
- @preset-colors-custom: grey, blue, green, red, gold, lightblue, bluegrey, purplegrey, purple, lightpurple, lightgreen, pink, rose, orange, magenta, volcano, yellow, cyan, lime, geekblue, tnt-pink, tnt-orange, tnt-purple;
1
+ @preset-colors-custom: grey, green, red, gold, lightblue, bluegrey, purplegrey, purple, lightpurple, lightgreen, pink, rose, orange, magenta, volcano, yellow, cyan, lime, geekblue, tnt-pink, tnt-orange, tnt-purple;
2
2
 
3
3
 
4
4
  @grey-7: @text-color-secondary;
5
+ @grey-5: #8b919e;
5
6
  @grey-4: @border-color-base;
6
7
  @grey-1: @tag-default-bg;
7
8
 
8
9
  @rose-7:#D8395E;
10
+ @rose-5: #EE3E67;
9
11
  @rose-4: #FEA3B4;
10
12
  @rose-1: #FFF1F3;
11
13
 
12
14
  @lightblue-7: #1AA9E6;
15
+ @lightblue-5: #36BFFA;
13
16
  @lightblue-4: #8FE0FF;
14
17
  @lightblue-1: #F0F9FF;
15
18
 
16
19
  @bluegrey-7: #486FBB;
20
+ @bluegrey-5: #628FE4;
17
21
  @bluegrey-4: #A1BCEF;
18
22
  @bluegrey-1: #F4F8FF;
19
23
 
20
24
  @purplegrey-7: #4E5BA6;
25
+ @purplegrey-5: #717BBC;
21
26
  @purplegrey-4: #AFB5D9;
22
27
  @purplegrey-1: #F8F9FC;
23
28
 
24
29
  @tnt-purple-7: #6E54D4;
30
+ @tnt-purple-5: #7A5AF8;
25
31
  @tnt-purple-4: #BDB4FE;
26
32
  @tnt-purple-1: #F4F3FF;
27
33
 
28
34
  @lightpurple-7: #5161D7;
35
+ @lightpurple-5: #6172F3;
29
36
  @lightpurple-4: #A4BCFD;
30
37
  @lightpurple-1: #EEF4FF;
31
38
 
32
39
  @lightgreen-7: #2E9C98;
40
+ @lightgreen-5: #3AB4AF;
33
41
  @lightgreen-4: #8CE0DD;
34
42
  @lightgreen-1: #F1FBFB;
35
43
 
36
44
  @tnt-pink-7: #D03E93;
45
+ @tnt-pink-5: #E844B7;
37
46
  @tnt-pink-4: #FAA7E0;
38
47
  @tnt-pink-1: #FDF2FA;
39
48
 
40
49
  @tnt-orange-7:#DF5F28;
50
+ @tnt-orange-5:#F47345;
41
51
  @tnt-orange-4: #FEB173;
42
52
  @tnt-orange-1: #FFF6ED;
43
53
 
package/es/tag/tag.less CHANGED
@@ -112,6 +112,29 @@
112
112
  }
113
113
  }
114
114
 
115
+ &.@{tag-prefix-cls}-blue {
116
+ color: @blue-6;
117
+ background: @blue-1;
118
+ border-color: @blue-3;
119
+ >.@{iconfont-css-prefix}-close {
120
+ color: @blue-5;
121
+ }
122
+ &.@{tag-prefix-cls}-no-border{
123
+ border-color:transparent;
124
+ }
125
+ }
126
+ &.@{tag-prefix-cls}-blue-inverse {
127
+ color: @text-color-inverse;
128
+ background: @blue-6;
129
+ border-color: @blue-6;
130
+ >.@{iconfont-css-prefix}-close {
131
+ color: @text-color-inverse;
132
+ }
133
+ &.@{tag-prefix-cls}-no-border{
134
+ border-color:transparent;
135
+ }
136
+ }
137
+
115
138
  // mixin to iterate over colors and create CSS class for each one
116
139
  .make-color-classes(@i: length(@preset-colors-custom)) when (@i > 0) {
117
140
  .make-color-classes(@i - 1);
@@ -119,13 +142,13 @@
119
142
  @lightColor: '@{color}-1';
120
143
  @lightBorderColor: '@{color}-4';
121
144
  @darkColor: '@{color}-7';
145
+ @closeColor:'@{color}-5';
122
146
  &.@{tag-prefix-cls}-@{color} {
123
147
  color: @@darkColor;
124
148
  background: @@lightColor;
125
149
  border-color: @@lightBorderColor;
126
150
  >.@{iconfont-css-prefix}-close {
127
- color: @@darkColor;//fade(@@darkColor,80%);
128
- opacity: .8;
151
+ color: @@closeColor;
129
152
  }
130
153
  &.@{tag-prefix-cls}-no-border{
131
154
  border-color:transparent;
@@ -135,7 +158,9 @@
135
158
  color: @text-color-inverse;
136
159
  background: @@darkColor;
137
160
  border-color: @@darkColor;
138
-
161
+ >.@{iconfont-css-prefix}-close {
162
+ color: @text-color-inverse;
163
+ }
139
164
  &.@{tag-prefix-cls}-no-border{
140
165
  border-color:transparent;
141
166
  }
@@ -154,11 +179,21 @@
154
179
  cursor: pointer;
155
180
  &-border{
156
181
  border-color: @border-color-base;
182
+ // 非disabled
183
+ &:not(.@{tag-prefix-cls}-checkable-disabled):hover {
184
+ border-color: @primary-3;
185
+ }
186
+ }
187
+
188
+ &:not(.@{tag-prefix-cls}-checkable-disabled):hover {
189
+ color: @primary-6;
190
+ background-color: @primary-1;
191
+ transition: all 0.3s @ease-in-out-circ;
157
192
  }
158
193
 
159
194
  &:active,
160
195
  &-checked {
161
- color: @primary-7;
196
+ color: @primary-6;
162
197
  background-color: @primary-1;
163
198
  &.@{tag-prefix-cls}-checkable-border{
164
199
  border-color: @primary-3;
@@ -167,7 +202,7 @@
167
202
 
168
203
  &-checked {
169
204
  &.@{tag-prefix-cls}-checkable-disabled:hover {
170
- color: @primary-color;
205
+ color: @primary-6;
171
206
  }
172
207
  }
173
208
 
package/lib/modal/style/confirm.less CHANGED
@@ -13,11 +13,6 @@
13
13
 
14
14
  .@{ant-prefix}-modal-body {
15
15
  padding: @padding-base;
16
-
17
- .anticon {
18
- font-size: @heading-2-size;
19
- margin-right: @margin-xs;
20
- }
21
16
  }
22
17
 
23
18
  &-body-wrapper {
@@ -32,12 +27,17 @@
32
27
  overflow: hidden;
33
28
  color: @heading-color;
34
29
  font-weight: 500;
35
- font-size: @heading-3-size;
30
+ font-size: @font-size-lg;
36
31
  line-height: @heading-3-line-height;
37
32
  font-family: PingFang SC;
38
33
  margin: @margin-xxs 0;
39
34
  }
40
35
 
36
+ .anticon {
37
+ font-size: @heading-2-size;
38
+ margin-right: @margin-xs;
39
+ }
40
+
41
41
  .@{confirm-prefix-cls}-content {
42
42
  margin-top: @margin-xxs;
43
43
  color: @text-color-secondary;
package/lib/tag/color.less CHANGED
@@ -1,43 +1,53 @@
1
- @preset-colors-custom: grey, blue, green, red, gold, lightblue, bluegrey, purplegrey, purple, lightpurple, lightgreen, pink, rose, orange, magenta, volcano, yellow, cyan, lime, geekblue, tnt-pink, tnt-orange, tnt-purple;
1
+ @preset-colors-custom: grey, green, red, gold, lightblue, bluegrey, purplegrey, purple, lightpurple, lightgreen, pink, rose, orange, magenta, volcano, yellow, cyan, lime, geekblue, tnt-pink, tnt-orange, tnt-purple;
2
2
 
3
3
 
4
4
  @grey-7: @text-color-secondary;
5
+ @grey-5: #8b919e;
5
6
  @grey-4: @border-color-base;
6
7
  @grey-1: @tag-default-bg;
7
8
 
8
9
  @rose-7:#D8395E;
10
+ @rose-5: #EE3E67;
9
11
  @rose-4: #FEA3B4;
10
12
  @rose-1: #FFF1F3;
11
13
 
12
14
  @lightblue-7: #1AA9E6;
15
+ @lightblue-5: #36BFFA;
13
16
  @lightblue-4: #8FE0FF;
14
17
  @lightblue-1: #F0F9FF;
15
18
 
16
19
  @bluegrey-7: #486FBB;
20
+ @bluegrey-5: #628FE4;
17
21
  @bluegrey-4: #A1BCEF;
18
22
  @bluegrey-1: #F4F8FF;
19
23
 
20
24
  @purplegrey-7: #4E5BA6;
25
+ @purplegrey-5: #717BBC;
21
26
  @purplegrey-4: #AFB5D9;
22
27
  @purplegrey-1: #F8F9FC;
23
28
 
24
29
  @tnt-purple-7: #6E54D4;
30
+ @tnt-purple-5: #7A5AF8;
25
31
  @tnt-purple-4: #BDB4FE;
26
32
  @tnt-purple-1: #F4F3FF;
27
33
 
28
34
  @lightpurple-7: #5161D7;
35
+ @lightpurple-5: #6172F3;
29
36
  @lightpurple-4: #A4BCFD;
30
37
  @lightpurple-1: #EEF4FF;
31
38
 
32
39
  @lightgreen-7: #2E9C98;
40
+ @lightgreen-5: #3AB4AF;
33
41
  @lightgreen-4: #8CE0DD;
34
42
  @lightgreen-1: #F1FBFB;
35
43
 
36
44
  @tnt-pink-7: #D03E93;
45
+ @tnt-pink-5: #E844B7;
37
46
  @tnt-pink-4: #FAA7E0;
38
47
  @tnt-pink-1: #FDF2FA;
39
48
 
40
49
  @tnt-orange-7:#DF5F28;
50
+ @tnt-orange-5:#F47345;
41
51
  @tnt-orange-4: #FEB173;
42
52
  @tnt-orange-1: #FFF6ED;
43
53
 
package/lib/tag/tag.less CHANGED
@@ -112,6 +112,29 @@
112
112
  }
113
113
  }
114
114
 
115
+ &.@{tag-prefix-cls}-blue {
116
+ color: @blue-6;
117
+ background: @blue-1;
118
+ border-color: @blue-3;
119
+ >.@{iconfont-css-prefix}-close {
120
+ color: @blue-5;
121
+ }
122
+ &.@{tag-prefix-cls}-no-border{
123
+ border-color:transparent;
124
+ }
125
+ }
126
+ &.@{tag-prefix-cls}-blue-inverse {
127
+ color: @text-color-inverse;
128
+ background: @blue-6;
129
+ border-color: @blue-6;
130
+ >.@{iconfont-css-prefix}-close {
131
+ color: @text-color-inverse;
132
+ }
133
+ &.@{tag-prefix-cls}-no-border{
134
+ border-color:transparent;
135
+ }
136
+ }
137
+
115
138
  // mixin to iterate over colors and create CSS class for each one
116
139
  .make-color-classes(@i: length(@preset-colors-custom)) when (@i > 0) {
117
140
  .make-color-classes(@i - 1);
@@ -119,13 +142,13 @@
119
142
  @lightColor: '@{color}-1';
120
143
  @lightBorderColor: '@{color}-4';
121
144
  @darkColor: '@{color}-7';
145
+ @closeColor:'@{color}-5';
122
146
  &.@{tag-prefix-cls}-@{color} {
123
147
  color: @@darkColor;
124
148
  background: @@lightColor;
125
149
  border-color: @@lightBorderColor;
126
150
  >.@{iconfont-css-prefix}-close {
127
- color: @@darkColor;//fade(@@darkColor,80%);
128
- opacity: .8;
151
+ color: @@closeColor;
129
152
  }
130
153
  &.@{tag-prefix-cls}-no-border{
131
154
  border-color:transparent;
@@ -135,7 +158,9 @@
135
158
  color: @text-color-inverse;
136
159
  background: @@darkColor;
137
160
  border-color: @@darkColor;
138
-
161
+ >.@{iconfont-css-prefix}-close {
162
+ color: @text-color-inverse;
163
+ }
139
164
  &.@{tag-prefix-cls}-no-border{
140
165
  border-color:transparent;
141
166
  }
@@ -154,11 +179,21 @@
154
179
  cursor: pointer;
155
180
  &-border{
156
181
  border-color: @border-color-base;
182
+ // 非disabled
183
+ &:not(.@{tag-prefix-cls}-checkable-disabled):hover {
184
+ border-color: @primary-3;
185
+ }
186
+ }
187
+
188
+ &:not(.@{tag-prefix-cls}-checkable-disabled):hover {
189
+ color: @primary-6;
190
+ background-color: @primary-1;
191
+ transition: all 0.3s @ease-in-out-circ;
157
192
  }
158
193
 
159
194
  &:active,
160
195
  &-checked {
161
- color: @primary-7;
196
+ color: @primary-6;
162
197
  background-color: @primary-1;
163
198
  &.@{tag-prefix-cls}-checkable-border{
164
199
  border-color: @primary-3;
@@ -167,7 +202,7 @@
167
202
 
168
203
  &-checked {
169
204
  &.@{tag-prefix-cls}-checkable-disabled:hover {
170
- color: @primary-color;
205
+ color: @primary-6;
171
206
  }
172
207
  }
173
208
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tntd",
3
- "version": "2.8.0-beta.10",
3
+ "version": "2.8.0-beta.11",
4
4
  "license": "MIT",
5
5
  "scripts": {
6
6
  "start": "heft start --storybook",