Merge pull request tailwindlabs#1286 from florianbouvot/master

adamwathan · web-flow · commit 28dab5eb3a79 · 2019-12-30T09:14:15.000-05:00
Fix box-sizing values
diff --git a/__tests__/fixtures/tailwind-output-important.css b/__tests__/fixtures/tailwind-output-important.css
@@ -3340,11 +3340,11 @@ video {
 }
 
 .box-border {
-  box-sizing: border !important;
+  box-sizing: border-box !important;
 }
 
 .box-content {
-  box-sizing: content !important;
+  box-sizing: content-box !important;
 }
 
 .cursor-auto {
@@ -13021,11 +13021,11 @@ video {
   }
 
   .sm\:box-border {
-    box-sizing: border !important;
+    box-sizing: border-box !important;
   }
 
   .sm\:box-content {
-    box-sizing: content !important;
+    box-sizing: content-box !important;
   }
 
   .sm\:cursor-auto {
@@ -22703,11 +22703,11 @@ video {
   }
 
   .md\:box-border {
-    box-sizing: border !important;
+    box-sizing: border-box !important;
   }
 
   .md\:box-content {
-    box-sizing: content !important;
+    box-sizing: content-box !important;
   }
 
   .md\:cursor-auto {
@@ -32385,11 +32385,11 @@ video {
   }
 
   .lg\:box-border {
-    box-sizing: border !important;
+    box-sizing: border-box !important;
   }
 
   .lg\:box-content {
-    box-sizing: content !important;
+    box-sizing: content-box !important;
   }
 
   .lg\:cursor-auto {
@@ -42067,11 +42067,11 @@ video {
   }
 
   .xl\:box-border {
-    box-sizing: border !important;
+    box-sizing: border-box !important;
   }
 
   .xl\:box-content {
-    box-sizing: content !important;
+    box-sizing: content-box !important;
   }
 
   .xl\:cursor-auto {
diff --git a/__tests__/fixtures/tailwind-output.css b/__tests__/fixtures/tailwind-output.css
@@ -3340,11 +3340,11 @@ video {
 }
 
 .box-border {
-  box-sizing: border;
+  box-sizing: border-box;
 }
 
 .box-content {
-  box-sizing: content;
+  box-sizing: content-box;
 }
 
 .cursor-auto {
@@ -13021,11 +13021,11 @@ video {
   }
 
   .sm\:box-border {
-    box-sizing: border;
+    box-sizing: border-box;
   }
 
   .sm\:box-content {
-    box-sizing: content;
+    box-sizing: content-box;
   }
 
   .sm\:cursor-auto {
@@ -22703,11 +22703,11 @@ video {
   }
 
   .md\:box-border {
-    box-sizing: border;
+    box-sizing: border-box;
   }
 
   .md\:box-content {
-    box-sizing: content;
+    box-sizing: content-box;
   }
 
   .md\:cursor-auto {
@@ -32385,11 +32385,11 @@ video {
   }
 
   .lg\:box-border {
-    box-sizing: border;
+    box-sizing: border-box;
   }
 
   .lg\:box-content {
-    box-sizing: content;
+    box-sizing: content-box;
   }
 
   .lg\:cursor-auto {
@@ -42067,11 +42067,11 @@ video {
   }
 
   .xl\:box-border {
-    box-sizing: border;
+    box-sizing: border-box;
   }
 
   .xl\:box-content {
-    box-sizing: content;
+    box-sizing: content-box;
   }
 
   .xl\:cursor-auto {
diff --git a/src/plugins/boxSizing.js b/src/plugins/boxSizing.js
@@ -2,8 +2,8 @@ export default function() {
   return function({ addUtilities, variants }) {
     addUtilities(
       {
-        '.box-border': { 'box-sizing': 'border' },
-        '.box-content': { 'box-sizing': 'content' },
+        '.box-border': { 'box-sizing': 'border-box' },
+        '.box-content': { 'box-sizing': 'content-box' },
       },
       variants('boxSizing')
     )

Original file line number	Diff line number	Diff line change
`@@ -3340,11 +3340,11 @@ video {`
`3340`	`3340`	`}`
`3341`	`3341`
`3342`	`3342`	`.box-border {`
`3343`		`- box-sizing: border !important;`
	`3343`	`+ box-sizing: border-box !important;`
`3344`	`3344`	`}`
`3345`	`3345`
`3346`	`3346`	`.box-content {`
`3347`		`- box-sizing: content !important;`
	`3347`	`+ box-sizing: content-box !important;`
`3348`	`3348`	`}`
`3349`	`3349`
`3350`	`3350`	`.cursor-auto {`
`@@ -13021,11 +13021,11 @@ video {`
`13021`	`13021`	`}`
`13022`	`13022`
`13023`	`13023`	`.sm\:box-border {`
`13024`		`- box-sizing: border !important;`
	`13024`	`+ box-sizing: border-box !important;`
`13025`	`13025`	`}`
`13026`	`13026`
`13027`	`13027`	`.sm\:box-content {`
`13028`		`- box-sizing: content !important;`
	`13028`	`+ box-sizing: content-box !important;`
`13029`	`13029`	`}`
`13030`	`13030`
`13031`	`13031`	`.sm\:cursor-auto {`
`@@ -22703,11 +22703,11 @@ video {`
`22703`	`22703`	`}`
`22704`	`22704`
`22705`	`22705`	`.md\:box-border {`
`22706`		`- box-sizing: border !important;`
	`22706`	`+ box-sizing: border-box !important;`
`22707`	`22707`	`}`
`22708`	`22708`
`22709`	`22709`	`.md\:box-content {`
`22710`		`- box-sizing: content !important;`
	`22710`	`+ box-sizing: content-box !important;`
`22711`	`22711`	`}`
`22712`	`22712`
`22713`	`22713`	`.md\:cursor-auto {`
`@@ -32385,11 +32385,11 @@ video {`
`32385`	`32385`	`}`
`32386`	`32386`
`32387`	`32387`	`.lg\:box-border {`
`32388`		`- box-sizing: border !important;`
	`32388`	`+ box-sizing: border-box !important;`
`32389`	`32389`	`}`
`32390`	`32390`
`32391`	`32391`	`.lg\:box-content {`
`32392`		`- box-sizing: content !important;`
	`32392`	`+ box-sizing: content-box !important;`
`32393`	`32393`	`}`
`32394`	`32394`
`32395`	`32395`	`.lg\:cursor-auto {`
`@@ -42067,11 +42067,11 @@ video {`
`42067`	`42067`	`}`
`42068`	`42068`
`42069`	`42069`	`.xl\:box-border {`
`42070`		`- box-sizing: border !important;`
	`42070`	`+ box-sizing: border-box !important;`
`42071`	`42071`	`}`
`42072`	`42072`
`42073`	`42073`	`.xl\:box-content {`
`42074`		`- box-sizing: content !important;`
	`42074`	`+ box-sizing: content-box !important;`
`42075`	`42075`	`}`
`42076`	`42076`
`42077`	`42077`	`.xl\:cursor-auto {`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ export default function() {`
`2`	`2`	`return function({ addUtilities, variants }) {`
`3`	`3`	`addUtilities(`
`4`	`4`	`{`
`5`		`- '.box-border': { 'box-sizing': 'border' },`
`6`		`- '.box-content': { 'box-sizing': 'content' },`
	`5`	`+ '.box-border': { 'box-sizing': 'border-box' },`
	`6`	`+ '.box-content': { 'box-sizing': 'content-box' },`
`7`	`7`	`},`
`8`	`8`	`variants('boxSizing')`
`9`	`9`	`)`