Skip to content

Commit 2ae6c56

Browse files
committed
Merge branch 'dangayle-master'
2 parents dff0834 + ff4f4eb commit 2ae6c56

File tree

5 files changed

+135
-0
lines changed

5 files changed

+135
-0
lines changed

__tests__/fixtures/tailwind-output-important.css

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3657,6 +3657,18 @@ video {
36573657
clear: both !important;
36583658
}
36593659

3660+
.clear-left {
3661+
clear: left !important;
3662+
}
3663+
3664+
.clear-right {
3665+
clear: right !important;
3666+
}
3667+
3668+
.clear-both {
3669+
clear: both !important;
3670+
}
3671+
36603672
.font-sans {
36613673
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important;
36623674
}
@@ -12979,6 +12991,18 @@ video {
1297912991
clear: both !important;
1298012992
}
1298112993

12994+
.sm\:clear-left {
12995+
clear: left !important;
12996+
}
12997+
12998+
.sm\:clear-right {
12999+
clear: right !important;
13000+
}
13001+
13002+
.sm\:clear-both {
13003+
clear: both !important;
13004+
}
13005+
1298213006
.sm\:font-sans {
1298313007
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important;
1298413008
}
@@ -22302,6 +22326,18 @@ video {
2230222326
clear: both !important;
2230322327
}
2230422328

22329+
.md\:clear-left {
22330+
clear: left !important;
22331+
}
22332+
22333+
.md\:clear-right {
22334+
clear: right !important;
22335+
}
22336+
22337+
.md\:clear-both {
22338+
clear: both !important;
22339+
}
22340+
2230522341
.md\:font-sans {
2230622342
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important;
2230722343
}
@@ -31625,6 +31661,18 @@ video {
3162531661
clear: both !important;
3162631662
}
3162731663

31664+
.lg\:clear-left {
31665+
clear: left !important;
31666+
}
31667+
31668+
.lg\:clear-right {
31669+
clear: right !important;
31670+
}
31671+
31672+
.lg\:clear-both {
31673+
clear: both !important;
31674+
}
31675+
3162831676
.lg\:font-sans {
3162931677
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important;
3163031678
}
@@ -40948,6 +40996,18 @@ video {
4094840996
clear: both !important;
4094940997
}
4095040998

40999+
.xl\:clear-left {
41000+
clear: left !important;
41001+
}
41002+
41003+
.xl\:clear-right {
41004+
clear: right !important;
41005+
}
41006+
41007+
.xl\:clear-both {
41008+
clear: both !important;
41009+
}
41010+
4095141011
.xl\:font-sans {
4095241012
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important;
4095341013
}

__tests__/fixtures/tailwind-output.css

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3657,6 +3657,18 @@ video {
36573657
clear: both;
36583658
}
36593659

3660+
.clear-left {
3661+
clear: left;
3662+
}
3663+
3664+
.clear-right {
3665+
clear: right;
3666+
}
3667+
3668+
.clear-both {
3669+
clear: both;
3670+
}
3671+
36603672
.font-sans {
36613673
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
36623674
}
@@ -12979,6 +12991,18 @@ video {
1297912991
clear: both;
1298012992
}
1298112993

12994+
.sm\:clear-left {
12995+
clear: left;
12996+
}
12997+
12998+
.sm\:clear-right {
12999+
clear: right;
13000+
}
13001+
13002+
.sm\:clear-both {
13003+
clear: both;
13004+
}
13005+
1298213006
.sm\:font-sans {
1298313007
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
1298413008
}
@@ -22302,6 +22326,18 @@ video {
2230222326
clear: both;
2230322327
}
2230422328

22329+
.md\:clear-left {
22330+
clear: left;
22331+
}
22332+
22333+
.md\:clear-right {
22334+
clear: right;
22335+
}
22336+
22337+
.md\:clear-both {
22338+
clear: both;
22339+
}
22340+
2230522341
.md\:font-sans {
2230622342
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
2230722343
}
@@ -31625,6 +31661,18 @@ video {
3162531661
clear: both;
3162631662
}
3162731663

31664+
.lg\:clear-left {
31665+
clear: left;
31666+
}
31667+
31668+
.lg\:clear-right {
31669+
clear: right;
31670+
}
31671+
31672+
.lg\:clear-both {
31673+
clear: both;
31674+
}
31675+
3162831676
.lg\:font-sans {
3162931677
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
3163031678
}
@@ -40948,6 +40996,18 @@ video {
4094840996
clear: both;
4094940997
}
4095040998

40999+
.xl\:clear-left {
41000+
clear: left;
41001+
}
41002+
41003+
.xl\:clear-right {
41004+
clear: right;
41005+
}
41006+
41007+
.xl\:clear-both {
41008+
clear: both;
41009+
}
41010+
4095141011
.xl\:font-sans {
4095241012
font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
4095341013
}

src/corePlugins.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import flexGrow from './plugins/flexGrow'
2626
import flexShrink from './plugins/flexShrink'
2727
import order from './plugins/order'
2828
import float from './plugins/float'
29+
import clear from './plugins/clear'
2930
import fontFamily from './plugins/fontFamily'
3031
import fontWeight from './plugins/fontWeight'
3132
import height from './plugins/height'
@@ -105,6 +106,7 @@ export default function({ corePlugins: corePluginConfig }) {
105106
flexShrink,
106107
order,
107108
float,
109+
clear,
108110
fontFamily,
109111
fontWeight,
110112
height,

src/plugins/clear.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
export default function() {
2+
return function({ addUtilities, variants }) {
3+
addUtilities(
4+
{
5+
'.clear-left': { clear: 'left' },
6+
'.clear-right': { clear: 'right' },
7+
'.clear-both': { clear: 'both' },
8+
},
9+
variants('clear')
10+
)
11+
}
12+
}

stubs/defaultConfig.stub.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,7 @@ module.exports = {
475475
flexShrink: ['responsive'],
476476
flexWrap: ['responsive'],
477477
float: ['responsive'],
478+
clear: ['responsive'],
478479
fontFamily: ['responsive'],
479480
fontSize: ['responsive'],
480481
fontSmoothing: ['responsive'],

0 commit comments

Comments
 (0)