Skip to content

Commit 483f80c

Browse files
Merge branch 'yamenarahman/master' into main
2 parents 95825c7 + 3cabbb5 commit 483f80c

File tree

8 files changed

+7
-132
lines changed

8 files changed

+7
-132
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,17 @@ Add a new i18n string in the `resources/lang/XX/pagination.php` file for each la
3434
This should help with accessibility
3535
```html
3636
<li>
37-
<a href="URL?page=2" class="..."
37+
<a href="URL?page=2" class="..."
3838
aria-label="Goto page #2"
3939
>
4040
2
4141
</a>
4242
</li>
4343
```
4444

45+
#### Pagination
46+
Laravel now supports Tailwind CSS pagination directly. If you would like to use these views in your app, you can refer to [docs](https://laravel.com/docs/master/pagination#using-tailwind).
47+
4548
### Screenshots
4649

4750
![Welcome](/screenshots/welcome.png)
@@ -55,6 +58,3 @@ This should help with accessibility
5558
![Dashboard](/screenshots/dashboard.png)
5659

5760
![Verify](/screenshots/verify.png)
58-
59-
![Pagination](/screenshots/pagination-links.png)
60-
![Simple Pagination](/screenshots/simple-pagination-links.png)

screenshots/pagination-links.png

-1.27 KB
Binary file not shown.
-1.08 KB
Binary file not shown.

src/TailwindCssPreset.php

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
namespace LaravelFrontendPresets\TailwindCssPreset;
44

5-
use Illuminate\Support\Arr;
6-
use Illuminate\Support\Str;
75
use Illuminate\Container\Container;
86
use Illuminate\Filesystem\Filesystem;
7+
use Illuminate\Support\Arr;
8+
use Illuminate\Support\Str;
99
use Laravel\Ui\Presets\Preset;
1010
use Symfony\Component\Finder\SplFileInfo;
1111

@@ -17,7 +17,6 @@ public static function install()
1717
static::updateStyles();
1818
static::updateBootstrapping();
1919
static::updateWelcomePage();
20-
static::updatePagination();
2120
static::removeNodeModules();
2221
}
2322

@@ -67,13 +66,6 @@ protected static function updateBootstrapping()
6766
copy(__DIR__.'/tailwindcss-stubs/resources/js/bootstrap.js', resource_path('js/bootstrap.js'));
6867
}
6968

70-
protected static function updatePagination()
71-
{
72-
(new Filesystem)->delete(resource_path('views/vendor/paginate'));
73-
74-
(new Filesystem)->copyDirectory(__DIR__.'/tailwindcss-stubs/resources/views/vendor/pagination', resource_path('views/vendor/pagination'));
75-
}
76-
7769
protected static function updateWelcomePage()
7870
{
7971
(new Filesystem)->delete(resource_path('views/welcome.blade.php'));

src/TailwindCssPresetServiceProvider.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
namespace LaravelFrontendPresets\TailwindCssPreset;
44

5-
use Illuminate\Pagination\Paginator;
65
use Illuminate\Support\ServiceProvider;
76
use Laravel\Ui\UiCommand;
8-
use Laravel\Ui\AuthCommand;
97

108
class TailwindCssPresetServiceProvider extends ServiceProvider
119
{
@@ -24,9 +22,5 @@ public function boot()
2422

2523
$command->comment('Please run "npm install && npm run dev" to compile your fresh scaffolding.');
2624
});
27-
28-
Paginator::defaultView('pagination::default');
29-
30-
Paginator::defaultSimpleView('pagination::simple-default');
3125
}
3226
}

src/tailwindcss-stubs/resources/views/auth/verify.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</p>
2323

2424
<p class="leading-normal mt-6">
25-
{{ __('If you did not receive the email') }}, <a class="text-blue-500 hover:text-blue-700 no-underline" onclick="event.preventDefault(); document.getElementById('resend-verification-form').submit();">{{ __('click here to request another') }}</a>.
25+
{{ __('If you did not receive the email') }}, <a class="text-blue-500 hover:text-blue-700 no-underline cursor-pointer" onclick="event.preventDefault(); document.getElementById('resend-verification-form').submit();">{{ __('click here to request another') }}</a>.
2626
</p>
2727

2828
<form id="resend-verification-form" method="POST" action="{{ route('verification.resend') }}" class="hidden">

src/tailwindcss-stubs/resources/views/vendor/pagination/default.blade.php

Lines changed: 0 additions & 69 deletions
This file was deleted.

src/tailwindcss-stubs/resources/views/vendor/pagination/simple-default.blade.php

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)