vueless 0.0.670 → 0.0.672
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.
package/package.json
CHANGED
|
@@ -102,7 +102,11 @@ const { listAttrs, colorButtonAttrs, circleAttrs, colorDividerAttrs } =
|
|
|
102
102
|
<div :class="brandColorClass" v-bind="circleAttrs" />
|
|
103
103
|
</UButton>
|
|
104
104
|
|
|
105
|
-
<UDivider
|
|
105
|
+
<UDivider
|
|
106
|
+
v-if="Object.keys(brandColors).length && Object.keys(grayColors).length"
|
|
107
|
+
size="xs"
|
|
108
|
+
v-bind="colorDividerAttrs"
|
|
109
|
+
/>
|
|
106
110
|
|
|
107
111
|
<UButton
|
|
108
112
|
v-for="(grayColorClass, color) in grayColors"
|
|
@@ -12,7 +12,16 @@ export default /*tw*/ {
|
|
|
12
12
|
],
|
|
13
13
|
},
|
|
14
14
|
},
|
|
15
|
-
circle:
|
|
15
|
+
circle: {
|
|
16
|
+
base: "rounded-full",
|
|
17
|
+
variants: {
|
|
18
|
+
size: {
|
|
19
|
+
sm: "size-4",
|
|
20
|
+
md: "size-5",
|
|
21
|
+
lg: "size-6",
|
|
22
|
+
},
|
|
23
|
+
},
|
|
24
|
+
},
|
|
16
25
|
colorDivider: "{UDivider}",
|
|
17
26
|
defaults: {
|
|
18
27
|
size: "md",
|
package/utils/node/loaderIcon.js
CHANGED
|
@@ -178,7 +178,8 @@ async function findAndCopyIcons(files) {
|
|
|
178
178
|
|
|
179
179
|
/* Vueless components props */
|
|
180
180
|
const iconPropsPattern = `\\b\\w*(name|icon)\\w*\\s*=\\s*(['"])(.*?)\\2`;
|
|
181
|
-
const uComponentIconNamePattern =
|
|
181
|
+
const uComponentIconNamePattern =
|
|
182
|
+
/<U\w+\b[^>]*?\b\w*(name|icon)\w*\s*[:=]\s*(['"])(.*?)\2[^>]*?>/;
|
|
182
183
|
const uComponentIconNameArray = fileContents.match(new RegExp(uComponentIconNamePattern, "g"));
|
|
183
184
|
|
|
184
185
|
if (!uComponentIconNameArray) return;
|
package/utils/ui.ts
CHANGED
|
@@ -129,13 +129,10 @@ export function getDefaults<Props, Config>(defaultConfig: Config, name: Componen
|
|
|
129
129
|
* Otherwise return given color.
|
|
130
130
|
*/
|
|
131
131
|
export function getColor(color: string) {
|
|
132
|
-
const isBrandColorGrayscale = vuelessConfig.brand === GRAYSCALE_COLOR;
|
|
133
|
-
const isSelectedColorGrayscale = getSelectedBrandColor() === GRAYSCALE_COLOR;
|
|
134
132
|
const isComponentColorBrand = color === BRAND_COLOR;
|
|
133
|
+
const isSelectedColorGrayscale = getSelectedBrandColor() === GRAYSCALE_COLOR;
|
|
135
134
|
|
|
136
|
-
return
|
|
137
|
-
? GRAYSCALE_COLOR
|
|
138
|
-
: color;
|
|
135
|
+
return isComponentColorBrand && isSelectedColorGrayscale ? GRAYSCALE_COLOR : color;
|
|
139
136
|
}
|
|
140
137
|
|
|
141
138
|
/**
|