@unocss/preset-mini 0.19.0 → 0.20.4

package/dist/chunks/default.cjs

@@ -115,12 +115,12 @@ const borderRadius = {
   "full": "9999px"
 };
 const boxShadow = {
-  "DEFAULT": "0 1px 3px 0 rgba(var(--un-shadow-color), 0.1), 0 1px 2px 0 rgba(var(--un-shadow-color), 0.06)",
-  "sm": "0 1px 2px 0 rgba(var(--un-shadow-color), 0.05)",
-  "md": "0 4px 6px -1px rgba(var(--un-shadow-color), 0.1), 0 2px 4px -1px rgba(var(--un-shadow-color), 0.06)",
-  "lg": "0 10px 15px -3px rgba(var(--un-shadow-color), 0.1), 0 4px 6px -2px rgba(var(--un-shadow-color), 0.05)",
-  "xl": "0 20px 25px -5px rgba(var(--un-shadow-color), 0.1), 0 10px 10px -5px rgba(var(--un-shadow-color), 0.04)",
-  "2xl": "25px 50px -12px rgba(var(--un-shadow-color), 0.25)",
+  "DEFAULT": "var(--un-shadow-inset) 0 1px 3px 0 rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 1px 2px 0 rgba(var(--un-shadow-color), 0.06)",
+  "sm": "var(--un-shadow-inset) 0 1px 2px 0 rgba(var(--un-shadow-color), 0.05)",
+  "md": "var(--un-shadow-inset) 0 4px 6px -1px rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 2px 4px -1px rgba(var(--un-shadow-color), 0.06)",
+  "lg": "var(--un-shadow-inset) 0 10px 15px -3px rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 4px 6px -2px rgba(var(--un-shadow-color), 0.05)",
+  "xl": "var(--un-shadow-inset) 0 20px 25px -5px rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 10px 10px -5px rgba(var(--un-shadow-color), 0.04)",
+  "2xl": "var(--un-shadow-inset) 0 25px 50px -12px rgba(var(--un-shadow-color), 0.25)",
   "inner": "inset 0 2px 4px 0 rgba(var(--un-shadow-color), 0.06)",
   "none": "none"
 };

package/dist/chunks/default.mjs

@@ -113,12 +113,12 @@ const borderRadius = {
   "full": "9999px"
 };
 const boxShadow = {
-  "DEFAULT": "0 1px 3px 0 rgba(var(--un-shadow-color), 0.1), 0 1px 2px 0 rgba(var(--un-shadow-color), 0.06)",
-  "sm": "0 1px 2px 0 rgba(var(--un-shadow-color), 0.05)",
-  "md": "0 4px 6px -1px rgba(var(--un-shadow-color), 0.1), 0 2px 4px -1px rgba(var(--un-shadow-color), 0.06)",
-  "lg": "0 10px 15px -3px rgba(var(--un-shadow-color), 0.1), 0 4px 6px -2px rgba(var(--un-shadow-color), 0.05)",
-  "xl": "0 20px 25px -5px rgba(var(--un-shadow-color), 0.1), 0 10px 10px -5px rgba(var(--un-shadow-color), 0.04)",
-  "2xl": "25px 50px -12px rgba(var(--un-shadow-color), 0.25)",
+  "DEFAULT": "var(--un-shadow-inset) 0 1px 3px 0 rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 1px 2px 0 rgba(var(--un-shadow-color), 0.06)",
+  "sm": "var(--un-shadow-inset) 0 1px 2px 0 rgba(var(--un-shadow-color), 0.05)",
+  "md": "var(--un-shadow-inset) 0 4px 6px -1px rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 2px 4px -1px rgba(var(--un-shadow-color), 0.06)",
+  "lg": "var(--un-shadow-inset) 0 10px 15px -3px rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 4px 6px -2px rgba(var(--un-shadow-color), 0.05)",
+  "xl": "var(--un-shadow-inset) 0 20px 25px -5px rgba(var(--un-shadow-color), 0.1), var(--un-shadow-inset) 0 10px 10px -5px rgba(var(--un-shadow-color), 0.04)",
+  "2xl": "var(--un-shadow-inset) 0 25px 50px -12px rgba(var(--un-shadow-color), 0.25)",
   "inner": "inset 0 2px 4px 0 rgba(var(--un-shadow-color), 0.06)",
   "none": "none"
 };

package/dist/chunks/default2.cjs

