From 6e03c886e87df30eeef4c185ef331991abd59ff5 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Fri, 9 Oct 2020 13:16:03 -0400 Subject: [PATCH 1/2] Rename max-content and min-content to max and min in experimental spacing scale --- .../fixtures/tailwind-output-flagged.css | 72 +++++++++---------- src/flagged/extendedSpacingScale.js | 12 ++-- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/__tests__/fixtures/tailwind-output-flagged.css b/__tests__/fixtures/tailwind-output-flagged.css index e4c58a88bb9d..e02bf808df5c 100644 --- a/__tests__/fixtures/tailwind-output-flagged.css +++ b/__tests__/fixtures/tailwind-output-flagged.css @@ -25612,11 +25612,11 @@ video { max-width: 100%; } -.max-w-min-content { +.max-w-min { max-width: min-content; } -.max-w-max-content { +.max-w-max { max-width: max-content; } @@ -25660,11 +25660,11 @@ video { min-width: 100%; } -.min-w-min-content { +.min-w-min { min-width: min-content; } -.min-w-max-content { +.min-w-max { min-width: max-content; } @@ -39052,11 +39052,11 @@ video { width: 100vw; } -.w-min-content { +.w-min { width: min-content; } -.w-max-content { +.w-max { width: max-content; } @@ -69597,11 +69597,11 @@ video { max-width: 100%; } - .sm\:max-w-min-content { + .sm\:max-w-min { max-width: min-content; } - .sm\:max-w-max-content { + .sm\:max-w-max { max-width: max-content; } @@ -69645,11 +69645,11 @@ video { min-width: 100%; } - .sm\:min-w-min-content { + .sm\:min-w-min { min-width: min-content; } - .sm\:min-w-max-content { + .sm\:min-w-max { min-width: max-content; } @@ -83037,11 +83037,11 @@ video { width: 100vw; } - .sm\:w-min-content { + .sm\:w-min { width: min-content; } - .sm\:w-max-content { + .sm\:w-max { width: max-content; } @@ -113552,11 +113552,11 @@ video { max-width: 100%; } - .md\:max-w-min-content { + .md\:max-w-min { max-width: min-content; } - .md\:max-w-max-content { + .md\:max-w-max { max-width: max-content; } @@ -113600,11 +113600,11 @@ video { min-width: 100%; } - .md\:min-w-min-content { + .md\:min-w-min { min-width: min-content; } - .md\:min-w-max-content { + .md\:min-w-max { min-width: max-content; } @@ -126992,11 +126992,11 @@ video { width: 100vw; } - .md\:w-min-content { + .md\:w-min { width: min-content; } - .md\:w-max-content { + .md\:w-max { width: max-content; } @@ -157507,11 +157507,11 @@ video { max-width: 100%; } - .lg\:max-w-min-content { + .lg\:max-w-min { max-width: min-content; } - .lg\:max-w-max-content { + .lg\:max-w-max { max-width: max-content; } @@ -157555,11 +157555,11 @@ video { min-width: 100%; } - .lg\:min-w-min-content { + .lg\:min-w-min { min-width: min-content; } - .lg\:min-w-max-content { + .lg\:min-w-max { min-width: max-content; } @@ -170947,11 +170947,11 @@ video { width: 100vw; } - .lg\:w-min-content { + .lg\:w-min { width: min-content; } - .lg\:w-max-content { + .lg\:w-max { width: max-content; } @@ -201462,11 +201462,11 @@ video { max-width: 100%; } - .xl\:max-w-min-content { + .xl\:max-w-min { max-width: min-content; } - .xl\:max-w-max-content { + .xl\:max-w-max { max-width: max-content; } @@ -201510,11 +201510,11 @@ video { min-width: 100%; } - .xl\:min-w-min-content { + .xl\:min-w-min { min-width: min-content; } - .xl\:min-w-max-content { + .xl\:min-w-max { min-width: max-content; } @@ -214902,11 +214902,11 @@ video { width: 100vw; } - .xl\:w-min-content { + .xl\:w-min { width: min-content; } - .xl\:w-max-content { + .xl\:w-max { width: max-content; } @@ -245417,11 +245417,11 @@ video { max-width: 100%; } - .\32xl\:max-w-min-content { + .\32xl\:max-w-min { max-width: min-content; } - .\32xl\:max-w-max-content { + .\32xl\:max-w-max { max-width: max-content; } @@ -245465,11 +245465,11 @@ video { min-width: 100%; } - .\32xl\:min-w-min-content { + .\32xl\:min-w-min { min-width: min-content; } - .\32xl\:min-w-max-content { + .\32xl\:min-w-max { min-width: max-content; } @@ -258857,11 +258857,11 @@ video { width: 100vw; } - .\32xl\:w-min-content { + .\32xl\:w-min { width: min-content; } - .\32xl\:w-max-content { + .\32xl\:w-max { width: max-content; } diff --git a/src/flagged/extendedSpacingScale.js b/src/flagged/extendedSpacingScale.js index 221dc57d62aa..0733f795059a 100644 --- a/src/flagged/extendedSpacingScale.js +++ b/src/flagged/extendedSpacingScale.js @@ -74,15 +74,15 @@ export default { minWidth: { '0': '0', full: '100%', - 'min-content': 'min-content', - 'max-content': 'max-content', + min: 'min-content', + max: 'max-content', }, width: theme => ({ auto: 'auto', ...theme('spacing'), screen: '100vw', - 'min-content': 'min-content', - 'max-content': 'max-content', + min: 'min-content', + max: 'max-content', }), maxWidth: (theme, { breakpoints }) => ({ none: 'none', @@ -99,8 +99,8 @@ export default { '6xl': '72rem', '7xl': '80rem', full: '100%', - 'min-content': 'min-content', - 'max-content': 'max-content', + min: 'min-content', + max: 'max-content', ...breakpoints(theme('screens')), }), maxHeight: theme => ({ From cc0181d06fb877320b25844b21d2a8384d7900b6 Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Fri, 9 Oct 2020 13:25:27 -0400 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fa3a3f5358e..52dbb345dbf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Add `xl`, `2xl`, and `3xl` border radius values ([#2529](https://github.com/tailwindlabs/tailwindcss/pull/2529)) - Support disabling dark mode variants globally ([#2530](https://github.com/tailwindlabs/tailwindcss/pull/2530)) - Add new utilities for `grid-auto-columns` and `grid-auto-rows` ([#2531](https://github.com/tailwindlabs/tailwindcss/pull/2531)) +- Rename `{u}-max-content` and `{u}-min-content` utilities to `{u}-max` and `{u}-min` in experimental extended spacing scale ([#2532](https://github.com/tailwindlabs/tailwindcss/pull/2532)) ## [1.8.12] - 2020-10-07