refs #1003 pagination blade fixes
This commit is contained in:
		@@ -4,13 +4,8 @@
 | 
			
		||||
            <span class="table-text d-none d-lg-block mr-2">
 | 
			
		||||
                {{ trans('general.show') }}
 | 
			
		||||
            </span>
 | 
			
		||||
<<<<<<< .mine
 | 
			
		||||
            {!! Form::select('limit', $limits, request('limit', setting('default.list_limit', '25')), ['class' => 'form-control form-control-sm table-header-search hidden-md', '@change' => 'onChangePaginationLimit($event)']) !!}
 | 
			
		||||
            <span class="table-text hidden-lg">
 | 
			
		||||
=======
 | 
			
		||||
            {!! Form::select('limit', $limits, request('limit', setting('default.list_limit', '25')), ['class' => 'form-control form-control-sm table-header-search d-none d-md-block', 'onchange' => 'this.form.submit()']) !!}
 | 
			
		||||
            {!! Form::select('limit', $limits, request('limit', setting('default.list_limit', '25')), ['class' => 'form-control form-control-sm table-header-search d-none d-md-block', '@change' => 'onChangePaginationLimit($event)']) !!}
 | 
			
		||||
            <span class="table-text d-none d-lg-block ml-2">
 | 
			
		||||
>>>>>>> .theirs
 | 
			
		||||
                {{ trans('pagination.page') }}
 | 
			
		||||
                {{ trans('pagination.showing', ['first' => $items->firstItem(), 'last' => $items->lastItem(), 'total' => $items->total(), 'type' => strtolower((isset($title)) ? $title : trans_choice('general.' . $type, 2))]) }}
 | 
			
		||||
            </span>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user