@@ -38,63 +38,61 @@ const willChange = [
 ];
 
 const borders = [
-  [/^border$/, handlerBorder],
-  [/^(?:border|b)()-(.+)$/, handlerBorder],
-  [/^(?:border|b)-([^-]+)(?:-(.+))?$/, handlerBorder],
-  [/^(?:border|b)()-size-(.+)$/, handlerBorderSize],
-  [/^(?:border|b)-([^-]+)-size-(.+)$/, handlerBorderSize],
-  [/^(?:border|b)()-(.+)$/, handlerBorderColor],
-  [/^(?:border|b)-([^-]+)(?:-(.+))?$/, handlerBorderColor],
-  [/^(?:border|b)-op(?:acity)?-?(.+)$/, ([, opacity], { options: { variablePrefix: p } }) => ({ [`--${p}border-opacity`]: utilities.handler.bracket.percent(opacity) })],
-  [/^(?:border|b)-([^-]+)-op(?:acity)?-?(.+)$/, ([, a, opacity], { options: { variablePrefix: p } }) => {
-    const v = utilities.handler.bracket.percent(opacity);
-    const d = utilities.directionMap[a];
-    if (v !== void 0 && d)
-      return d.map((i) => [`--${p}border${i}-opacity`, v]);
-  }],
-  [/^(?:border-)?(?:rounded|rd)$/, handlerRounded],
-  [/^(?:border-)?(?:rounded|rd)(?:-(.+))?$/, handlerRounded],
-  [/^(?:border-)?(?:rounded|rd)(?:-([^-]+))?(?:-(.+))?$/, handlerRounded],
+  [/^(?:border|b)()(?:-(.+))?$/, handlerBorder],
+  [/^(?:border|b)-([xy])(?:-(.+))?$/, handlerBorder],
+  [/^(?:border|b)-([rltbse])(?:-(.+))?$/, handlerBorder],
+  [/^(?:border|b)-()size-(.+)$/, handlerBorderSize],
+  [/^(?:border|b)-([xy])-size-(.+)$/, handlerBorderSize],
+  [/^(?:border|b)-([rltbse])-size-(.+)$/, handlerBorderSize],
+  [/^(?:border|b)-()(?:color-)?(.+)$/, handlerBorderColor],
+  [/^(?:border|b)-([xy])-(?:color-)?(.+)$/, handlerBorderColor],
+  [/^(?:border|b)-([rltbse])-(?:color-)?(.+)$/, handlerBorderColor],
+  [/^(?:border|b)-()op(?:acity)?-?(.+)$/, handlerBorderOpacity],
+  [/^(?:border|b)-([xy])-op(?:acity)?-?(.+)$/, handlerBorderOpacity],
+  [/^(?:border|b)-([rltbse])-op(?:acity)?-?(.+)$/, handlerBorderOpacity],
+  [/^(?:border-)?(?:rounded|rd)()(?:-(.+))?$/, handlerRounded],
+  [/^(?:border-)?(?:rounded|rd)-([xy])(?:-(.+))?$/, handlerRounded],
+  [/^(?:border-)?(?:rounded|rd)-([rltb])(?:-(.+))?$/, handlerRounded],
+  [/^(?:border-)?(?:rounded|rd)-([rltb]{2})(?:-(.+))?$/, handlerRounded],
   ["border-solid", { "border-style": "solid" }],
   ["border-dashed", { "border-style": "dashed" }],
   ["border-dotted", { "border-style": "dotted" }],
   ["border-double", { "border-style": "double" }],
+  ["border-hidden", { "border-style": "hidden" }],
   ["border-none", { "border-style": "none" }]
 ];
 const borderHasColor = (color, { theme }) => {
   return color !== void 0 && !!utilities.parseColor(color, theme)?.color;
 };
-const borderColorResolver = (direction) => ([, body], { theme, options: { variablePrefix: p } }) => {
+const borderColorResolver = (direction) => ([, body], { theme }) => {
   const data = utilities.parseColor(body, theme);
   if (!data)
     return;
-  const { opacity, color, rgba } = data;
+  const { alpha, opacity, color, rgba } = data;
   if (!color)
     return;
-  const a = opacity ? opacity[0] === "[" ? utilities.handler.bracket.percent(opacity) : parseFloat(opacity) / 100 : rgba?.[3];
   if (rgba) {
-    if (a != null && !Number.isNaN(a)) {
-      rgba[3] = typeof a === "string" && !a.includes("%") ? parseFloat(a) : a;
+    if (alpha != null) {
       return {
         [`border${direction}-color`]: `rgba(${rgba.join(",")})`
       };
     } else {
       if (direction === "") {
         return {
-          [`--${p}border-opacity`]: 1,
-          [`border${direction}-color`]: `rgba(${rgba.slice(0, 3).join(",")},var(--${p}border${direction}-opacity))`
+          "--un-border-opacity": (opacity && utilities.handler.cssvar(opacity)) ?? 1,
+          [`border${direction}-color`]: `rgba(${rgba.join(",")},var(--un-border${direction}-opacity))`
         };
       } else {
         return {
-          [`--${p}border-opacity`]: 1,
-          [`--${p}border${direction}-opacity`]: `var(--${p}border-opacity)`,
-          [`border${direction}-color`]: `rgba(${rgba.slice(0, 3).join(",")},var(--${p}border${direction}-opacity))`
+          "--un-border-opacity": (opacity && utilities.handler.cssvar(opacity)) ?? 1,
+          [`--un-border${direction}-opacity`]: "var(--un-border-opacity)",
+          [`border${direction}-color`]: `rgba(${rgba.join(",")},var(--un-border${direction}-opacity))`
         };
       }
     }
   } else {
     return {
-      [`border${direction}-color`]: color.replace("%alpha", `${a || 1}`)
+      [`border${direction}-color`]: color.replace("%alpha", `${alpha || 1}`)
     };
   }
 };
@@ -107,22 +105,25 @@ function handlerBorder(m) {
     ];
   }
 }
