From 2b1a6959d3643b6b362f32c2204f5f7daf4afae1 Mon Sep 17 00:00:00 2001 From: Jonathan Reinink Date: Tue, 31 Oct 2017 17:05:10 -0400 Subject: [PATCH] Rename "reset" to "preflight" --- README.md | 2 +- css/tailwind.css | 2 +- docs/source/_assets/less/main.less | 2 +- docs/source/docs/adding-new-utilities.blade.md | 8 ++++---- docs/source/docs/extracting-component-classes.blade.md | 2 +- docs/source/docs/functions-and-directives.blade.md | 2 +- docs/source/docs/installation.blade.md | 2 +- src/index.js | 4 ++-- ...stituteResetAtRule.js => substitutePreflightAtRule.js} | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) rename src/lib/{substituteResetAtRule.js => substitutePreflightAtRule.js} (87%) diff --git a/README.md b/README.md index bc6aa7ce4..0eb194e0c 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ A utility-first CSS framework for rapid UI development. * You can see the styles here: * https://github.com/nothingworksinc/tailwindcss/blob/master/css/preflight.css */ - @tailwind reset; + @tailwind preflight; /** * Here you would import any custom component classes; stuff that you'd diff --git a/css/tailwind.css b/css/tailwind.css index 6d8093496..ac3999689 100644 --- a/css/tailwind.css +++ b/css/tailwind.css @@ -1,4 +1,4 @@ -@tailwind reset; +@tailwind preflight; @tailwind utilities; diff --git a/docs/source/_assets/less/main.less b/docs/source/_assets/less/main.less index aab860df3..493339b75 100644 --- a/docs/source/_assets/less/main.less +++ b/docs/source/_assets/less/main.less @@ -1,4 +1,4 @@ -@tailwind reset; +@tailwind preflight; html { font-size: 14px; diff --git a/docs/source/docs/adding-new-utilities.blade.md b/docs/source/docs/adding-new-utilities.blade.md index 9ed7efa26..c875ef7f9 100644 --- a/docs/source/docs/adding-new-utilities.blade.md +++ b/docs/source/docs/adding-new-utilities.blade.md @@ -14,7 +14,7 @@ Deciding on the best way to extend a framework can be paralyzing, so here's some A bare-bones Tailwind setup is a single CSS file that looks like this: ```less -@@tailwind reset; +@@tailwind preflight; @@tailwind utilities; ``` @@ -47,7 +47,7 @@ For this reason, **we recommend defining any custom utility classes at the end o ```less -@@tailwind reset; +@@tailwind preflight; @@tailwind utilities; @@ -61,7 +61,7 @@ This way your custom utilities can override Tailwind utilities if needed, althou If you're using a preprocessor like Less, Sass, or Stylus, consider keeping your utilities in a separate file and importing them: ```less -@@tailwind reset; +@@tailwind preflight; @@tailwind utilities; @@ -73,7 +73,7 @@ If you're using a preprocessor like Less, Sass, or Stylus, consider keeping your If you'd like to create responsive versions of your own utilities based on the breakpoints defined in your Tailwind config file, wrap your utilities in the `@responsive { ... }` directive: ```less -@@tailwind reset; +@@tailwind preflight; @@tailwind utilities; diff --git a/docs/source/docs/extracting-component-classes.blade.md b/docs/source/docs/extracting-component-classes.blade.md index 48b1dc2a2..d0d1ddf47 100644 --- a/docs/source/docs/extracting-component-classes.blade.md +++ b/docs/source/docs/extracting-component-classes.blade.md @@ -174,7 +174,7 @@ Since Tailwind's utility classes don't rely on `!important` to defeat other styl Here's an example: ```less -@@tailwind reset; +@@tailwind preflight; @import "components/buttons"; diff --git a/docs/source/docs/functions-and-directives.blade.md b/docs/source/docs/functions-and-directives.blade.md index 91f28dd6e..39231153e 100644 --- a/docs/source/docs/functions-and-directives.blade.md +++ b/docs/source/docs/functions-and-directives.blade.md @@ -19,7 +19,7 @@ Use the `@@tailwind` directive to insert Tailwind's `reset` and `utilities` styl * You can see the styles here: * https://github.com/tailwindcss/tailwindcss/blob/master/css/preflight.css */ -@@tailwind reset; +@@tailwind preflight; /** * This injects all of Tailwind's utility classes, generated based on your diff --git a/docs/source/docs/installation.blade.md b/docs/source/docs/installation.blade.md index 8e06658bd..f667073c6 100644 --- a/docs/source/docs/installation.blade.md +++ b/docs/source/docs/installation.blade.md @@ -44,7 +44,7 @@ To avoid specificity issues, we highly recommend structuring your main styleshee * You can see the styles here: * https://github.com/tailwindcss/tailwindcss/blob/master/css/preflight.css */ -@@tailwind reset; +@@tailwind preflight; /** * Here you would import any custom component classes; stuff that you'd diff --git a/src/index.js b/src/index.js index 730c7e891..cc02186bb 100644 --- a/src/index.js +++ b/src/index.js @@ -5,7 +5,7 @@ import _ from 'lodash' import postcss from 'postcss' import stylefmt from 'stylefmt' -import substituteResetAtRule from './lib/substituteResetAtRule' +import substitutePreflightAtRule from './lib/substitutePreflightAtRule' import evaluateTailwindFunctions from './lib/evaluateTailwindFunctions' import generateUtilities from './lib/generateUtilities' import substituteHoverableAtRules from './lib/substituteHoverableAtRules' @@ -24,7 +24,7 @@ const plugin = postcss.plugin('tailwind', (config) => { } return postcss([ - substituteResetAtRule(config), + substitutePreflightAtRule(config), evaluateTailwindFunctions(config), generateUtilities(config), substituteHoverableAtRules(config), diff --git a/src/lib/substituteResetAtRule.js b/src/lib/substitutePreflightAtRule.js similarity index 87% rename from src/lib/substituteResetAtRule.js rename to src/lib/substitutePreflightAtRule.js index 5bab925b5..18478d0ef 100644 --- a/src/lib/substituteResetAtRule.js +++ b/src/lib/substitutePreflightAtRule.js @@ -4,7 +4,7 @@ import postcss from 'postcss' export default function(options) { return function (css) { css.walkAtRules('tailwind', atRule => { - if (atRule.params === 'reset') { + if (atRule.params === 'preflight') { atRule.before(postcss.parse(fs.readFileSync(`${__dirname}/../../css/preflight.css`, 'utf8'))) atRule.remove() }