Usage
Responsive
diff --git a/docs/source/styles/text/alignment.md b/docs/source/styles/text/alignment.md
deleted file mode 100644
index 968d8fb77..000000000
--- a/docs/source/styles/text/alignment.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-extends: _layouts.markdown
-title: "Text Alignment"
----
-
-# Text Alignment
-
-
diff --git a/package.json b/package.json
index 751f68bb6..f54aeeb03 100644
--- a/package.json
+++ b/package.json
@@ -36,12 +36,11 @@
"commander": "^2.11.0",
"lodash": "^4.17.4",
"nodemon": "^1.11.0",
- "normalize.css": "^6.0.0",
+ "normalize.css": "^7.0.0",
"postcss": "^6.0.9",
"postcss-import": "^11.0.0",
"postcss-functions": "^3.0.0",
- "stylefmt": "^6.0.0",
- "suitcss-base": "^3.0.0"
+ "stylefmt": "^6.0.0"
},
"browserslist": [
"> 1%"
diff --git a/src/build.js b/src/build.js
index 7694f76a9..f896491bc 100644
--- a/src/build.js
+++ b/src/build.js
@@ -5,10 +5,10 @@ import defaultConfig from './defaultConfig'
console.info('Building Tailwind!')
-fs.readFile('./src/tailwind.css', (err, css) => {
+fs.readFile('./css/tailwind.css', (err, css) => {
postcss([tailwind(defaultConfig)])
.process(css, {
- from: './tailwind.css',
+ from: './css/tailwind.css',
to: './dist/tailwind.css',
map: {inline: false},
})
diff --git a/src/lib/generateUtilities.js b/src/lib/generateUtilities.js
index 456a2e98b..1eff60e1c 100644
--- a/src/lib/generateUtilities.js
+++ b/src/lib/generateUtilities.js
@@ -38,8 +38,8 @@ import zIndex from '../generators/zIndex'
export default function(options) {
return function(css) {
- css.walkAtRules('tailwind-utilities', atRule => {
- if (atRule.params === 'all') {
+ css.walkAtRules('tailwind', atRule => {
+ if (atRule.params === 'utilities') {
const utilities = _.flatten([
appearance(options),
textSizes(options),
diff --git a/src/lib/substituteResetAtRule.js b/src/lib/substituteResetAtRule.js
index 92d4aac41..00c34f6a8 100644
--- a/src/lib/substituteResetAtRule.js
+++ b/src/lib/substituteResetAtRule.js
@@ -1,3 +1,4 @@
+import fs from 'fs'
import postcss from 'postcss'
import postcssImport from 'postcss-import'
@@ -6,27 +7,15 @@ export default function(options) {
return new Promise((resolve, reject) => {
const promises = []
- css.walkAtRules('tailwind-reset', atRule => {
- promises.push(postcssImport.process(postcss.parse(`
- @import "normalize.css";
- @import "suitcss-base";
-
- textarea { resize: vertical; }
- img { max-width: 100%; }
- svg { fill: currentColor; }
- input { font-family: inherit; }
- input::placeholder {
- color: inherit;
- opacity: .7;
- }
- button, [role=button] {
- font-family: inherit;
- cursor: pointer;
- }
- `)).then(result => {
- atRule.before(result.root)
- atRule.remove()
- }))
+ css.walkAtRules('tailwind', atRule => {
+ if (atRule.params === 'reset') {
+ promises.push(postcssImport.process(postcss.parse(fs.readFileSync(`${__dirname}/../../css/preflight.css`, {
+ encoding: 'utf8'
+ }))).then(result => {
+ atRule.before(result.root)
+ atRule.remove()
+ }))
+ }
})
Promise.all(promises).then(resolve)
diff --git a/src/tailwind.css b/src/tailwind.css
deleted file mode 100644
index f1db23555..000000000
--- a/src/tailwind.css
+++ /dev/null
@@ -1,3 +0,0 @@
-@tailwind-reset;
-
-@tailwind-utilities all;
diff --git a/yarn.lock b/yarn.lock
index e8a9635a0..636b908da 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2837,9 +2837,9 @@ normalize-selector@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
-normalize.css@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-6.0.0.tgz#22188c2707c911fb3ad3c1aac0677ff68661bea8"
+normalize.css@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-7.0.0.tgz#abfb1dd82470674e0322b53ceb1aaf412938e4bf"
npm-run-path@^2.0.0:
version "2.0.2"
@@ -3777,11 +3777,11 @@ sugarss@^0.2.0:
dependencies:
postcss "^5.2.4"
-suitcss-base@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/suitcss-base/-/suitcss-base-3.0.0.tgz#83dd53629c37adbdeac11ef6439a7f2ed955f05e"
+suitcss-base@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/suitcss-base/-/suitcss-base-4.0.0.tgz#f3374526410c90e28a3fd8435947f1caa6146eb6"
dependencies:
- normalize.css "^6.0.0"
+ normalize.css "^7.0.0"
supports-color@^2.0.0:
version "2.0.0"