Skip to content

Commit

Permalink
Upgrade to Tailwind 2.0 🎉 (roots#40)
Browse files Browse the repository at this point in the history
  • Loading branch information
simonswiss authored Dec 9, 2020
1 parent 6d8c105 commit f832afc
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/Presets/Tailwind.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Tailwind extends Preset
/** {@inheritdoc} */
protected function updatePackagesArray(array $packages)
{
$packages['devDependencies']['tailwindcss'] = '^1.0.0';
$packages['devDependencies']['tailwindcss'] = '^2.0.1';

return $packages;
}
Expand Down
8 changes: 5 additions & 3 deletions src/Presets/stubs/Tailwind/build/webpack.config.preset.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,13 @@ module.exports = {
{
loader: 'postcss',
options: {
parser: config.enabled.optimize
postcssOptions: {
parser: config.enabled.optimize
? 'postcss-safe-parser'
: undefined,
plugins: postcssPlugins,
sourceMap: false,
plugins: postcssPlugins,
sourceMap: false,
}
},
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
@apply block appearance-none w-full py-1 px-2 mb-1 text-base leading-normal bg-white text-gray-700 border border-gray-500 rounded;

&:focus {
@apply shadow-outline;
@apply ring;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/Presets/stubs/Tailwind/styles/components/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}

.search-form .search-submit {
@apply inline-block align-middle text-center select-none border font-normal whitespace-no-wrap py-2 px-4 rounded text-base leading-normal no-underline text-gray-100 bg-gray-500;
@apply inline-block align-middle text-center select-none border font-normal whitespace-nowrap py-2 px-4 rounded text-base leading-normal no-underline text-gray-100 bg-gray-500;

&:hover {
@apply bg-gray-400;
Expand Down
3 changes: 0 additions & 3 deletions src/Presets/stubs/Tailwind/styles/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@ module.exports = {
},
transparent: 'transparent',
},
shadows: {
outline: '0 0 0 3px rgba(82,93,220,0.3)',
},
container: {
center: true,
padding: '1rem',
Expand Down

0 comments on commit f832afc

Please sign in to comment.