diff --git a/public/build/beike/admin/css/app.css b/public/build/beike/admin/css/app.css index 49d1ff21..d18c2a07 100644 --- a/public/build/beike/admin/css/app.css +++ b/public/build/beike/admin/css/app.css @@ -4,8 +4,8 @@ src: url("/fonts/poppins/Poppins-Regular.ttf"); } @font-face { - font-family: "poppins-bold"; - src: url("/fonts/poppins/Poppins-Bold.ttf"); + font-family: "Poppins-Medium"; + src: url("/fonts/poppins/Poppins-Medium.ttf"); } .min-h1 { min-height: 100px; @@ -538,7 +538,7 @@ body.page-seller-product .share-link-pop .share-links-code img { } table.table thead th, .fw-bold, h1, h2, h3, h4, h5, h6, b, strong, .card .card-header { - font-family: "poppins-bold", sans-serif; + font-family: "Poppins-Medium", sans-serif; } [v-cloak] { diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css index 578d77aa..ee729167 100644 --- a/public/build/beike/shop/default/css/app.css +++ b/public/build/beike/shop/default/css/app.css @@ -25,8 +25,8 @@ body[class^=page-account-] { src: url("/fonts/poppins/Poppins-Regular.ttf"); } @font-face { - font-family: "poppins-bold"; - src: url("/fonts/poppins/Poppins-Bold.ttf"); + font-family: "Poppins-Medium"; + src: url("/fonts/poppins/Poppins-Medium.ttf"); } .min-h1 { min-height: 100px; @@ -499,7 +499,7 @@ body[class^=page-account-] { } table.table thead th, .fw-bold, h1, h2, h3, h4, h5, h6, b, strong, .card .card-header { - font-family: "poppins-bold", sans-serif; + font-family: "Poppins-Medium", sans-serif; } header { diff --git a/public/fonts/Jost/Jost400Book.otf b/public/fonts/Jost/Jost400Book.otf deleted file mode 100644 index a793530a..00000000 Binary files a/public/fonts/Jost/Jost400Book.otf and /dev/null differ diff --git a/public/fonts/Jost/Jost400BookItalic.otf b/public/fonts/Jost/Jost400BookItalic.otf deleted file mode 100644 index ea1cfe4c..00000000 Binary files a/public/fonts/Jost/Jost400BookItalic.otf and /dev/null differ diff --git a/public/fonts/Jost/Jost500Medium.otf b/public/fonts/Jost/Jost500Medium.otf deleted file mode 100644 index 8f607f88..00000000 Binary files a/public/fonts/Jost/Jost500Medium.otf and /dev/null differ diff --git a/public/fonts/Jost/Jost600Semi.otf b/public/fonts/Jost/Jost600Semi.otf deleted file mode 100644 index 07aaadea..00000000 Binary files a/public/fonts/Jost/Jost600Semi.otf and /dev/null differ diff --git a/public/fonts/cerebri-sans/Cerebri Sans Bold.ttf b/public/fonts/cerebri-sans/Cerebri Sans Bold.ttf deleted file mode 100644 index 80b3aa3c..00000000 Binary files a/public/fonts/cerebri-sans/Cerebri Sans Bold.ttf and /dev/null differ diff --git a/public/fonts/cerebri-sans/Cerebri-Sans-Regular.ttf b/public/fonts/cerebri-sans/Cerebri-Sans-Regular.ttf deleted file mode 100644 index 93b53c93..00000000 Binary files a/public/fonts/cerebri-sans/Cerebri-Sans-Regular.ttf and /dev/null differ diff --git a/public/fonts/poppins/Poppins-Medium.ttf b/public/fonts/poppins/Poppins-Medium.ttf new file mode 100644 index 00000000..a8725520 Binary files /dev/null and b/public/fonts/poppins/Poppins-Medium.ttf differ diff --git a/resources/beike/admin/css/_global.scss b/resources/beike/admin/css/_global.scss index a2672ff1..84a4cd0c 100644 --- a/resources/beike/admin/css/_global.scss +++ b/resources/beike/admin/css/_global.scss @@ -12,8 +12,8 @@ src: url('/fonts/poppins/Poppins-Regular.ttf'); } -@font-face {font-family: 'poppins-bold'; - src: url('/fonts/poppins/Poppins-Bold.ttf'); +@font-face {font-family: 'Poppins-Medium'; + src: url('/fonts/poppins/Poppins-Medium.ttf'); } @for $i from 1 through 6 { @@ -322,5 +322,5 @@ body.page-seller-product { } table.table thead th, .fw-bold, h1,h2,h3, h4, h5, h6, b, strong, .card .card-header { - font-family: 'poppins-bold', sans-serif; + font-family: 'Poppins-Medium', sans-serif; } \ No newline at end of file diff --git a/resources/beike/shop/default/css/global.scss b/resources/beike/shop/default/css/global.scss index 60dfd876..fb12bfc0 100644 --- a/resources/beike/shop/default/css/global.scss +++ b/resources/beike/shop/default/css/global.scss @@ -12,8 +12,8 @@ body[class^="page-account-"] { src: url('/fonts/poppins/Poppins-Regular.ttf'); } -@font-face {font-family: 'poppins-bold'; - src: url('/fonts/poppins/Poppins-Bold.ttf'); +@font-face {font-family: 'Poppins-Medium'; + src: url('/fonts/poppins/Poppins-Medium.ttf'); } @for $i from 1 through 6 { @@ -257,5 +257,5 @@ body[class^="page-account-"] { table.table thead th, .fw-bold, h1,h2,h3, h4, h5, h6, b, strong, .card .card-header { - font-family: 'poppins-bold', sans-serif; + font-family: 'Poppins-Medium', sans-serif; } \ No newline at end of file diff --git a/themes/default/checkout.blade.php b/themes/default/checkout.blade.php index 04ce2b40..e34787ac 100644 --- a/themes/default/checkout.blade.php +++ b/themes/default/checkout.blade.php @@ -35,7 +35,10 @@
@{{ address.zipcode }}
@{{ address.country }} @{{ address.zone }} @{{ address.city }} @{{ address.address_1 }}
- {{ __('shop/checkout.chosen') }} +
+ {{ __('shop/checkout.chosen') }} + {{-- {{ __('shop/account.addresses.default_address') }} --}} +
{{ __('shop/checkout.edit') }}
diff --git a/themes/default/shared/address-form.blade.php b/themes/default/shared/address-form.blade.php index 084daddd..359558bc 100644 --- a/themes/default/shared/address-form.blade.php +++ b/themes/default/shared/address-form.blade.php @@ -51,8 +51,6 @@