Skip to content

Updates Tailwind on Installation to v3.0.0 #920

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

Merged
merged 4 commits into from
Dec 10, 2021
Merged

Updates Tailwind on Installation to v3.0.0 #920

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
9976901
Changed purge to content
RhysLees Dec 9, 2021
3ecd534
Changes flex-shrink to shrink
RhysLees Dec 9, 2021
cab089e
Updates Tailwind on Installation to v3.0.0
RhysLees Dec 9, 2021
5482bf8
Updated Node Packages for Inertia Stack
RhysLees Dec 9, 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
2 changes: 1 addition & 1 deletion resources/views/components/banner.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<p class="ml-3 font-medium text-sm text-white truncate" x-text="message"></p>
</div>

<div class="flex-shrink-0 sm:ml-3">
<div class="shrink-0 sm:ml-3">
<button
type="button"
class="-mr-1 flex p-2 rounded-md focus:outline-none sm:-mr-2 transition"
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/confirmation-modal.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<x-jet-modal :id="$id" :maxWidth="$maxWidth" {{ $attributes }}>
<div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
<div class="sm:flex sm:items-start">
<div class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10">
<div class="mx-auto shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10">
<svg class="h-6 w-6 text-red-600" stroke="currentColor" fill="none" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"/>
</svg>
Expand Down
12 changes: 6 additions & 6 deletions src/Console/InstallCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,11 @@ protected function installLivewireStack()
// NPM Packages...
$this->updateNodePackages(function ($packages) {
return [
'@tailwindcss/forms' => '^0.3.1',
'@tailwindcss/typography' => '^0.4.0',
'@tailwindcss/forms' => '^0.4.0',
'@tailwindcss/typography' => '^0.5.0',
'alpinejs' => '^3.0.6',
'postcss-import' => '^14.0.1',
'tailwindcss' => '^2.2.2',
'tailwindcss' => '^3.0.0',
] + $packages;
});

Expand Down Expand Up @@ -288,10 +288,10 @@ protected function installInertiaStack()
'@inertiajs/inertia' => '^0.10.0',
'@inertiajs/inertia-vue3' => '^0.5.1',
'@inertiajs/progress' => '^0.2.6',
'@tailwindcss/forms' => '^0.2.1',
'@tailwindcss/typography' => '^0.3.0',
'@tailwindcss/forms' => '^0.4.0',
'@tailwindcss/typography' => '^0.5.0',
'postcss-import' => '^12.0.1',
'tailwindcss' => '^2.0.1',
'tailwindcss' => '^3.0.0',
'vue' => '^3.0.5',
'@vue/compiler-sfc' => '^3.0.5',
'vue-loader' => '^16.1.2',
Expand Down
2 changes: 1 addition & 1 deletion stubs/inertia/resources/js/Jetstream/Banner.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</p>
</div>

<div class="flex-shrink-0 sm:ml-3">
<div class="shrink-0 sm:ml-3">
<button
type="button"
class="-mr-1 flex p-2 rounded-md focus:outline-none sm:-mr-2 transition"
Expand Down
2 changes: 1 addition & 1 deletion stubs/inertia/resources/js/Jetstream/ConfirmationModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modal :show="show" :max-width="maxWidth" :closeable="closeable" @close="close">
<div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
<div class="sm:flex sm:items-start">
<div class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10">
<div class="mx-auto shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10">
<svg class="h-6 w-6 text-red-600" stroke="currentColor" fill="none" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"/>
</svg>
Expand Down
4 changes: 2 additions & 2 deletions stubs/inertia/resources/js/Layouts/AppLayout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,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')">
<jet-application-mark class="block h-9 w-auto" />
</Link>
Expand Down Expand Up @@ -150,7 +150,7 @@
<!-- Responsive Settings Options -->
<div class="pt-4 pb-1 border-t border-gray-200">
<div class="flex items-center px-4">
<div v-if="$page.props.jetstream.managesProfilePhotos" class="flex-shrink-0 mr-3" >
<div v-if="$page.props.jetstream.managesProfilePhotos" class="shrink-0 mr-3" >
<img class="h-10 w-10 rounded-full object-cover" :src="$page.props.user.profile_photo_url" :alt="$page.props.user.name" />
</div>

Expand Down
2 changes: 1 addition & 1 deletion stubs/inertia/tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const defaultTheme = require('tailwindcss/defaultTheme');

module.exports = {
mode: 'jit',
purge: [
content: [
'./vendor/laravel/framework/src/Illuminate/Pagination/resources/views/*.blade.php',
'./vendor/laravel/jetstream/**/*.blade.php',
'./storage/framework/views/*.php',
Expand Down
4 changes: 2 additions & 2 deletions stubs/livewire/resources/views/navigation-menu.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-jet-application-mark class="block h-9 w-auto" />
</a>
Expand Down Expand Up @@ -147,7 +147,7 @@
<div class="pt-4 pb-1 border-t border-gray-200">
<div class="flex items-center px-4">
@if (Laravel\Jetstream\Jetstream::managesProfilePhotos())
<div class="flex-shrink-0 mr-3">
<div class="shrink-0 mr-3">
<img class="h-10 w-10 rounded-full object-cover" src="{{ Auth::user()->profile_photo_url }}" alt="{{ Auth::user()->name }}" />
</div>
@endif
Expand Down
2 changes: 1 addition & 1 deletion stubs/livewire/tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const defaultTheme = require('tailwindcss/defaultTheme');

module.exports = {
mode: 'jit',
purge: [
content: [
'./vendor/laravel/framework/src/Illuminate/Pagination/resources/views/*.blade.php',
'./vendor/laravel/jetstream/**/*.blade.php',
'./storage/framework/views/*.php',
Expand Down