archive-gh-me/tailwindcss
1
0
Fork 0
mirror of https://github.com/tailwindlabs/tailwindcss.git synced 2025-12-08 21:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'jake-dohm-fix-list-reset-overwrite'

Browse Source
This commit is contained in:
Adam Wathan 2017-11-06 11:37:15 -05:00
commit 6aa1af3f32
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
__tests__/fixtures/tailwind-output.css
View File

@ -586,6 +586,12 @@ button,
}
}
.list-reset {
list-style: none;
margin: 0;
padding: 0;
}
.appearance-none {
appearance: none;
}
@ -3534,18 +3540,18 @@ button,
cursor: not-allowed;
}
.list-reset {
list-style: none;
margin: 0;
padding: 0;
}
.example {
font-weight: 700;
color: #e3342f;
}
@media (min-width: 576px) {
.sm\:list-reset {
list-style: none;
margin: 0;
padding: 0;
}
.sm\:appearance-none {
appearance: none;
}
@ -6494,12 +6500,6 @@ button,
cursor: not-allowed;
}
.sm\:list-reset {
list-style: none;
margin: 0;
padding: 0;
}
.sm\:example {
font-weight: 700;
color: #e3342f;
@ -6507,6 +6507,12 @@ button,
}
@media (min-width: 768px) {
.md\:list-reset {
list-style: none;
margin: 0;
padding: 0;
}
.md\:appearance-none {
appearance: none;
}
@ -9455,12 +9461,6 @@ button,
cursor: not-allowed;
}
.md\:list-reset {
list-style: none;
margin: 0;
padding: 0;
}
.md\:example {
font-weight: 700;
color: #e3342f;
@ -9468,6 +9468,12 @@ button,
}
@media (min-width: 992px) {
.lg\:list-reset {
list-style: none;
margin: 0;
padding: 0;
}
.lg\:appearance-none {
appearance: none;
}
@ -12416,12 +12422,6 @@ button,
cursor: not-allowed;
}
.lg\:list-reset {
list-style: none;
margin: 0;
padding: 0;
}
.lg\:example {
font-weight: 700;
color: #e3342f;
@ -12429,6 +12429,12 @@ button,
}
@media (min-width: 1200px) {
.xl\:list-reset {
list-style: none;
margin: 0;
padding: 0;
}
.xl\:appearance-none {
appearance: none;
}
@ -15377,12 +15383,6 @@ button,
cursor: not-allowed;
}
.xl\:list-reset {
list-style: none;
margin: 0;
padding: 0;
}
.xl\:example {
font-weight: 700;
color: #e3342f;

2
src/lib/generateUtilities.js
View File

@ -44,6 +44,7 @@ export default function(config) {
css.walkAtRules('tailwind', atRule => {
if (atRule.params === 'utilities') {
const utilities = _.flatten([
lists(options),
forms(options),
textSizes(options),
textWeights(options),
@ -78,7 +79,6 @@ export default function(config) {
pointerEvents(options),
resize(options),
cursor(options),
lists(options),
])
atRule.before(container(options))