-function handlerBorderSize([, a, b]) {
-  const [d, s = "1"] = utilities.directionMap[a] ? [a, b] : ["", a];
-  const v = utilities.handler.bracket.px(s);
-  if (v !== void 0)
-    return utilities.directionMap[d].map((i) => [`border${i}-width`, v]);
+function handlerBorderSize([, a = "", b = "1"]) {
+  const v = utilities.handler.bracket.px(b);
+  if (a in utilities.directionMap && v != null)
+    return utilities.directionMap[a].map((i) => [`border${i}-width`, v]);
 }
-function handlerBorderColor([, a, c], ctx) {
-  if (borderHasColor(c, ctx)) {
-    return Object.assign({}, ...utilities.directionMap[utilities.directionMap[a] ? a : ""].map((i) => borderColorResolver(i)(["", c], ctx)));
+function handlerBorderColor([, a = "", c], ctx) {
+  if (a in utilities.directionMap && borderHasColor(c, ctx)) {
+    return Object.assign({}, ...utilities.directionMap[a].map((i) => borderColorResolver(i)(["", c], ctx)));
   }
 }
-function handlerRounded([, a, b], { theme }) {
-  const [d, s = "DEFAULT"] = utilities.cornerMap[a] ? [a, b] : ["", a];
+function handlerBorderOpacity([, a = "", opacity]) {
+  const v = utilities.handler.bracket.percent(opacity);
+  if (a in utilities.directionMap && v != null)
+    return utilities.directionMap[a].map((i) => [`--un-border${i}-opacity`, v]);
+}
+function handlerRounded([, a = "", s = "DEFAULT"], { theme }) {
   const v = theme.borderRadius?.[s] || utilities.handler.auto.rem.fraction.bracket.cssvar(s);
-  if (v !== void 0)
-    return utilities.cornerMap[d].map((i) => [`border${i}-radius`, v]);
+  if (a in utilities.cornerMap && v != null)
+    return utilities.cornerMap[a].map((i) => [`border${i}-radius`, v]);
 }
 
 const opacity = [
@@ -137,12 +138,19 @@ const bgColors = [
   [/^bg-op(?:acity)?-?(.+)$/, ([, opacity2]) => ({ "--un-bg-opacity": utilities.handler.bracket.percent(opacity2) })]
 ];
 
+const transitionPropertyGroup = {
+  all: "all",
+  colors: ["color", "background-color", "border-color", "text-decoration-color", "fill", "stroke"].join(","),
+  opacity: "opacity",
+  shadow: "box-shadow",
+  transform: "transform"
+};
 const transitionProperty = (prop) => {
-  return utilities.handler.properties(prop) || (prop === "all" ? prop : void 0);
+  return utilities.handler.properties(prop) ?? transitionPropertyGroup[prop];
 };
 const transitions = [
-  [/^transition(?:-([a-z-]+(?:,[a-z-]+)*))?(?:-(\d+))?$/, ([, prop = "all", duration = "150"]) => {
-    const p = transitionProperty(prop);
+  [/^transition(?:-([a-z-]+(?:,[a-z-]+)*))?(?:-(\d+))?$/, ([, prop, duration = "150"]) => {
+    const p = prop != null ? transitionProperty(prop) : [transitionPropertyGroup.colors, "opacity", "box-shadow", "transform", "filter", "backdrop-filter"].join(",");
     if (p) {
       return {
         "transition-property": p,
@@ -151,14 +159,14 @@ const transitions = [
       };
     }
   }],
-  [/^duration-(\d+)$/, ([, duration = "150"]) => ({ "transition-duration": `${duration}ms` })],
+  [/^(?:transition-)?delay-(.+)(?:s|ms)?$/, ([, d]) => ({ "transition-delay": utilities.handler.bracket.time(d) })],
+  [/^(?:transition-)?duration-(.+)(?:s|ms)?$/, ([, d]) => ({ "transition-duration": utilities.handler.bracket.time(d) })],
+  [/^ease-(.+)$/, ([, d]) => ({ "transition-timing-function": utilities.handler.bracket(d) })],
   ["ease", { "transition-timing-function": "cubic-bezier(0.4, 0, 0.2, 1)" }],
   ["ease-linear", { "transition-timing-function": "linear" }],
   ["ease-in", { "transition-timing-function": "cubic-bezier(0.4, 0, 1, 1)" }],
   ["ease-out", { "transition-timing-function": "cubic-bezier(0, 0, 0.2, 1)" }],
   ["ease-in-out", { "transition-timing-function": "cubic-bezier(0.4, 0, 0.2, 1)" }],
-  [/^transition-delay-(\d+)$/, ([, v]) => ({ "transition-delay": `${v}ms` })],
-  [/^transition-duration-(\d+)$/, ([, v]) => ({ "transition-duration": `${v}ms` })],
   [/^(?:transition-)?property-(.+)$/, ([, v]) => ({ "transition-property": utilities.handler.global(v) || transitionProperty(v) })],
   ["transition-property-none", { "transition-property": "none" }],
   ["property-none", { "transition-property": "none" }],
@@ -178,6 +186,7 @@ const flex = [
   ["flex-shrink-0", { "flex-shrink": 0 }],
   ["flex-grow", { "flex-grow": 1 }],
   ["flex-grow-0", { "flex-grow": 0 }],
+  [/^(?:flex-)?basis-(.+)$/, ([, d]) => ({ "flex-basis": utilities.handler.bracket.fraction.auto.rem(d) })],
   ["flex-row", { "flex-direction": "row" }],
   ["flex-row-reverse", { "flex-direction": "row-reverse" }],
   ["flex-col", { "flex-direction": "column" }],
@@ -199,14 +208,7 @@ const weightMap = {
   black: "900"
 };
 const fonts = [
-  [/^font-(\w+)$/, ([, d], { theme }) => {
-    const font = theme.fontFamily?.[d];
-    if (font) {
-      return {
-        "font-family": font
-      };
-    }
-  }],
+  [/^font-(\w+)$/, ([, d], { theme }) => ({ "font-family": theme.fontFamily?.[d] })],
   [/^text-(.+)$/, ([, s = "base"], { theme }) => {
     const size = utilities.handler.bracket.auto.rem(s);
     if (size)
@@ -220,37 +222,16 @@ const fonts = [
       };
     }
   }],
-  [/^text-size-(.+)$/, ([, s]) => {
-    const raw = utilities.handler.bracket.auto.rem(s);
-    if (raw)
-      return { "font-size": raw };
-  }],
-  [/^(?:font|fw)-?([^-]+)$/, ([, s]) => {
-    const v = weightMap[s] || utilities.handler.number(s);
-    if (v)
-      return { "font-weight": v };
-  }],
-  [/^(?:leading|lh)-([^-]+)$/, ([, s], { theme }) => {
-    const v = theme.lineHeight?.[s] || utilities.handler.bracket.auto.rem(s);
-    if (v !== null)
-      return { "line-height": v };
-  }],
-  [/^tracking-([^-]+)$/, ([, s], { theme }) => {
-    const v = theme.letterSpacing?.[s] || utilities.handler.bracket.auto.rem(s);
-    if (v !== null)
-      return { "letter-spacing": v };
-  }],
-  [/^word-spacing-([^-]+)$/, ([, s], { theme }) => {
-    const v = theme.wordSpacing?.[s] || utilities.handler.bracket.auto.rem(s);
-    if (v !== null)
-      return { "word-spacing": v };
-  }]
+  [/^text-size-(.+)$/, ([, s]) => ({ "font-size": utilities.handler.bracket.auto.rem(s) })],
+  [/^(?:font|fw)-?([^-]+)$/, ([, s]) => ({ "font-weight": weightMap[s] || utilities.handler.number(s) })],
+  [/^(?:leading|lh)-([^-]+)$/, ([, s], { theme }) => ({ "line-height": theme.lineHeight?.[s] || utilities.handler.bracket.auto.rem(s) })],
+  [/^tracking-([^-]+)$/, ([, s], { theme }) => ({ "letter-spacing": theme.letterSpacing?.[s] || utilities.handler.bracket.auto.rem(s) })],
+  [/^word-spacing-([^-]+)$/, ([, s], { theme }) => ({ "word-spacing": theme.wordSpacing?.[s] || utilities.handler.bracket.auto.rem(s) })]
 ];
 const tabSizes = [
   [/^tab-?([^-]*)$/, ([, s]) => {
-    s = s || "4";
-    const v = utilities.handler.bracket.global.number(s);
-    if (v !== null) {
+    const v = utilities.handler.bracket.global.number(s || "4");
+    if (v != null) {
       return {
         "-moz-tab-size": v,
         "-o-tab-size": v,
@@ -260,44 +241,34 @@ const tabSizes = [
   }]
 ];
 const textIndents = [
-  [/^indent(?:-(.+))?$/, ([, s], { theme }) => {
-    const v = theme.textIndent?.[s || "DEFAULT"] || utilities.handler.bracket.cssvar.fraction.auto.rem(s);
-    if (v != null)
-      return { "text-indent": v };
-  }]
+  [/^indent(?:-(.+))?$/, ([, s], { theme }) => ({ "text-indent": theme.textIndent?.[s || "DEFAULT"] || utilities.handler.bracket.cssvar.fraction.auto.rem(s) })]
 ];
 const textStrokes = [
-  [/^text-stroke(?:-(.+))?$/, ([, s], { theme }) => {
-    const v = theme.textStrokeWidth?.[s || "DEFAULT"] || utilities.handler.bracket.cssvar.px(s);
-    if (v != null)
-      return { "-webkit-text-stroke-width": v };
-  }],
+  [/^text-stroke(?:-(.+))?$/, ([, s], { theme }) => ({ "-webkit-text-stroke-width": theme.textStrokeWidth?.[s || "DEFAULT"] || utilities.handler.bracket.cssvar.px(s) })],
   [/^text-stroke-(.+)$/, utilities.colorResolver("-webkit-text-stroke-color", "text-stroke")],
   [/^text-stroke-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-text-stroke-opacity": utilities.handler.bracket.percent(opacity) })]
 ];
 const textShadows = [
-  [/^text-shadow(?:-(.+))?$/, ([, s], { theme }) => {
-    const v = theme.textShadow?.[s || "DEFAULT"] || utilities.handler.bracket.cssvar(s);
-    if (v != null)
-      return { "text-shadow": v };
-  }]
+  [/^text-shadow(?:-(.+))?$/, ([, s], { theme }) => ({ "text-shadow": theme.textShadow?.[s || "DEFAULT"] || utilities.handler.bracket.cssvar(s) })]
 ];
 
+const directions = {
+  "": "",
+  "x": "column-",
+  "y": "row-"
+};
+const handleGap = ([, d = "", s]) => {
+  const v = utilities.handler.bracket.auto.rem(s);
+  if (v != null) {
+    return {
+      [`grid-${directions[d]}gap`]: v,
+      [`${directions[d]}gap`]: v
+    };
+  }
+};
 const gaps = [
-  [/^(?:flex-|grid-)?gap-(x-|y-)?([^-]+)$/, ([, d = "", s]) => {
-    const v = utilities.handler.bracket.auto.rem(s);
-    if (v != null) {
-      const direction = {
-        "": "",
-        "x-": "column-",
-        "y-": "row-"
-      }[d];
-      return {
-        [`grid-${direction}gap`]: v,
-        [`${direction}gap`]: v
-      };
-    }
-  }]
+  [/^(?:flex-|grid-)?gap-()([^-]+)$/, handleGap],
+  [/^(?:flex-|grid-)?gap-([xy])-([^-]+)$/, handleGap]
 ];
 
 const calSize = (s, theme) => core.toArray(theme.fontSize?.[s] || utilities.handler.bracket.auto.rem(s))[0];
@@ -355,7 +326,6 @@ const overflows = [
   [/^(?:overflow|of)-([xy])-(.+)$/, ([, d, v]) => overflowValues.includes(v) ? { [`overflow-${d}`]: v } : void 0]
 ];
 
-const basicSet = ["auto", "start", "end", "center", "stretch"];
 const positions = [
   [/^(?:position-|pos-)?(relative|absolute|fixed|sticky)$/, ([, v]) => ({ position: v })],
   [/^(?:position-|pos-)?(static)$/, ([, v]) => ({ position: v })]
@@ -367,8 +337,15 @@ const justifies = [
   ["justify-between", { "justify-content": "space-between" }],
   ["justify-around", { "justify-content": "space-around" }],
   ["justify-evenly", { "justify-content": "space-evenly" }],
-  ...basicSet.map((i) => [`justify-items-${i}`, { "justify-items": i }]),
-  ...basicSet.map((i) => [`justify-self-${i}`, { "justify-self": i }])
+  ["justify-items-start", { "justify-items": "start" }],
+  ["justify-items-end", { "justify-items": "end" }],
+  ["justify-items-center", { "justify-items": "center" }],
+  ["justify-items-stretch", { "justify-items": "stretch" }],
+  ["justify-self-auto", { "justify-self": "auto" }],
+  ["justify-self-start", { "justify-self": "start" }],
+  ["justify-self-end", { "justify-self": "end" }],
+  ["justify-self-center", { "justify-self": "center" }],
+  ["justify-self-stretch", { "justify-self": "stretch" }]
 ];
 const orders = [
   [/^order-(.+)$/, ([, v]) => ({ order: utilities.handler.bracket.number(v) })],
@@ -377,9 +354,9 @@ const orders = [
   ["order-none", { order: "0" }]
 ];
 const alignments = [
+  ["content-center", { "align-content": "center" }],
   ["content-start", { "align-content": "flex-start" }],
   ["content-end", { "align-content": "flex-end" }],
-  ["content-center", { "align-content": "center" }],
   ["content-between", { "align-content": "space-between" }],
   ["content-around", { "align-content": "space-around" }],
   ["content-evenly", { "align-content": "space-evenly" }],
@@ -392,29 +369,39 @@ const alignments = [
   ["self-start", { "align-self": "flex-start" }],
   ["self-end", { "align-self": "flex-end" }],
   ["self-center", { "align-self": "center" }],
-  ["self-stretch", { "align-self": "stretch" }]
+  ["self-stretch", { "align-self": "stretch" }],
+  ["self-baseline", { "align-self": "baseline" }]
 ];
 const placements = [
+  ["place-content-center", { "place-content": "center" }],
   ["place-content-start", { "place-content": "start" }],
   ["place-content-end", { "place-content": "end" }],
-  ["place-content-center", { "place-content": "center" }],
   ["place-content-between", { "place-content": "space-between" }],
   ["place-content-around", { "place-content": "space-around" }],
   ["place-content-evenly", { "place-content": "space-evenly" }],
   ["place-content-stretch", { "place-content": "stretch" }],
-  ...basicSet.map((i) => [`place-items-${i}`, { "place-items": i }]),
-  ...basicSet.map((i) => [`place-self-${i}`, { "place-self": i }])
+  ["place-items-start", { "place-items": "start" }],
+  ["place-items-end", { "place-items": "end" }],
+  ["place-items-center", { "place-items": "center" }],
+  ["place-items-stretch", { "place-items": "stretch" }],
+  ["place-self-auto", { "place-self": "auto" }],
+  ["place-self-start", { "place-self": "start" }],
+  ["place-self-end", { "place-self": "end" }],
+  ["place-self-center", { "place-self": "center" }],
+  ["place-self-stretch", { "place-self": "stretch" }]
 ];
 function handleInsetValue(v) {
   return { auto: "auto", full: "100%" }[v] ?? utilities.handler.bracket.fraction.cssvar.auto.rem(v);
 }
+function handleInsetValues([, d, v]) {
+  const r = handleInsetValue(v);
+  if (r != null && d in utilities.directionMap)
+    return utilities.directionMap[d].map((i) => [i.slice(1), r]);
+}
 const insets = [
-  [/^(?:position-|pos-)?(top|left|right|bottom|inset)-(.+)$/, ([, d, v]) => ({ [d]: handleInsetValue(v) })],
-  [/^(?:position-|pos-)?inset-([xy])-(.+)$/, ([, d, v]) => {
-    const r = handleInsetValue(v);
-    if (r != null && d in utilities.directionMap)
-      return utilities.directionMap[d].map((i) => [i.slice(1), r]);
-  }]
+  [/^(?:position-|pos-)?inset-()(.+)$/, handleInsetValues],
+  [/^(?:position-|pos-)?inset-([xy])-(.+)$/, handleInsetValues],
+  [/^(?:position-|pos-)?(top|left|right|bottom)-(.+)$/, ([, d, v]) => ({ [d]: handleInsetValue(v) })]
 ];
 const floats = [
   ["float-left", { float: "left" }],
@@ -434,7 +421,6 @@ const boxSizing = [
   ["box-content", { "box-sizing": "content-box" }]
 ];
 
-const varEmptyFn = core.cacheFunction((prefix) => `var(--${prefix}empty,/*!*/ /*!*/)`);
 const varEmpty = "var(--un-empty,/*!*/ /*!*/)";
 const displays = [
   ["inline", { display: "inline" }],
@@ -510,31 +496,30 @@ const fontSmoothings = [
 ];
 
 const rings = [
-  [/^ring-?(.*)$/, ([, d], { options: { variablePrefix: p } }) => {
+  [/^ring-?(.*)$/, ([, d]) => {
     const value = utilities.handler.px(d || "1");
     if (value) {
       return {
-        [`--${p}ring-inset`]: varEmptyFn(p),
-        [`--${p}ring-offset-width`]: "0px",
-        [`--${p}ring-offset-color`]: "#fff",
-        [`--${p}ring-color`]: "rgba(59, 130, 246, .5)",
-        [`--${p}ring-offset-shadow`]: `var(--${p}ring-inset) 0 0 0 var(--${p}ring-offset-width) var(--${p}ring-offset-color)`,
-        [`--${p}ring-shadow`]: `var(--${p}ring-inset) 0 0 0 calc(${value} + var(--${p}ring-offset-width)) var(--${p}ring-color)`,
-        "-webkit-box-shadow": `var(--${p}ring-offset-shadow), var(--${p}ring-shadow), var(--${p}shadow, 0 0 #0000)`,
-        "box-shadow": `var(--${p}ring-offset-shadow), var(--${p}ring-shadow), var(--${p}shadow, 0 0 #0000)`
+        "--un-ring-inset": varEmpty,
+        "--un-ring-offset-width": "0px",
+        "--un-ring-offset-color": "#fff",
+        "--un-ring-color": "rgba(59, 130, 246, .5)",
+        "--un-ring-offset-shadow": "var(--un-ring-inset) 0 0 0 var(--un-ring-offset-width) var(--un-ring-offset-color)",
+        "--un-ring-shadow": `var(--un-ring-inset) 0 0 0 calc(${value} + var(--un-ring-offset-width)) var(--un-ring-color)`,
+        "box-shadow": "var(--un-ring-offset-shadow), var(--un-ring-shadow), var(--un-shadow, 0 0 #0000)"
       };
     }
   }],
-  [/^ring-offset$/, (_, { options: { variablePrefix: p } }) => ({ [`--${p}ring-offset-width`]: "1px" })],
-  [/^ring-offset-(.+)$/, ([, d], { options: { variablePrefix: p } }) => ({ [`--${p}ring-offset-width`]: utilities.handler.px(d || "1") })],
-  [/^ring-(.+)$/, (m, ctx) => utilities.colorResolver(`--${ctx.options.variablePrefix}ring-color`, "ring")(m, ctx)],
-  [/^ring-op(?:acity)?-?(.+)$/, ([, opacity], { options: { variablePrefix: p } }) => ({ [`--${p}ring-opacity`]: utilities.handler.bracket.percent(opacity) })],
-  [/^ring-offset-(.+)$/, (m, ctx) => utilities.colorResolver(`--${ctx.options.variablePrefix}ring-offset-color`, "ring-offset")(m, ctx)],
-  [/^ring-offset-op(?:acity)?-?(.+)$/, ([, opacity], { options: { variablePrefix: p } }) => ({ [`--${p}ring-offset-opacity`]: utilities.handler.bracket.percent(opacity) })],
-  [/^ring-inset$/, (_, { options: { variablePrefix: p } }) => ({ [`--${p}ring-inset`]: "inset" })]
+  ["ring-offset", { "--un-ring-offset-width": "1px" }],
+  [/^ring-offset-(.+)$/, ([, d]) => ({ "--un-ring-offset-width": utilities.handler.px(d || "1") })],
+  [/^ring-(.+)$/, utilities.colorResolver("--un-ring-color", "ring")],
+  [/^ring-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-ring-opacity": utilities.handler.bracket.percent(opacity) })],
+  [/^ring-offset-(.+)$/, utilities.colorResolver("--un-ring-offset-color", "ring-offset")],
+  [/^ring-offset-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-ring-offset-opacity": utilities.handler.bracket.percent(opacity) })],
+  ["ring-inset", { "--un-ring-inset": "inset" }]
 ];
 
-const colorResolver = (body, theme) => {
+const shadowColorResolver = (body, theme) => {
   const data = utilities.parseColor(body, theme);
   if (!data)
     return;
@@ -556,13 +541,15 @@ const boxShadows = [
     const value = theme.boxShadow?.[d || "DEFAULT"];
     if (value) {
       return {
+        "--un-shadow-inset": varEmpty,
         "--un-shadow-color": "0,0,0",
         "--un-shadow": value,
         "box-shadow": "var(--un-ring-offset-shadow, 0 0 #0000), var(--un-ring-shadow, 0 0 #0000), var(--un-shadow)"
       };
     }
   }],
-  [/^shadow-(.+)$/, ([, d], { theme }) => colorResolver(d, theme)]
+  [/^shadow-(.+)$/, ([, d], { theme }) => shadowColorResolver(d, theme)],
+  ["shadow-inset", { "--un-shadow-inset": "inset" }]
 ];
 
 function getPropName(minmax, hw) {
@@ -587,11 +574,17 @@ const sizes = [
   }]
 ];
 const aspectRatio = [
-  ["aspect-ratio-auto", { "aspect-ratio": "auto" }],
-  [/^aspect-ratio-(.+)$/, ([, d]) => {
-    const v = (/^\d+\/\d+$/.test(d) ? d : null) || utilities.handler.bracket.cssvar.number(d);
+  [/^aspect-(?:ratio-)?(.+)$/, ([, d]) => {
+    if (/^\d+\/\d+$/.test(d))
+      return { "aspect-ratio": d };
+    const v = {
+      auto: "auto",
+      square: "1/1",
+      video: "16/9"
+    }[d];
     if (v != null)
       return { "aspect-ratio": v };
+    return { "aspect-ratio": utilities.handler.bracket.cssvar.number(d) };
   }]
 ];
 
@@ -640,24 +633,14 @@ const transforms = [
   ["transform-gpu", transformGpu],
   ["transform-cpu", transformCpu],
   ["transform-none", { transform: "none" }],
-  ["origin-center", { "transform-origin": "center" }],
-  ["origin-top", { "transform-origin": "top" }],
-  ["origin-top-right", { "transform-origin": "top right" }],
-  ["origin-right", { "transform-origin": "right" }],
-  ["origin-bottom-right", { "transform-origin": "bottom right" }],
-  ["origin-bottom", { "transform-origin": "bottom" }],
-  ["origin-bottom-left", { "transform-origin": "bottom left" }],
-  ["origin-left", { "transform-origin": "left" }],
-  ["origin-top-left", { "transform-origin": "top left" }]
+  [/^origin-([-\w]{3,})$/, ([, s]) => ({ "transform-origin": utilities.positionMap[s] })]
 ];
 function handleTranslate([, d, b]) {
   const v = utilities.handler.bracket.fraction.auto.rem(b);
   if (v != null) {
     return [
       transformBase,
-      [
-        ...utilities.xyzMap[d].map((i) => [`--un-translate${i}`, v])
-      ]
+      utilities.xyzMap[d].map((i) => [`--un-translate${i}`, v])
     ];
   }
 }
@@ -666,9 +649,7 @@ function handleScale([, d, b]) {
   if (v != null) {
     return [
       transformBase,
-      [
-        ...utilities.xyzMap[d].map((i) => [`--un-scale${i}`, v])
-      ]
+      utilities.xyzMap[d].map((i) => [`--un-scale${i}`, v])
     ];
   }
 }
@@ -716,17 +697,12 @@ const variablesAbbrMap = {
   "backface": "backface-visibility",
   "whitespace": "white-space",
   "break": "word-break",
-  "b": "border-color",
-  "border": "border-color",
-  "color": "color",
   "case": "text-transform",
   "origin": "transform-origin",
-  "bg": "background-color",
   "bg-opacity": "background-opacity",
   "tab": "tab-size",
   "underline": "text-decoration-thickness",
   "underline-offset": "text-underline-offset",
-  "text": "color",
   "grid-cols": "grid-template-columns",
   "grid-rows": "grid-template-rows",
   "auto-flow": "grid-auto-flow",
@@ -741,15 +717,8 @@ const variablesAbbrMap = {
 const cssVariables = [
   [/^(.+)-\$(.+)$/, ([, name, varname]) => {
     const prop = variablesAbbrMap[name];
-    if (prop) {
-      return {
-        [prop]: `var(--${varname})`
-      };
-    }
-  }],
-  [/^(?:border|b)-([^-]+)-\$(.+)$/, ([, a, v]) => {
-    if (a in utilities.directionMap)
-      return utilities.directionMap[a].map((i) => [`border${i}-color`, `var(--${v})`]);
+    if (prop)
+      return { [prop]: `var(--${varname})` };
   }]
 ];
 
@@ -791,11 +760,7 @@ const svgUtilities = [
   [/^fill-(.+)$/, utilities.colorResolver("fill", "fill")],
   [/^fill-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-fill-opacity": utilities.handler.bracket.percent(opacity) })],
   ["fill-none", { fill: "none" }],
-  [/^stroke-(?:size-|width-)?(.+)$/, ([, s]) => {
-    const v = utilities.handler.bracket.fraction.px.number(s);
-    if (v)
-      return { "stroke-width": v };
-  }],
+  [/^stroke-(?:size-|width-)?(.+)$/, ([, s]) => ({ "stroke-width": utilities.handler.bracket.fraction.px.number(s) })],
   [/^stroke-(.+)$/, utilities.colorResolver("stroke", "stroke")],
   [/^stroke-op(?:acity)?-?(.+)$/, ([, opacity]) => ({ "--un-stroke-opacity": utilities.handler.bracket.percent(opacity) })],
   ["stroke-none", { stroke: "none" }]
@@ -907,7 +872,6 @@ exports.transforms = transforms;
 exports.transitions = transitions;
 exports.userSelects = userSelects;
 exports.varEmpty = varEmpty;
-exports.varEmptyFn = varEmptyFn;
 exports.verticalAligns = verticalAligns;
 exports.whitespaces = whitespaces;
 exports.willChange = willChange;