diff --git a/packages/preset-mini/src/rules/grid.ts b/packages/preset-mini/src/rules/grid.ts index 6b7aee3d22..1ad4d0aadb 100644 --- a/packages/preset-mini/src/rules/grid.ts +++ b/packages/preset-mini/src/rules/grid.ts @@ -48,7 +48,7 @@ export const grids: Rule[] = [ // grid-auto-flow, auto-flow: uno // grid-flow: wind [/^(?:grid-auto-flow|auto-flow|grid-flow)-(.+)$/, ([, v]) => ({ 'grid-auto-flow': h.bracket.cssvar(v) })], - [/^(?:grid-auto-flow|auto-flow|grid-flow)-((?:row|col)(?:-dense)?)$/, ([, v]) => ({ 'grid-auto-flow': rowCol(v).replace('-', ' ') })], + [/^(?:grid-auto-flow|auto-flow|grid-flow)-(row|col|dense|row-dense|col-dense)$/, ([, v]) => ({ 'grid-auto-flow': rowCol(v).replace('-', ' ') })], // templates [/^grid-(rows|cols)-(.+)$/, ([, c, v], { theme }) => ({ diff --git a/packages/preset-wind/src/rules/static.ts b/packages/preset-wind/src/rules/static.ts index 7ed6dca8e2..346bf26787 100644 --- a/packages/preset-wind/src/rules/static.ts +++ b/packages/preset-wind/src/rules/static.ts @@ -121,5 +121,6 @@ export const mixBlendModes: Rule[] = [ ['mix-blend-saturation', { 'mix-blend-mode': 'saturation' }], ['mix-blend-color', { 'mix-blend-mode': 'color' }], ['mix-blend-luminosity', { 'mix-blend-mode': 'luminosity' }], + ['mix-blend-plus-lighter', { 'mix-blend-mode': 'plus-lighter' }], ['mix-blend-normal', { 'mix-blend-mode': 'normal' }], ] diff --git a/test/__snapshots__/preset-mini.test.ts.snap b/test/__snapshots__/preset-mini.test.ts.snap index 25552551dc..d6cfce0337 100644 --- a/test/__snapshots__/preset-mini.test.ts.snap +++ b/test/__snapshots__/preset-mini.test.ts.snap @@ -478,7 +478,9 @@ div:hover .group-\\\\[div\\\\:hover\\\\]-\\\\[combinator\\\\:test-4\\\\]{combina .auto-rows-min{grid-auto-rows:min-content;} .grid-auto-cols-\\\\$variable{grid-auto-columns:var(--variable);} .grid-auto-rows-\\\\$variable{grid-auto-rows:var(--variable);} -.auto-flow-col-dense{grid-auto-flow:column dense;} +.auto-flow-col-dense, +.grid-flow-col-dense{grid-auto-flow:column dense;} +.grid-flow-dense{grid-auto-flow:dense;} .grid-cols-\\\\[1fr_2fr_100px_min-content\\\\]{grid-template-columns:1fr 2fr 100px min-content;} .grid-cols-\\\\[repeat\\\\(3\\\\,auto\\\\)\\\\]{grid-template-columns:repeat(3,auto);} .grid-cols-\\\\$1{grid-template-columns:var(--\\\\31 );} diff --git a/test/__snapshots__/preset-wind.test.ts.snap b/test/__snapshots__/preset-wind.test.ts.snap index 173235e9c7..6fb606b537 100644 --- a/test/__snapshots__/preset-wind.test.ts.snap +++ b/test/__snapshots__/preset-wind.test.ts.snap @@ -279,6 +279,7 @@ exports[`preset-wind > targets 1`] = ` .bg-blend-luminosity{background-blend-mode:luminosity;} .bg-blend-normal{background-blend-mode:normal;} .mix-blend-hard-light{mix-blend-mode:hard-light;} +.mix-blend-plus-lighter{mix-blend-mode:plus-lighter;} .mix-blend-normal{mix-blend-mode:normal;} .image-render-pixel{-ms-interpolation-mode:nearest-neighbor;image-rendering:-webkit-optimize-contrast;image-rendering:-moz-crisp-edges;image-rendering:-o-pixelated;image-rendering:pixelated;} .backdrop-blur, diff --git a/test/assets/preset-mini-targets.ts b/test/assets/preset-mini-targets.ts index 55da30c389..5d5b6044d8 100644 --- a/test/assets/preset-mini-targets.ts +++ b/test/assets/preset-mini-targets.ts @@ -285,6 +285,8 @@ export const presetMiniTargets: string[] = [ 'auto-flow-col-dense', 'grid-cols-minmax-1rem', 'grid-rows-minmax-100px', + 'grid-flow-dense', + 'grid-flow-col-dense', // layout 'of-y-visible', diff --git a/test/assets/preset-wind-targets.ts b/test/assets/preset-wind-targets.ts index 6611877154..c54d0f5b59 100644 --- a/test/assets/preset-wind-targets.ts +++ b/test/assets/preset-wind-targets.ts @@ -249,6 +249,7 @@ export const presetWindTargets: string[] = [ // shadow, spacing 'mix-blend-normal', 'mix-blend-hard-light', + 'mix-blend-plus-lighter', 'space-y-none', 'space-x-2', 'space-y-4', diff --git a/test/preset-uno.test.ts b/test/preset-uno.test.ts index 868c9d9ffd..2fc271862a 100644 --- a/test/preset-uno.test.ts +++ b/test/preset-uno.test.ts @@ -99,6 +99,9 @@ const nonTargets = [ // wind - placeholder '$-placeholder-red-200', + + // wind - bg-blend + 'bg-blend-plus-lighter', // only added in mix-blend ] const uno = createGenerator({