Merge branch 'master' of https://github.com/tailwindlabs/tailwindcss-forms

# Conflicts:
#	src/index.js

Author: chasegiunta

CHANGELOG.md

@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Nothing yet!
 
+## [0.2.1] - 2020-11-17
+
+### Fixed
+
+- Fix issue where default checkbox/radio border color took precedence over user border color on focus ([d0b9fd9](https://github.com/tailwindlabs/tailwindcss-forms/commit/d0b9fd9))
+
 ## [0.2.0] - 2020-11-16
 
 ### Changed
@@ -44,7 +50,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Initial release!
 
-[unreleased]: https://github.com/tailwindlabs/tailwindcss-forms/compare/v0.2.0...HEAD
+[unreleased]: https://github.com/tailwindlabs/tailwindcss-forms/compare/v0.2.1...HEAD
+[0.2.1]: https://github.com/tailwindlabs/tailwindcss-forms/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/tailwindlabs/tailwindcss-forms/compare/v0.1.4...v0.2.0
 [0.1.4]: https://github.com/tailwindlabs/tailwindcss-forms/compare/v0.1.3...v0.1.4
 [0.1.3]: https://github.com/tailwindlabs/tailwindcss-forms/compare/v0.1.2...v0.1.3

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Tailwind Labs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

index.html

@@ -119,7 +119,7 @@ <h2 class="text-2xl font-bold">Simple</h2>
                     <label class="inline-flex items-center">
                       <input
                         type="checkbox"
-                        class="rounded border-gray-300 text-indigo-600 shadow-sm focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50"
+                        class="rounded border-gray-300 text-indigo-600 shadow-sm focus:border-indigo-300 focus:ring focus:ring-offset-0 focus:ring-indigo-200 focus:ring-opacity-50"
                         checked
                       />
                       <span class="ml-2">Email me news and special offers</span>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/forms",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "main": "src/index.js",
   "license": "MIT",
   "repository": "https://github.com/tailwindlabs/tailwindcss-forms",
@@ -14,14 +14,21 @@
     "trailingComma": "es5"
   },
   "scripts": {
-    "prepublishOnly": "node scripts/build.js"
+    "dev": "concurrently \"npm run serve\" \"npm run watch\"",
+    "serve": "live-server .",
+    "watch": "chokidar \"./src/**/*.js\" -c \"npm run build\"",
+    "build": "node scripts/build.js",
+    "prepublishOnly": "npm run build"
   },
   "peerDependencies": {
     "tailwindcss":">=2.0.0"
   },
   "devDependencies": {
     "autoprefixer": "^10.0.2",
+    "chokidar-cli": "^2.1.0",
     "clean-css": "^4.2.1",
+    "concurrently": "^5.3.0",
+    "live-server": "^1.2.1",
     "postcss": "^8.1.7",
     "tailwindcss": "^2.0.3"
   },

src/index.js

@@ -125,7 +125,6 @@ const forms = plugin.withOptions(function (options) {
         '--tw-ring-offset-shadow': `var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color)`,
         '--tw-ring-shadow': `var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color)`,
         'box-shadow': `var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000)`,
-        'border-color': theme('colors.gray.500', colors.gray[500]),
       },
 
       [swap(