diff --git a/resources/beike/admin/css/bootstrap/bootstrap.scss b/resources/beike/admin/css/bootstrap/bootstrap.scss index 2b2272a8..b99b1d06 100644 --- a/resources/beike/admin/css/bootstrap/bootstrap.scss +++ b/resources/beike/admin/css/bootstrap/bootstrap.scss @@ -34,7 +34,7 @@ $form-floating-padding-y: .9rem; $form-floating-height: 50px; $btn-focus-width: 0; $table-border-color: #e9ecef; -$table-bg: #fff; +$table-bg: transparent; $border-color: #e8e8e8; $input-border-color: #e2e2e2; $badge-border-radius: 2px; diff --git a/resources/beike/shop/default/css/bootstrap/bootstrap.scss b/resources/beike/shop/default/css/bootstrap/bootstrap.scss index 39caca58..7f9d5fef 100644 --- a/resources/beike/shop/default/css/bootstrap/bootstrap.scss +++ b/resources/beike/shop/default/css/bootstrap/bootstrap.scss @@ -86,7 +86,7 @@ $pagination-padding-x: 4px; $pagination-padding-y: .3rem; $pagination-focus-color: #606266; -$table-bg: #fff; +$table-bg: transparent; // $dropdown-divider-bg: rgba(0, 0, 0, 0.1); @import './bootstrap-icons'; diff --git a/resources/beike/shop/default/css/global.scss b/resources/beike/shop/default/css/global.scss index ad0be39f..ba02ca87 100644 --- a/resources/beike/shop/default/css/global.scss +++ b/resources/beike/shop/default/css/global.scss @@ -344,3 +344,30 @@ img { -webkit-line-clamp: 3; } } + +.mobile-paginator { + display: flex; + justify-content: center; + align-items: center; + + .input-group { + max-width: 60px; + margin: 0 10px; + + .input-group-text { + padding: 0.46rem 0.56rem; + } + + #mb-page-input { + padding: 0.46rem 0.26rem; + text-align: center; + } + } + + .btn { + border: 1px solid var(--bs-border-color); + &:active { + background-color: #eee; + } + } +} \ No newline at end of file diff --git a/resources/lang/de/pagination.php b/resources/lang/de/pagination.php index d1d58f6a..c048d58a 100644 --- a/resources/lang/de/pagination.php +++ b/resources/lang/de/pagination.php @@ -1,6 +1,6 @@ 'Weiter »', - 'previous' => '« Zurück', + 'next' => 'Weiter', + 'previous' => 'Zurück', ]; diff --git a/resources/lang/en/pagination.php b/resources/lang/en/pagination.php index fcab34b2..f53e5d37 100644 --- a/resources/lang/en/pagination.php +++ b/resources/lang/en/pagination.php @@ -13,7 +13,7 @@ return [ | */ - 'previous' => '« Previous', - 'next' => 'Next »', + 'previous' => 'Previous', + 'next' => 'Next', ]; diff --git a/resources/lang/es/pagination.php b/resources/lang/es/pagination.php index 66abb4fb..acb83ba1 100644 --- a/resources/lang/es/pagination.php +++ b/resources/lang/es/pagination.php @@ -1,6 +1,6 @@ 'Siguiente »', - 'previous' => '« Anterior', + 'next' => 'Siguiente', + 'previous' => 'Anterior', ]; diff --git a/resources/lang/fr/pagination.php b/resources/lang/fr/pagination.php index 5cd4aa72..58ae13b8 100644 --- a/resources/lang/fr/pagination.php +++ b/resources/lang/fr/pagination.php @@ -1,6 +1,6 @@ 'Suivant »', - 'previous' => '« Précédent', + 'next' => 'Suivant', + 'previous' => 'Précédent', ]; diff --git a/resources/lang/id/pagination.php b/resources/lang/id/pagination.php index 39540ba9..6ab8da92 100644 --- a/resources/lang/id/pagination.php +++ b/resources/lang/id/pagination.php @@ -13,7 +13,7 @@ return [ | */ - 'previous' => '« Mantan', - 'next' => 'Depan »', + 'previous' => 'Mantan', + 'next' => 'Depan', ]; diff --git a/resources/lang/it/pagination.php b/resources/lang/it/pagination.php index 445b435e..fda35fc2 100644 --- a/resources/lang/it/pagination.php +++ b/resources/lang/it/pagination.php @@ -1,6 +1,6 @@ 'Successivo »', - 'previous' => '« Precedente', + 'next' => 'Successivo', + 'previous' => 'Precedente', ]; diff --git a/resources/lang/ja/pagination.php b/resources/lang/ja/pagination.php index 0cc478cf..9d3fd814 100644 --- a/resources/lang/ja/pagination.php +++ b/resources/lang/ja/pagination.php @@ -1,6 +1,6 @@ '次へ »', - 'previous' => '« 前へ', + 'next' => '次へ', + 'previous' => '前へ', ]; diff --git a/resources/lang/ko/pagination.php b/resources/lang/ko/pagination.php index b44caffa..5f468b54 100644 --- a/resources/lang/ko/pagination.php +++ b/resources/lang/ko/pagination.php @@ -13,7 +13,7 @@ return [ | */ - 'previous' => '« 이전 페이지', - 'next' => '다음 페이지 »', + 'previous' => '이전 페이지', + 'next' => '다음 페이지', ]; diff --git a/resources/lang/ru/pagination.php b/resources/lang/ru/pagination.php index 31b85aab..a301728f 100644 --- a/resources/lang/ru/pagination.php +++ b/resources/lang/ru/pagination.php @@ -1,6 +1,6 @@ 'Вперёд »', - 'previous' => '« Назад', + 'next' => 'Вперёд', + 'previous' => 'Назад', ]; diff --git a/resources/lang/zh_cn/admin/order.php b/resources/lang/zh_cn/admin/order.php index f5ff993f..78a6afdc 100644 --- a/resources/lang/zh_cn/admin/order.php +++ b/resources/lang/zh_cn/admin/order.php @@ -23,7 +23,7 @@ return [ 'notify' => '是否提醒', 'orders_update_status' => '更新状态', 'error_status' => '请选择状态', - 'payments_history' => '支付记录', + 'payments_history' => '支付信息', 'text_response' => '返回数据', 'text_request' => '请求参数', 'text_callback' => '回调', diff --git a/resources/lang/zh_cn/pagination.php b/resources/lang/zh_cn/pagination.php index f1fc4b5a..c09f4647 100644 --- a/resources/lang/zh_cn/pagination.php +++ b/resources/lang/zh_cn/pagination.php @@ -13,7 +13,7 @@ return [ | */ - 'previous' => '« 上一页', - 'next' => '下一页 »', + 'previous' => '上一页', + 'next' => '下一页', ]; diff --git a/resources/lang/zh_hk/pagination.php b/resources/lang/zh_hk/pagination.php index c55a1e03..5b1c2526 100644 --- a/resources/lang/zh_hk/pagination.php +++ b/resources/lang/zh_hk/pagination.php @@ -1,6 +1,6 @@ '下一頁 »', - 'previous' => '« 上一頁', + 'next' => '下一頁', + 'previous' => '上一頁', ]; diff --git a/themes/default/shared/pagination/bootstrap-4.blade.php b/themes/default/shared/pagination/bootstrap-4.blade.php index 51ef3ad8..a269f385 100644 --- a/themes/default/shared/pagination/bootstrap-4.blade.php +++ b/themes/default/shared/pagination/bootstrap-4.blade.php @@ -1,43 +1,72 @@ @if ($paginator->hasPages()) - + @if(is_mobile()) +
+ + + @else + + @endif @endif