Skip to content

Commit e631b82

Browse files
committed
Merge branch 'update'
2 parents f8dc3cb + d3b9648 commit e631b82

File tree

2 files changed

+30
-28
lines changed

2 files changed

+30
-28
lines changed

resources/views/uikit/simple-uikit.blade.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
<div class="uk-flex uk-flex-between @if ($darkMode) uk-light @endif">
55
{{-- Previous Page Link --}}
66
@if ($paginator->onFirstPage())
7-
<button class="uk-button uk-button-small uk-button-default uk-margin-small-top uk-margin-small-right"
7+
<button class="uk-button uk-button-small uk-button-default uk-width-1-2 uk-width-1-5@s uk-width-1-6@l uk-margin-small-top"
88
disabled>
99
{!! __('pagination.previous') !!}
1010
</button>
1111
@else
12-
<a class="uk-button uk-button-small uk-button-default uk-margin-small-top uk-margin-small-right"
12+
<a class="uk-button uk-button-small uk-button-default uk-width-1-2 uk-width-1-5@s uk-width-1-6@l uk-margin-small-top"
1313
href="{{ $paginator->previousPageUrl() }}">
1414
{!! __('pagination.previous') !!}
1515
</a>
1616
@endif
1717

1818
{{-- Next Page Link --}}
1919
@if ($paginator->hasMorePages())
20-
<a class="uk-button uk-button-small uk-button-default uk-margin-small-top uk-margin-small-right"
20+
<a class="uk-button uk-button-small uk-button-default uk-width-1-2 uk-width-1-5@s uk-width-1-6@l uk-margin-small-top"
2121
href="{{ $paginator->nextPageUrl() }}">
2222
{!! __('pagination.next') !!}
2323
</a>
2424
@else
25-
<button class="uk-button uk-button-small uk-button-default uk-margin-small-top uk-margin-small-right"
25+
<button class="uk-button uk-button-small uk-button-default uk-width-1-2 uk-width-1-5@s uk-width-1-6@l uk-margin-small-top"
2626
disabled>
2727
{!! __('pagination.next') !!}
2828
</button>

resources/views/uikit/uikit.blade.php

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@if ($paginator->hasPages())
22
@props(['darkMode' => false])
33

4-
<div class="uk-flex uk-flex-between@m uk-flex-left uk-flex-wrap @if ($darkMode) uk-light @endif">
4+
<div class="uk-flex uk-flex-between uk-flex-wrap @if ($darkMode) uk-light @endif">
55
{{-- Previous Page Link --}}
66
@if ($paginator->onFirstPage())
77
<button class="uk-button uk-button-small uk-button-default uk-width-auto@m uk-width-1-2 uk-margin-small-top"
@@ -29,29 +29,31 @@
2929
@endif
3030

3131
{{-- Pagination Elements --}}
32-
@foreach ($elements as $element)
33-
{{-- "Three Dots" Separator --}}
34-
@if (is_string($element))
35-
<button class="uk-button uk-button-small uk-button-default uk-margin-small-top" disabled>
36-
{{ $element }}
37-
</button>
38-
@endif
32+
<div>
33+
@foreach ($elements as $element)
34+
{{-- "Three Dots" Separator --}}
35+
@if (is_string($element))
36+
<button class="uk-button uk-button-small uk-button-default uk-margin-small-top" disabled>
37+
{{ $element }}
38+
</button>
39+
@endif
3940

40-
{{-- Array Of Links --}}
41-
@if (is_array($element))
42-
@foreach ($element as $page => $url)
43-
@if ($page == $paginator->currentPage())
44-
<button class="uk-button uk-button-small uk-button-primary uk-margin-small-top">
45-
{{ $page }}
46-
</button>
47-
@else
48-
<a class="uk-button uk-button-small uk-button-default uk-margin-small-top"
49-
href="{{ $url }}">
50-
{{ $page }}
51-
</a>
52-
@endif
53-
@endforeach
54-
@endif
55-
@endforeach
41+
{{-- Array Of Links --}}
42+
@if (is_array($element))
43+
@foreach ($element as $page => $url)
44+
@if ($page == $paginator->currentPage())
45+
<button class="uk-button uk-button-small uk-button-primary uk-margin-small-top">
46+
{{ $page }}
47+
</button>
48+
@else
49+
<a class="uk-button uk-button-small uk-button-default uk-margin-small-top"
50+
href="{{ $url }}">
51+
{{ $page }}
52+
</a>
53+
@endif
54+
@endforeach
55+
@endif
56+
@endforeach
57+
</div>
5658
</div>
5759
@endif

0 commit comments

Comments
 (0)