8000 feat: add numbers & css variables for col and row grid utils (#4717) · unocss/unocss@1948d4b · GitHub
[go: up one dir, main page]
Skip to content

Commit 1948d4b

Browse files
praburangkipraburangki
authored
feat: add numbers & css variables for col and row grid utils (#4717)
1 parent 7c87c96 commit 1948d4b

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

‎packages-presets/preset-wind4/src/rules/grid.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ export const grids: Rule<Theme>[] = [
2323

2424
// global
2525
[/^(?:grid-)?(row|col)-(.+)$/, ([, c, v]) => ({
26-
[`grid-${rowCol(c)}`]: h.bracket.cssvar.auto(v),
26+
[`grid-${rowCol(c)}`]: h.bracket.number.cssvar.auto(v),
2727
})],
2828

2929
// span
3030
[/^(?:grid-)?(row|col)-span-(.+)$/, ([, c, s]) => {
3131
if (s === 'full')
3232
return { [`grid-${rowCol(c)}`]: '1/-1' }
33-
const v = h.bracket.number(s)
33+
const v = h.bracket.number.cssvar(s)
3434
if (v != null)
3535
return { [`grid-${rowCol(c)}`]: `span ${v}/span ${v}` }
3636
}, { autocomplete: '(grid-row|grid-col|row|col)-span-<num>' }],

‎test/assets/output/preset-wind4-targets.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,12 +777,18 @@
777777
.-gap-row-5,
778778
.-gap-y-5{row-gap:calc(calc(var(--spacing) * 5) * -1);}
779779
.grid{display:grid;}
780+
.col-11{grid-column:11;}
781+
.-col-12{grid-column:-12;}
780782
.grid-col-\$variable{grid-column:var(--variable);}
781783
.grid-row-\$variable{grid-row:var(--variable);}
782784
.row-\[span_1\/span_2\]{grid-row:span 1/span 2;}
785+
.row-11{grid-row:11;}
786+
.-row-12{grid-row:-12;}
783787
.row-auto{grid-row:auto;}
788+
.col-span-\$variable{grid-column:span var(--variable)/span var(--variable);}
784789
.col-span-1{grid-column:span 1/span 1;}
785790
.row-span-\[hi\]{grid-row:span hi/span hi;}
791+
.row-span-\$variable{grid-row:span var(--variable)/span var(--variable);}
786792
.row-span-full{grid-row:1/-1;}
787793
.row-start-full{grid-row-start:full;}
788794
.row-end-1{grid-row-end:1;}

‎test/assets/preset-wind4-targets.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,14 @@ export const presetWind4Targets: string[] = [
484484
'scheme-light-dark',
485485
'scheme-dark',
486486
'scheme-light',
487+
488+
// grid
489+
'col-11',
490+
'-col-12',
491+
'col-span-$variable',
492+
'row-11',
493+
'-row-12',
494+
'row-span-$variable',
487495
]
488496

489497
export const presetWindNonTargets: string[] = [

0 commit comments

Comments
 (0)
0