From 2babe0cb23d9f0029bce928fb9b8fb5992785681 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Mon, 30 Dec 2019 07:47:45 -0500 Subject: [PATCH] Add none/auto values for grid utilities --- .../fixtures/tailwind-output-important.css | 80 +++++++++++++++++++ __tests__/fixtures/tailwind-output.css | 80 +++++++++++++++++++ stubs/defaultConfig.stub.js | 4 + 3 files changed, 164 insertions(+) diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css index 17ccb6ce3..95ef5b28b 100644 --- a/__tests__/fixtures/tailwind-output-important.css +++ b/__tests__/fixtures/tailwind-output-important.css @@ -8509,6 +8509,14 @@ video { grid-template-columns: repeat(12, minmax(0, 1fr)) !important; } +.grid-cols-none { + grid-template-columns: none !important; +} + +.col-auto { + grid-column: auto !important; +} + .col-span-1 { grid-column: span 1 / span 1 !important; } @@ -8609,6 +8617,10 @@ video { grid-column-start: 13 !important; } +.col-start-auto { + grid-column-start: auto !important; +} + .col-end-1 { grid-column-end: 1 !important; } @@ -8661,6 +8673,10 @@ video { grid-column-end: 13 !important; } +.col-end-auto { + grid-column-end: auto !important; +} + .transform { --transform-scale-x: 1 !important; --transform-scale-y: 1 !important; @@ -18078,6 +18094,14 @@ video { grid-template-columns: repeat(12, minmax(0, 1fr)) !important; } + .sm\:grid-cols-none { + grid-template-columns: none !important; + } + + .sm\:col-auto { + grid-column: auto !important; + } + .sm\:col-span-1 { grid-column: span 1 / span 1 !important; } @@ -18178,6 +18202,10 @@ video { grid-column-start: 13 !important; } + .sm\:col-start-auto { + grid-column-start: auto !important; + } + .sm\:col-end-1 { grid-column-end: 1 !important; } @@ -18230,6 +18258,10 @@ video { grid-column-end: 13 !important; } + .sm\:col-end-auto { + grid-column-end: auto !important; + } + .sm\:transform { --transform-scale-x: 1 !important; --transform-scale-y: 1 !important; @@ -27648,6 +27680,14 @@ video { grid-template-columns: repeat(12, minmax(0, 1fr)) !important; } + .md\:grid-cols-none { + grid-template-columns: none !important; + } + + .md\:col-auto { + grid-column: auto !important; + } + .md\:col-span-1 { grid-column: span 1 / span 1 !important; } @@ -27748,6 +27788,10 @@ video { grid-column-start: 13 !important; } + .md\:col-start-auto { + grid-column-start: auto !important; + } + .md\:col-end-1 { grid-column-end: 1 !important; } @@ -27800,6 +27844,10 @@ video { grid-column-end: 13 !important; } + .md\:col-end-auto { + grid-column-end: auto !important; + } + .md\:transform { --transform-scale-x: 1 !important; --transform-scale-y: 1 !important; @@ -37218,6 +37266,14 @@ video { grid-template-columns: repeat(12, minmax(0, 1fr)) !important; } + .lg\:grid-cols-none { + grid-template-columns: none !important; + } + + .lg\:col-auto { + grid-column: auto !important; + } + .lg\:col-span-1 { grid-column: span 1 / span 1 !important; } @@ -37318,6 +37374,10 @@ video { grid-column-start: 13 !important; } + .lg\:col-start-auto { + grid-column-start: auto !important; + } + .lg\:col-end-1 { grid-column-end: 1 !important; } @@ -37370,6 +37430,10 @@ video { grid-column-end: 13 !important; } + .lg\:col-end-auto { + grid-column-end: auto !important; + } + .lg\:transform { --transform-scale-x: 1 !important; --transform-scale-y: 1 !important; @@ -46788,6 +46852,14 @@ video { grid-template-columns: repeat(12, minmax(0, 1fr)) !important; } + .xl\:grid-cols-none { + grid-template-columns: none !important; + } + + .xl\:col-auto { + grid-column: auto !important; + } + .xl\:col-span-1 { grid-column: span 1 / span 1 !important; } @@ -46888,6 +46960,10 @@ video { grid-column-start: 13 !important; } + .xl\:col-start-auto { + grid-column-start: auto !important; + } + .xl\:col-end-1 { grid-column-end: 1 !important; } @@ -46940,6 +47016,10 @@ video { grid-column-end: 13 !important; } + .xl\:col-end-auto { + grid-column-end: auto !important; + } + .xl\:transform { --transform-scale-x: 1 !important; --transform-scale-y: 1 !important; diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css index dedc3f50a..4d6bb0863 100644 --- a/__tests__/fixtures/tailwind-output.css +++ b/__tests__/fixtures/tailwind-output.css @@ -8509,6 +8509,14 @@ video { grid-template-columns: repeat(12, minmax(0, 1fr)); } +.grid-cols-none { + grid-template-columns: none; +} + +.col-auto { + grid-column: auto; +} + .col-span-1 { grid-column: span 1 / span 1; } @@ -8609,6 +8617,10 @@ video { grid-column-start: 13; } +.col-start-auto { + grid-column-start: auto; +} + .col-end-1 { grid-column-end: 1; } @@ -8661,6 +8673,10 @@ video { grid-column-end: 13; } +.col-end-auto { + grid-column-end: auto; +} + .transform { --transform-scale-x: 1; --transform-scale-y: 1; @@ -18078,6 +18094,14 @@ video { grid-template-columns: repeat(12, minmax(0, 1fr)); } + .sm\:grid-cols-none { + grid-template-columns: none; + } + + .sm\:col-auto { + grid-column: auto; + } + .sm\:col-span-1 { grid-column: span 1 / span 1; } @@ -18178,6 +18202,10 @@ video { grid-column-start: 13; } + .sm\:col-start-auto { + grid-column-start: auto; + } + .sm\:col-end-1 { grid-column-end: 1; } @@ -18230,6 +18258,10 @@ video { grid-column-end: 13; } + .sm\:col-end-auto { + grid-column-end: auto; + } + .sm\:transform { --transform-scale-x: 1; --transform-scale-y: 1; @@ -27648,6 +27680,14 @@ video { grid-template-columns: repeat(12, minmax(0, 1fr)); } + .md\:grid-cols-none { + grid-template-columns: none; + } + + .md\:col-auto { + grid-column: auto; + } + .md\:col-span-1 { grid-column: span 1 / span 1; } @@ -27748,6 +27788,10 @@ video { grid-column-start: 13; } + .md\:col-start-auto { + grid-column-start: auto; + } + .md\:col-end-1 { grid-column-end: 1; } @@ -27800,6 +27844,10 @@ video { grid-column-end: 13; } + .md\:col-end-auto { + grid-column-end: auto; + } + .md\:transform { --transform-scale-x: 1; --transform-scale-y: 1; @@ -37218,6 +37266,14 @@ video { grid-template-columns: repeat(12, minmax(0, 1fr)); } + .lg\:grid-cols-none { + grid-template-columns: none; + } + + .lg\:col-auto { + grid-column: auto; + } + .lg\:col-span-1 { grid-column: span 1 / span 1; } @@ -37318,6 +37374,10 @@ video { grid-column-start: 13; } + .lg\:col-start-auto { + grid-column-start: auto; + } + .lg\:col-end-1 { grid-column-end: 1; } @@ -37370,6 +37430,10 @@ video { grid-column-end: 13; } + .lg\:col-end-auto { + grid-column-end: auto; + } + .lg\:transform { --transform-scale-x: 1; --transform-scale-y: 1; @@ -46788,6 +46852,14 @@ video { grid-template-columns: repeat(12, minmax(0, 1fr)); } + .xl\:grid-cols-none { + grid-template-columns: none; + } + + .xl\:col-auto { + grid-column: auto; + } + .xl\:col-span-1 { grid-column: span 1 / span 1; } @@ -46888,6 +46960,10 @@ video { grid-column-start: 13; } + .xl\:col-start-auto { + grid-column-start: auto; + } + .xl\:col-end-1 { grid-column-end: 1; } @@ -46940,6 +47016,10 @@ video { grid-column-end: 13; } + .xl\:col-end-auto { + grid-column-end: auto; + } + .xl\:transform { --transform-scale-x: 1; --transform-scale-y: 1; diff --git a/stubs/defaultConfig.stub.js b/stubs/defaultConfig.stub.js index 24fe9b23f..6f36f931b 100644 --- a/stubs/defaultConfig.stub.js +++ b/stubs/defaultConfig.stub.js @@ -409,6 +409,7 @@ module.exports = { rowGap: {}, columnGap: {}, gridTemplateColumns: { + none: 'none', '1': 'repeat(1, minmax(0, 1fr))', '2': 'repeat(2, minmax(0, 1fr))', '3': 'repeat(3, minmax(0, 1fr))', @@ -423,6 +424,7 @@ module.exports = { '12': 'repeat(12, minmax(0, 1fr))', }, gridColumn: { + auto: 'auto', 'span-1': 'span 1 / span 1', 'span-2': 'span 2 / span 2', 'span-3': 'span 3 / span 3', @@ -437,6 +439,7 @@ module.exports = { 'span-12': 'span 12 / span 12', }, gridColumnStart: { + auto: 'auto', '1': '1', '2': '2', '3': '3', @@ -452,6 +455,7 @@ module.exports = { '13': '13', }, gridColumnEnd: { + auto: 'auto', '1': '1', '2': '2', '3': '3',