Skip to content

Commit 0f3ad14

Browse files
Merge branch '7.x'
2 parents 0caf241 + ec318a0 commit 0f3ad14

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

src/Illuminate/Foundation/Console/stubs/exception-render-report.stub

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ class DummyClass extends Exception
1111
*
1212
* @return void
1313
*/
14-
public function report()
15-
{
14+
public function report()
15+
{
1616
//
1717
}
1818

src/Illuminate/Pagination/AbstractPaginator.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,17 @@ public static function defaultSimpleView($view)
552552
static::$defaultSimpleView = $view;
553553
}
554554

555+
/**
556+
* Indicate that Tailwind styling should be used for generated links.
557+
*
558+
* @return void
559+
*/
560+
public static function useTailwind()
561+
{
562+
static::defaultView('pagination::tailwind');
563+
static::defaultSimpleView('pagination::simple-tailwind');
564+
}
565+
555566
/**
556567
* Indicate that Bootstrap 3 styling should be used for generated links.
557568
*

src/Illuminate/Pagination/resources/views/tailwind.blade.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
2626
<div>
2727
<p class="text-sm text-gray-700 leading-5">
28-
Showing
28+
{!! __('Showing') !!}
2929
<span class="font-medium">{{ $paginator->firstItem() }}</span>
30-
to
30+
{!! __('to') !!}
3131
<span class="font-medium">{{ $paginator->lastItem() }}</span>
32-
of
32+
{!! __('of') !!}
3333
<span class="font-medium">{{ $paginator->total() }}</span>
34-
results
34+
{!! __('results') !!}
3535
</p>
3636
</div>
3737

0 commit comments

Comments
 (0)