Skip to content

Commit 6aa1af3

Browse files
committed
Merge branch 'jake-dohm-fix-list-reset-overwrite'
2 parents 41f232a + 78d6642 commit 6aa1af3

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

__tests__/fixtures/tailwind-output.css

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,12 @@ button,
586586
}
587587
}
588588

589+
.list-reset {
590+
list-style: none;
591+
margin: 0;
592+
padding: 0;
593+
}
594+
589595
.appearance-none {
590596
appearance: none;
591597
}
@@ -3534,18 +3540,18 @@ button,
35343540
cursor: not-allowed;
35353541
}
35363542

3537-
.list-reset {
3538-
list-style: none;
3539-
margin: 0;
3540-
padding: 0;
3541-
}
3542-
35433543
.example {
35443544
font-weight: 700;
35453545
color: #e3342f;
35463546
}
35473547

35483548
@media (min-width: 576px) {
3549+
.sm\:list-reset {
3550+
list-style: none;
3551+
margin: 0;
3552+
padding: 0;
3553+
}
3554+
35493555
.sm\:appearance-none {
35503556
appearance: none;
35513557
}
@@ -6494,19 +6500,19 @@ button,
64946500
cursor: not-allowed;
64956501
}
64966502

6497-
.sm\:list-reset {
6498-
list-style: none;
6499-
margin: 0;
6500-
padding: 0;
6501-
}
6502-
65036503
.sm\:example {
65046504
font-weight: 700;
65056505
color: #e3342f;
65066506
}
65076507
}
65086508

65096509
@media (min-width: 768px) {
6510+
.md\:list-reset {
6511+
list-style: none;
6512+
margin: 0;
6513+
padding: 0;
6514+
}
6515+
65106516
.md\:appearance-none {
65116517
appearance: none;
65126518
}
@@ -9455,19 +9461,19 @@ button,
94559461
cursor: not-allowed;
94569462
}
94579463

9458-
.md\:list-reset {
9459-
list-style: none;
9460-
margin: 0;
9461-
padding: 0;
9462-
}
9463-
94649464
.md\:example {
94659465
font-weight: 700;
94669466
color: #e3342f;
94679467
}
94689468
}
94699469

94709470
@media (min-width: 992px) {
9471+
.lg\:list-reset {
9472+
list-style: none;
9473+
margin: 0;
9474+
padding: 0;
9475+
}
9476+
94719477
.lg\:appearance-none {
94729478
appearance: none;
94739479
}
@@ -12416,19 +12422,19 @@ button,
1241612422
cursor: not-allowed;
1241712423
}
1241812424

12419-
.lg\:list-reset {
12420-
list-style: none;
12421-
margin: 0;
12422-
padding: 0;
12423-
}
12424-
1242512425
.lg\:example {
1242612426
font-weight: 700;
1242712427
color: #e3342f;
1242812428
}
1242912429
}
1243012430

1243112431
@media (min-width: 1200px) {
12432+
.xl\:list-reset {
12433+
list-style: none;
12434+
margin: 0;
12435+
padding: 0;
12436+
}
12437+
1243212438
.xl\:appearance-none {
1243312439
appearance: none;
1243412440
}
@@ -15377,12 +15383,6 @@ button,
1537715383
cursor: not-allowed;
1537815384
}
1537915385

15380-
.xl\:list-reset {
15381-
list-style: none;
15382-
margin: 0;
15383-
padding: 0;
15384-
}
15385-
1538615386
.xl\:example {
1538715387
font-weight: 700;
1538815388
color: #e3342f;

src/lib/generateUtilities.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ export default function(config) {
4444
css.walkAtRules('tailwind', atRule => {
4545
if (atRule.params === 'utilities') {
4646
const utilities = _.flatten([
47+
lists(options),
4748
forms(options),
4849
textSizes(options),
4950
textWeights(options),
@@ -78,7 +79,6 @@ export default function(config) {
7879
pointerEvents(options),
7980
resize(options),
8081
cursor(options),
81-
lists(options),
8282
])
8383

8484
atRule.before(container(options))

0 commit comments

Comments
 (0)