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.

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

change in theme #137

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
],
"license": "MIT",
"require": {
"laravel/framework": "^8.0",
"laravel/ui": "^3.0"
"laravel/framework": "^9.0",
"laravel/ui": "^3.4"
},
"autoload": {
"psr-4": {
Expand Down
15 changes: 7 additions & 8 deletions src/TailwindCssPreset.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,10 @@ public static function installAuth()
protected static function updatePackageArray(array $packages)
{
return array_merge([
'@tailwindcss/ui' => '^0.3',
'autoprefixer' => '^9.6',
'laravel-mix' => '^5.0.1',
'postcss-import' => '^12.0',
'postcss-nested' => '^4.2',
'tailwindcss' => '^1.8',
'vue-template-compiler' => '^2.6.11',
'tailwindcss' => '^3.0.23',
'postcss' => '^8.4.12',
'autoprefixer' => '^10.4.4',
'laravel-mix' => '^6.0',
], Arr::except($packages, [
'bootstrap',
'bootstrap-sass',
Expand Down Expand Up @@ -65,6 +62,8 @@ protected static function updateBootstrapping()
copy(__DIR__.'/tailwindcss-stubs/tailwind.config.js', base_path('tailwind.config.js'));

copy(__DIR__.'/tailwindcss-stubs/webpack.mix.js', base_path('webpack.mix.js'));

// copy(__DIR__.'/tailwindcss-stubs/postcss.config.js', base_path('postcss.config.js'));

copy(__DIR__.'/tailwindcss-stubs/resources/js/bootstrap.js', resource_path('js/bootstrap.js'));
}
Expand Down Expand Up @@ -119,7 +118,7 @@ protected static function scaffoldAuth()
protected static function compileControllerStub()
{
return str_replace(
'{{namespace}}',
'{{ namespace }}',
Container::getInstance()->getNamespace(),
file_get_contents(__DIR__.'/tailwindcss-stubs/controllers/HomeController.stub')
);
Expand Down
4 changes: 2 additions & 2 deletions src/tailwindcss-stubs/resources/views/auth/login.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</label>

<input id="email" type="email"
class="form-input w-full @error('email') border-red-500 @enderror" name="email"
class="form-input w-full px-4 py-3 @error('email') border-red-500 @enderror" name="email"
value="{{ old('email') }}" required autocomplete="email" autofocus>

@error('email')
Expand All @@ -35,7 +35,7 @@ class="form-input w-full @error('email') border-red-500 @enderror" name="email"
</label>

<input id="password" type="password"
class="form-input w-full @error('password') border-red-500 @enderror" name="password"
class="form-input w-full px-4 py-3 @error('password') border-red-500 @enderror" name="password"
required>

@error('password')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</label>

<input id="password" type="password"
class="form-input w-full @error('password') border-red-500 @enderror" name="password"
class="form-input w-full px-4 py-3 @error('password') border-red-500 @enderror" name="password"
required autocomplete="new-password">

@error('password')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</label>

<input id="email" type="email"
class="form-input w-full @error('email') border-red-500 @enderror" name="email"
class="form-input w-full px-4 py-3 @error('email') border-red-500 @enderror" name="email"
value="{{ old('email') }}" required autocomplete="email" autofocus>

@error('email')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</label>

<input id="email" type="email"
class="form-input w-full @error('email') border-red-500 @enderror" name="email"
class="form-input w-full px-4 py-3 @error('email') border-red-500 @enderror" name="email"
value="{{ $email ?? old('email') }}" required autocomplete="email" autofocus>

@error('email')
Expand All @@ -37,7 +37,7 @@ class="form-input w-full @error('email') border-red-500 @enderror" name="email"
</label>

<input id="password" type="password"
class="form-input w-full @error('password') border-red-500 @enderror" name="password"
class="form-input w-full px-4 py-3 @error('password') border-red-500 @enderror" name="password"
required autocomplete="new-password">

@error('password')
Expand All @@ -52,7 +52,7 @@ class="form-input w-full @error('password') border-red-500 @enderror" name="pass
{{ __('Confirm Password') }}:
</label>

<input id="password-confirm" type="password" class="form-input w-full"
<input id="password-confirm" type="password" class="form-input w-full px-4 py-3"
name="password_confirmation" required autocomplete="new-password">
</div>

Expand Down
8 changes: 4 additions & 4 deletions src/tailwindcss-stubs/resources/views/auth/register.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{{ __('Name') }}:
</label>

<input id="name" type="text" class="form-input w-full @error('name') border-red-500 @enderror"
<input id="name" type="text" class="form-input w-full px-4 py-3 @error('name') border-red-500 @enderror"
name="name" value="{{ old('name') }}" required autocomplete="name" autofocus>

@error('name')
Expand All @@ -35,7 +35,7 @@
</label>

<input id="email" type="email"
class="form-input w-full @error('email') border-red-500 @enderror" name="email"
class="form-input w-full px-4 py-3 @error('email') border-red-500 @enderror" name="email"
value="{{ old('email') }}" required autocomplete="email">

@error('email')
Expand All @@ -51,7 +51,7 @@ class="form-input w-full @error('email') border-red-500 @enderror" name="email"
</label>

<input id="password" type="password"
class="form-input w-full @error('password') border-red-500 @enderror" name="password"
class="form-input w-full px-4 py-3 @error('password') border-red-500 @enderror" name="password"
required autocomplete="new-password">

@error('password')
Expand All @@ -66,7 +66,7 @@ class="form-input w-full @error('password') border-red-500 @enderror" name="pass
{{ __('Confirm Password') }}:
</label>

<input id="password-confirm" type="password" class="form-input w-full"
<input id="password-confirm" type="password" class="form-input w-full px-4 py-3"
name="password_confirmation" required autocomplete="new-password">
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</head>
<body class="bg-gray-100 h-screen antialiased leading-none font-sans">
<div id="app">
<header class="bg-blue-900 py-6">
<header class="bg-blue-900 py-3">
<div class="container mx-auto flex justify-between items-center px-6">
<div>
<a href="{{ url('/') }}" class="text-lg font-semibold text-gray-100 no-underline">
Expand Down
11 changes: 5 additions & 6 deletions src/tailwindcss-stubs/tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
module.exports = {
purge: [
'./resources/views/**/*.blade.php',
'./resources/css/**/*.css',
content: [
"./resources/**/*.blade.php",
"./resources/**/*.js",
"./resources/**/*.vue",
],
theme: {
extend: {}
},
variants: {},
plugins: [
require('@tailwindcss/ui'),
]
}
}
5 changes: 1 addition & 4 deletions src/tailwindcss-stubs/webpack.mix.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,10 @@ const mix = require('laravel-mix');
mix
.js('resources/js/app.js', 'public/js')
.postCss('resources/css/app.css', 'public/css', [
require('postcss-import'),
require('tailwindcss'),
require('postcss-nested'),
require('autoprefixer'),
]);

if (mix.inProduction()) {
mix
.version();
}
}