Merge branch 'master' of github.com:tailwindcss/tailwindcss

reinink · reinink · commit 89cf0bbb2deb · 2017-11-01T00:14:13.000-04:00
diff --git a/defaultConfig.js b/defaultConfig.js
@@ -149,7 +149,7 @@ module.exports = {
 
   /*
   |-----------------------------------------------------------------------------
-  | Screens                     https://tailwindcss.com//docs/responsive-design
+  | Screens                      https://tailwindcss.com/docs/responsive-design
   |-----------------------------------------------------------------------------
   |
   | Screens in Tailwind are essentially CSS media queries. They define the
@@ -363,7 +363,7 @@ module.exports = {
   |
   | Here is where you define your border widths. Take note that border
   | widths require a special "default" value set as well. This is the
-  | width that will be used when you do not specify a border color.
+  | width that will be used when you do not specify a border width.
   |
   | Class name: .border{-side?}{-width?}
   |

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ module.exports = {`
`149`	`149`
`150`	`150`	`/*`
`151`	`151`	`\|-----------------------------------------------------------------------------`
`152`		`- \| Screens https://tailwindcss.com//docs/responsive-design`
	`152`	`+ \| Screens https://tailwindcss.com/docs/responsive-design`
`153`	`153`	`\|-----------------------------------------------------------------------------`
`154`	`154`	`\|`
`155`	`155`	`\| Screens in Tailwind are essentially CSS media queries. They define the`
`@@ -363,7 +363,7 @@ module.exports = {`
`363`	`363`	`\|`
`364`	`364`	`\| Here is where you define your border widths. Take note that border`
`365`	`365`	`\| widths require a special "default" value set as well. This is the`
`366`		`- \| width that will be used when you do not specify a border color.`
	`366`	`+ \| width that will be used when you do not specify a border width.`
`367`	`367`	`\|`
`368`	`368`	`\| Class name: .border{-side?}{-width?}`
`369`	`369`	`\|`