Skip to content

Commit

Permalink
Merge pull request tailwindlabs#1286 from florianbouvot/master
Browse files Browse the repository at this point in the history
Fix box-sizing values
  • Loading branch information
adamwathan authored Dec 30, 2019
2 parents 84c3bf3 + bad1033 commit 28dab5e
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
20 changes: 10 additions & 10 deletions __tests__/fixtures/tailwind-output-important.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
20 changes: 10 additions & 10 deletions __tests__/fixtures/tailwind-output.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/boxSizing.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
)
Expand Down

0 comments on commit 28dab5e

Please sign in to comment.