Skip to content

Commit 1c61f4d

Browse files
committed
fixed: uni-tag attrbuite types value royal` invaild
1 parent 9dfb412 commit 1c61f4d

File tree

2 files changed

+33
-6
lines changed

2 files changed

+33
-6
lines changed

uni.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ $uni-color-primary: #007aff;
1919
$uni-color-success: #4cd964;
2020
$uni-color-warning: #f0ad4e;
2121
$uni-color-error: #dd524d;
22+
$uni-color-royal: #4335d6;
2223

2324
/* 文字基本颜色 */
2425
$uni-text-color:#333;//基本色

uni_modules/uni-tag/components/uni-tag/uni-tag.vue

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@
9090
9191
.uni-tag {
9292
/* #ifndef APP-NVUE */
93-
display: flex;
94-
/* #endif */
93+
// display: flex;
94+
/* #endif */
9595
padding: $tag-pd;
9696
height: 30px;
9797
line-height: 30px;
98-
justify-content: center;
98+
// justify-content: center;
9999
color: $uni-text-color;
100100
border-radius: $uni-border-radius-base;
101101
background-color: $uni-bg-color-grey;
@@ -123,7 +123,7 @@
123123
/* #ifdef H5 */
124124
cursor: not-allowed;
125125
/* #endif */
126-
126+
127127
}
128128
129129
.uni-tag--small {
@@ -136,6 +136,11 @@
136136
.uni-tag--default {
137137
color: $uni-text-color;
138138
font-size: $uni-font-size-base;
139+
}
140+
141+
.uni-tag--royal {
142+
color: $uni-text-color;
143+
font-size: $uni-font-size-base;
139144
}
140145
141146
.uni-tag-text--small {
@@ -149,7 +154,7 @@
149154
150155
.uni-tag-text--primary {
151156
color: $uni-color-primary !important;
152-
}
157+
}
153158
154159
.uni-tag-text--success {
155160
color: $uni-color-success !important;
@@ -161,7 +166,12 @@
161166
162167
.uni-tag-text--error {
163168
color: $uni-color-error !important;
164-
}
169+
}
170+
171+
.uni-tag-text--royal {
172+
color: $uni-color-royal !important;
173+
}
174+
165175
166176
.uni-tag--primary {
167177
color: $uni-text-color-inverse;
@@ -225,6 +235,22 @@
225235
border-width: 1rpx;
226236
border-style: solid;
227237
border-color: $uni-color-error;
238+
}
239+
240+
.uni-tag--royal {
241+
color: $uni-text-color-inverse;
242+
background-color: $uni-color-royal;
243+
border-width: 1rpx;
244+
border-style: solid;
245+
border-color: $uni-color-royal;
246+
}
247+
248+
.royal-uni-tag--inverted {
249+
color: $uni-color-royal;
250+
background-color: $uni-bg-color;
251+
border-width: 1rpx;
252+
border-style: solid;
253+
border-color: $uni-color-royal;
228254
}
229255
230256
.uni-tag--inverted {

0 commit comments

Comments
 (0)