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 pull request #84 from tailwindcss/simplify-margin-auto-utilities

Browse Source 
[0.2] Simplify margin auto utilities
This commit is contained in:
Adam Wathan 2017-11-06 15:37:55 -05:00 committed by GitHub
commit 8b0c50bc81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 152 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2959,36 +2959,6 @@ button,
margin: 2rem;
}
.mt-px {
margin-top: 1px;
}
.mr-px {
margin-right: 1px;
}
.mb-px {
margin-bottom: 1px;
}
.ml-px {
margin-left: 1px;
}
.mx-px {
margin-left: 1px;
margin-right: 1px;
}
.my-px {
margin-top: 1px;
margin-bottom: 1px;
}
.m-px {
margin: 1px;
}
.mt-auto {
margin-top: auto;
}
@ -3019,6 +2989,36 @@ button,
margin: auto;
}
.mt-px {
margin-top: 1px;
}
.mr-px {
margin-right: 1px;
}
.mb-px {
margin-bottom: 1px;
}
.ml-px {
margin-left: 1px;
}
.mx-px {
margin-left: 1px;
margin-right: 1px;
}
.my-px {
margin-top: 1px;
margin-bottom: 1px;
}
.m-px {
margin: 1px;
}
.-mt-0 {
margin-top: 0;
}
@ -5919,36 +5919,6 @@ button,
margin: 2rem;
}
.sm\:mt-px {
margin-top: 1px;
}
.sm\:mr-px {
margin-right: 1px;
}
.sm\:mb-px {
margin-bottom: 1px;
}
.sm\:ml-px {
margin-left: 1px;
}
.sm\:mx-px {
margin-left: 1px;
margin-right: 1px;
}
.sm\:my-px {
margin-top: 1px;
margin-bottom: 1px;
}
.sm\:m-px {
margin: 1px;
}
.sm\:mt-auto {
margin-top: auto;
}
@ -5979,6 +5949,36 @@ button,
margin: auto;
}
.sm\:mt-px {
margin-top: 1px;
}
.sm\:mr-px {
margin-right: 1px;
}
.sm\:mb-px {
margin-bottom: 1px;
}
.sm\:ml-px {
margin-left: 1px;
}
.sm\:mx-px {
margin-left: 1px;
margin-right: 1px;
}
.sm\:my-px {
margin-top: 1px;
margin-bottom: 1px;
}
.sm\:m-px {
margin: 1px;
}
.sm\:-mt-0 {
margin-top: 0;
}
@ -8880,36 +8880,6 @@ button,
margin: 2rem;
}
.md\:mt-px {
margin-top: 1px;
}
.md\:mr-px {
margin-right: 1px;
}
.md\:mb-px {
margin-bottom: 1px;
}
.md\:ml-px {
margin-left: 1px;
}
.md\:mx-px {
margin-left: 1px;
margin-right: 1px;
}
.md\:my-px {
margin-top: 1px;
margin-bottom: 1px;
}
.md\:m-px {
margin: 1px;
}
.md\:mt-auto {
margin-top: auto;
}
@ -8940,6 +8910,36 @@ button,
margin: auto;
}
.md\:mt-px {
margin-top: 1px;
}
.md\:mr-px {
margin-right: 1px;
}
.md\:mb-px {
margin-bottom: 1px;
}
.md\:ml-px {
margin-left: 1px;
}
.md\:mx-px {
margin-left: 1px;
margin-right: 1px;
}
.md\:my-px {
margin-top: 1px;
margin-bottom: 1px;
}
.md\:m-px {
margin: 1px;
}
.md\:-mt-0 {
margin-top: 0;
}
@ -11841,36 +11841,6 @@ button,
margin: 2rem;
}
.lg\:mt-px {
margin-top: 1px;
}
.lg\:mr-px {
margin-right: 1px;
}
.lg\:mb-px {
margin-bottom: 1px;
}
.lg\:ml-px {
margin-left: 1px;
}
.lg\:mx-px {
margin-left: 1px;
margin-right: 1px;
}
.lg\:my-px {
margin-top: 1px;
margin-bottom: 1px;
}
.lg\:m-px {
margin: 1px;
}
.lg\:mt-auto {
margin-top: auto;
}
@ -11901,6 +11871,36 @@ button,
margin: auto;
}
.lg\:mt-px {
margin-top: 1px;
}
.lg\:mr-px {
margin-right: 1px;
}
.lg\:mb-px {
margin-bottom: 1px;
}
.lg\:ml-px {
margin-left: 1px;
}
.lg\:mx-px {
margin-left: 1px;
margin-right: 1px;
}
.lg\:my-px {
margin-top: 1px;
margin-bottom: 1px;
}
.lg\:m-px {
margin: 1px;
}
.lg\:-mt-0 {
margin-top: 0;
}
@ -14802,36 +14802,6 @@ button,
margin: 2rem;
}
.xl\:mt-px {
margin-top: 1px;
}
.xl\:mr-px {
margin-right: 1px;
}
.xl\:mb-px {
margin-bottom: 1px;
}
.xl\:ml-px {
margin-left: 1px;
}
.xl\:mx-px {
margin-left: 1px;
margin-right: 1px;
}
.xl\:my-px {
margin-top: 1px;
margin-bottom: 1px;
}
.xl\:m-px {
margin: 1px;
}
.xl\:mt-auto {
margin-top: auto;
}
@ -14862,6 +14832,36 @@ button,
margin: auto;
}
.xl\:mt-px {
margin-top: 1px;
}
.xl\:mr-px {
margin-right: 1px;
}
.xl\:mb-px {
margin-bottom: 1px;
}
.xl\:ml-px {
margin-left: 1px;
}
.xl\:mx-px {
margin-left: 1px;
margin-right: 1px;
}
.xl\:my-px {
margin-top: 1px;
margin-bottom: 1px;
}
.xl\:m-px {
margin: 1px;
}
.xl\:-mt-0 {
margin-top: 0;
}

