diff --git a/public/build/beike/admin/css/app.css b/public/build/beike/admin/css/app.css index e8f37568..49d1ff21 100644 --- a/public/build/beike/admin/css/app.css +++ b/public/build/beike/admin/css/app.css @@ -3,6 +3,10 @@ font-family: "poppins"; src: url("/fonts/poppins/Poppins-Regular.ttf"); } +@font-face { + font-family: "poppins-bold"; + src: url("/fonts/poppins/Poppins-Bold.ttf"); +} .min-h1 { min-height: 100px; } @@ -533,6 +537,10 @@ body.page-seller-product .share-link-pop .share-links-code img { color: #fff; } +table.table thead th, .fw-bold, h1, h2, h3, h4, h5, h6, b, strong, .card .card-header { + font-family: "poppins-bold", sans-serif; +} + [v-cloak] { display: none; } diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css index a576bc46..578d77aa 100644 --- a/public/build/beike/shop/default/css/app.css +++ b/public/build/beike/shop/default/css/app.css @@ -24,6 +24,10 @@ body[class^=page-account-] { font-family: "poppins"; src: url("/fonts/poppins/Poppins-Regular.ttf"); } +@font-face { + font-family: "poppins-bold"; + src: url("/fonts/poppins/Poppins-Bold.ttf"); +} .min-h1 { min-height: 100px; } @@ -494,6 +498,10 @@ body[class^=page-account-] { color: #fff; } +table.table thead th, .fw-bold, h1, h2, h3, h4, h5, h6, b, strong, .card .card-header { + font-family: "poppins-bold", sans-serif; +} + header { background: #fff; } @@ -881,6 +889,13 @@ body.page-product .product-image .left .swiper-pager .swiper-button-prev::after body.page-product .product-image .right { border: 1px solid #eee; } +body.page-product .stock-and-sku > div { + margin-bottom: 10px; + font-size: 14px; +} +body.page-product .stock-and-sku > div .title { + width: 80px; +} body.page-product .variables-wrap .variable-info > div { display: inline-flex; align-items: center; diff --git a/resources/beike/admin/css/_global.scss b/resources/beike/admin/css/_global.scss index 57b9ba07..a2672ff1 100644 --- a/resources/beike/admin/css/_global.scss +++ b/resources/beike/admin/css/_global.scss @@ -12,6 +12,10 @@ src: url('/fonts/poppins/Poppins-Regular.ttf'); } +@font-face {font-family: 'poppins-bold'; + src: url('/fonts/poppins/Poppins-Bold.ttf'); +} + @for $i from 1 through 6 { .min-h#{$i} { min-height: #{$i}00px; @@ -315,4 +319,8 @@ body.page-seller-product { border-color: $primary; color: #fff; } +} + +table.table thead th, .fw-bold, h1,h2,h3, h4, h5, h6, b, strong, .card .card-header { + font-family: 'poppins-bold', 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 6c31f663..60dfd876 100644 --- a/resources/beike/shop/default/css/global.scss +++ b/resources/beike/shop/default/css/global.scss @@ -12,6 +12,10 @@ body[class^="page-account-"] { src: url('/fonts/poppins/Poppins-Regular.ttf'); } +@font-face {font-family: 'poppins-bold'; + src: url('/fonts/poppins/Poppins-Bold.ttf'); +} + @for $i from 1 through 6 { .min-h#{$i} { min-height: #{$i}00px; @@ -249,7 +253,9 @@ 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; +} \ No newline at end of file diff --git a/resources/beike/shop/default/css/page-product.scss b/resources/beike/shop/default/css/page-product.scss index 35df69b7..b83ae25a 100644 --- a/resources/beike/shop/default/css/page-product.scss +++ b/resources/beike/shop/default/css/page-product.scss @@ -91,6 +91,17 @@ body.page-product { } } + .stock-and-sku { + > div { + margin-bottom: 10px; + font-size: 14px; + + .title { + width: 80px; + } + } + } + .variables-wrap { .variable-info { > div { diff --git a/resources/lang/en/product.php b/resources/lang/en/product.php index d924b92a..1140a9ea 100644 --- a/resources/lang/en/product.php +++ b/resources/lang/en/product.php @@ -16,4 +16,5 @@ return [ 'brand' => 'Brand', 'category' => 'Category', 'model' => 'Model', + 'quantity' => 'Quantity' ]; diff --git a/resources/lang/zh_cn/product.php b/resources/lang/zh_cn/product.php index 3cd7bb1c..74b7c130 100644 --- a/resources/lang/zh_cn/product.php +++ b/resources/lang/zh_cn/product.php @@ -15,5 +15,6 @@ return [ 'price' => '价格', 'brand' => '品牌', 'category' => '分类', - 'model' => '型号' + 'model' => '型号', + 'quantity' => '库存' ]; diff --git a/themes/default/product.blade.php b/themes/default/product.blade.php index 857d430f..b6d96336 100644 --- a/themes/default/product.blade.php +++ b/themes/default/product.blade.php @@ -44,13 +44,15 @@