Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates Tailwind on Installation to v3.0.0 #110

Merged
merged 4 commits into from
Dec 10, 2021
Merged

Updates Tailwind on Installation to v3.0.0 #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c19876
Change purge to content Tailwind v3.0.0
RhysLees Dec 10, 2021
1806306
Changes flex-shrink to shrink Tailwind v3.0.0
RhysLees Dec 10, 2021
c14d1b1
Updates Tailwind on Installation to v3.0.0
RhysLees Dec 10, 2021
af8dbcf
Removed tailwind variants as no longer required
RhysLees Dec 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Console/InstallsBladeStack.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ protected function installBladeStack()
// NPM Packages...
$this->updateNodePackages(function ($packages) {
return [
'@tailwindcss/forms' => '^0.2.1',
'@tailwindcss/forms' => '^0.4.0',
'alpinejs' => '^3.4.2',
'autoprefixer' => '^10.1.0',
'postcss' => '^8.2.1',
'postcss-import' => '^12.0.1',
'tailwindcss' => '^2.0.2',
'postcss-import' => '^14.0.1',
'tailwindcss' => '^3.0.0',
] + $packages;
});

Expand Down
8 changes: 4 additions & 4 deletions src/Console/InstallsInertiaStacks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ protected function installInertiaVueStack()
'@inertiajs/inertia' => '^0.10.0',
'@inertiajs/inertia-vue3' => '^0.5.1',
'@inertiajs/progress' => '^0.2.6',
'@tailwindcss/forms' => '^0.2.1',
'@tailwindcss/forms' => '^0.4.0',
'@vue/compiler-sfc' => '^3.0.5',
'autoprefixer' => '^10.2.4',
'postcss' => '^8.2.13',
'postcss-import' => '^14.0.1',
'tailwindcss' => '^2.1.2',
'tailwindcss' => '^3.0.0',
'vue' => '^3.0.5',
'vue-loader' => '^16.1.2',
] + $packages;
Expand Down Expand Up @@ -99,11 +99,11 @@ protected function installInertiaReactStack()
'@inertiajs/inertia' => '^0.9.0',
'@inertiajs/inertia-react' => '^0.6.0',
'@inertiajs/progress' => '^0.2.4',
'@tailwindcss/forms' => '^0.3.2',
'@tailwindcss/forms' => '^0.4.0',
'autoprefixer' => '^10.2.4',
'postcss' => '^8.2.13',
'postcss-import' => '^14.0.1',
'tailwindcss' => '^2.1.2',
'tailwindcss' => '^3.0.0',
'react' => '^17.0.2',
'react-dom' => '^17.0.2',
'@babel/preset-react' => '^7.13.13',
Expand Down
2 changes: 1 addition & 1 deletion stubs/default/resources/views/layouts/navigation.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="flex justify-between h-16">
<div class="flex">
<!-- Logo -->
<div class="flex-shrink-0 flex items-center">
<div class="shrink-0 flex items-center">
<a href="{{ route('dashboard') }}">
<x-application-logo class="block h-10 w-auto fill-current text-gray-600" />
</a>
Expand Down
8 changes: 1 addition & 7 deletions stubs/default/tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const defaultTheme = require('tailwindcss/defaultTheme');

module.exports = {
purge: [
content: [
'./vendor/laravel/framework/src/Illuminate/Pagination/resources/views/*.blade.php',
'./storage/framework/views/*.php',
'./resources/views/**/*.blade.php',
Expand All @@ -15,11 +15,5 @@ module.exports = {
},
},

variants: {
extend: {
opacity: ['disabled'],
},
},

plugins: [require('@tailwindcss/forms')],
};
8 changes: 1 addition & 7 deletions stubs/inertia-common/tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const defaultTheme = require('tailwindcss/defaultTheme');

module.exports = {
purge: [
content: [
'./vendor/laravel/framework/src/Illuminate/Pagination/resources/views/*.blade.php',
'./storage/framework/views/*.php',
'./resources/views/**/*.blade.php',
Expand All @@ -16,11 +16,5 @@ module.exports = {
},
},

variants: {
extend: {
opacity: ['disabled'],
},
},

plugins: [require('@tailwindcss/forms')],
};
2 changes: 1 addition & 1 deletion stubs/inertia-react/resources/js/Layouts/Authenticated.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default function Authenticated({ auth, header, children }) {
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
<div className="flex justify-between h-16">
<div className="flex">
<div className="flex-shrink-0 flex items-center">
<div className="shrink-0 flex items-center">
<Link href="/">
<ApplicationLogo className="block h-9 w-auto text-gray-500" />
</Link>
Expand Down
2 changes: 1 addition & 1 deletion stubs/inertia-vue/resources/js/Layouts/Authenticated.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div class="flex justify-between h-16">
<div class="flex">
<!-- Logo -->
<div class="flex-shrink-0 flex items-center">
<div class="shrink-0 flex items-center">
<Link :href="route('dashboard')">
<BreezeApplicationLogo class="block h-9 w-auto" />
</Link>
Expand Down