1
defaultConfig.js
View File

@ -644,6 +644,7 @@ module.exports = {
*/
margin: {
'auto': 'auto',
'px': '1px',
'0': '0',
'1': '0.25rem',

2
docs/source/docs/spacing.blade.md
View File

@ -49,6 +49,6 @@ For example, `.pt-2` would add `.5rem` of padding to the top of the element, `.m
<div><code class="inline-block my-1 mr-1 px-2 py-1 font-mono border rounded">6</code> 1.5rem</div>
<div><code class="inline-block my-1 mr-1 px-2 py-1 font-mono border rounded">8</code> 2rem</div>
<div><code class="inline-block my-1 mr-1 px-1 py-1 font-mono border rounded">px</code> 1px</div>
<div><code class="inline-block my-1 mr-1 px-1 py-1 font-mono border rounded">auto</code> auto <span class="text-slate-light text-xs">(horizontal margins only)</span></div>
<div><code class="inline-block my-1 mr-1 px-1 py-1 font-mono border rounded">auto</code> auto <span class="text-slate-light text-xs">(margins only)</span></div>
</div>
</div>

25
src/generators/spacing.js
View File

@ -97,31 +97,6 @@ export default function({ padding, margin, negativeMargin }) {
return _.flatten([
definePadding(padding),
defineMargin(margin),
defineClasses({
'mt-auto': {
'margin-top': 'auto',
},
'mr-auto': {
'margin-right': 'auto',
},
'mb-auto': {
'margin-bottom': 'auto',
},
'ml-auto': {
'margin-left': 'auto',
},
'mx-auto': {
'margin-left': 'auto',
'margin-right': 'auto',
},
'my-auto': {
'margin-top': 'auto',
'margin-bottom': 'auto',
},
'm-auto': {
margin: 'auto',
},
}),
defineNegativeMargin(negativeMargin),
])
}