diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css index 8224bab1..90206ce7 100644 --- a/public/build/beike/shop/default/css/app.css +++ b/public/build/beike/shop/default/css/app.css @@ -36,7 +36,7 @@ header { background: #fff; } body:not(.page-home) header { - border-bottom: 1px solid #e5e5e5; + box-shadow: 0 6px 12px 0 rgba(0, 0, 0, 0.04); } header .top-wrap { height: 44px; @@ -59,7 +59,7 @@ header .header-content .menu-wrap .nav-link { padding-right: 1rem; } header .header-content .logo img { - max-width: 170px; + max-width: 140px; max-height: 30px; } header .header-content .right-btn .nav-link { @@ -72,8 +72,8 @@ header .header-content .right-btn .nav-link i { } footer { - background: #F8F9FA; - margin-top: 3rem; + background: #fafafa; + margin-top: 5rem; } footer .footer-top { padding: 2.2rem 0; @@ -102,6 +102,12 @@ footer .footer-top .service-item .sub-title { footer .footer-content { padding: 3rem 0; } +footer .footer-content a { + color: #666; +} +footer .footer-content a:hover { + color: #fd560f; +} @media (min-width: 768px) { footer .footer-content .footer-content-left { width: 76%; @@ -194,9 +200,6 @@ body.page-login .card { body.page-account { background-color: #F7F8FA; } -body.page-account footer { - background-color: #fff; -} body.page-account .account-info .head { display: flex; flex-direction: column; @@ -205,8 +208,8 @@ body.page-account .account-info .head { background-color: #fff; } body.page-account .account-info .head .portrait { - width: 90px; - height: 90px; + width: 100px; + height: 100px; border-radius: 50%; box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.14); border: 2px solid #FFFFFF; @@ -244,11 +247,13 @@ body.page-account .account-card { body.page-account .account-card .card-header { border: none; background-color: #fff; + padding-top: 1rem; } body.page-account .account-card .card-header h6 { border-left: 3px solid #fd560f; padding-left: 6px; - font-size: 0.9rem; + font-weight: bold; + font-size: 1rem; } body.page-account .account-card .card-items > a { width: 25%; @@ -279,9 +284,6 @@ body.page-product .product-image .left { body.page-product .product-image .left > div { margin-bottom: 1rem; } -body.page-product .peoduct-info { - padding-left: 3rem; -} body.page-product .peoduct-info .rating-wrap { margin-bottom: 2rem; } @@ -291,8 +293,34 @@ body.page-product .peoduct-info .rating-wrap .rating { body.page-product .peoduct-info .rating-wrap .rating i { color: #fd560f; } +body.page-product .peoduct-info .price-wrap { + margin-bottom: 2rem; +} body.page-product .peoduct-info .price-wrap .new-price { margin-right: 0.6rem; font-size: 1.6rem; line-height: 1; } +body.page-product .peoduct-info .attribute-wrap { + margin-bottom: 2rem; +} +body.page-product .peoduct-info .quantity-wrap .quantity-input { + max-width: 5rem; + text-align: center; +} +body.page-product .product-description .nav-tabs .nav-link { + border: none; +} +body.page-product .product-description .nav-tabs .nav-link.active { + position: relative; + background-color: transparent; + color: #fd560f; +} +body.page-product .product-description .nav-tabs .nav-link.active:before { + border-top: 1px solid #fd560f; + content: ""; + position: absolute; + bottom: 0; + left: 0; + right: 0; +} diff --git a/public/build/beike/shop/default/css/bootstrap.css b/public/build/beike/shop/default/css/bootstrap.css index e256018e..1f27fa64 100644 --- a/public/build/beike/shop/default/css/bootstrap.css +++ b/public/build/beike/shop/default/css/bootstrap.css @@ -225,11 +225,11 @@ sup { } a { - color: #fd560f; - text-decoration: underline; + color: #1f1f1f; + text-decoration: none; } a:hover { - color: #ca450c; + color: #fd560f; } a:not([href]):not([class]), a:not([href]):not([class]):hover { @@ -2987,7 +2987,6 @@ textarea.form-control-lg { line-height: 1.5; color: #212529; text-align: center; - text-decoration: none; vertical-align: middle; cursor: pointer; -webkit-user-select: none; @@ -3460,11 +3459,11 @@ textarea.form-control-lg { .btn-link { font-weight: 400; - color: #fd560f; - text-decoration: underline; + color: #1f1f1f; + text-decoration: none; } .btn-link:hover { - color: #ca450c; + color: #fd560f; } .btn-link:disabled, .btn-link.disabled { color: #6c757d; @@ -3757,7 +3756,6 @@ textarea.form-control-lg { font-weight: 400; color: #212529; text-align: inherit; - text-decoration: none; white-space: nowrap; background-color: transparent; border: 0; @@ -3932,8 +3930,7 @@ textarea.form-control-lg { .nav-link { display: block; padding: 0.5rem 1rem; - color: #fd560f; - text-decoration: none; + color: #1f1f1f; transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out; } @media (prefers-reduced-motion: reduce) { @@ -3942,7 +3939,7 @@ textarea.form-control-lg { } } .nav-link:hover, .nav-link:focus { - color: #ca450c; + color: #fd560f; } .nav-link.disabled { color: #6c757d; @@ -4043,7 +4040,6 @@ textarea.form-control-lg { padding-bottom: 0.35rem; margin-right: 1rem; font-size: 1rem; - text-decoration: none; white-space: nowrap; } .navbar-nav { @@ -4794,8 +4790,7 @@ textarea.form-control-lg { .page-link { position: relative; display: block; - color: #fd560f; - text-decoration: none; + color: #1f1f1f; background-color: #fff; border: 1px solid #dee2e6; transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; @@ -4807,13 +4802,13 @@ textarea.form-control-lg { } .page-link:hover { z-index: 2; - color: #ca450c; + color: #fd560f; background-color: #e9ecef; border-color: #dee2e6; } .page-link:focus { z-index: 3; - color: #ca450c; + color: #fd560f; background-color: #e9ecef; outline: 0; box-shadow: 0 0 0 0.25rem rgba(253, 86, 15, 0.25); @@ -5085,7 +5080,6 @@ textarea.form-control-lg { display: block; padding: 0.5rem 1rem; color: #212529; - text-decoration: none; background-color: #fff; border: 1px solid rgba(0, 0, 0, 0.125); } diff --git a/resources/beike/shop/default/account/account.scss b/resources/beike/shop/default/account/account.scss index c880fd8e..881fb6a0 100644 --- a/resources/beike/shop/default/account/account.scss +++ b/resources/beike/shop/default/account/account.scss @@ -4,7 +4,7 @@ body.page-account { background-color: #F7F8FA; footer { - background-color: #fff; + // background-color: #fff; } .account-info { @@ -16,8 +16,8 @@ body.page-account { background-color: #fff; .portrait { - width: 90px; - height: 90px; + width: 100px; + height: 100px; border-radius: 50%; box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.14); border: 2px solid #FFFFFF; @@ -66,11 +66,13 @@ body.page-account { .card-header { border: none; background-color: #fff; + padding-top: 1rem; h6 { border-left: 3px solid $primary; padding-left: 6px; - font-size: 0.9rem; + font-weight: bold; + font-size: 1rem; } } diff --git a/resources/beike/shop/default/bootstrap/bootstrap.scss b/resources/beike/shop/default/bootstrap/bootstrap.scss index a2574dc2..3b5e7d1f 100644 --- a/resources/beike/shop/default/bootstrap/bootstrap.scss +++ b/resources/beike/shop/default/bootstrap/bootstrap.scss @@ -31,6 +31,10 @@ $input-btn-padding-y: .6rem; $input-btn-font-size: 0.9rem; // $input-btn-padding-x: .75rem !default; +$link-decoration: none; +$link-color: #1f1f1f; +$link-hover-color: $primary; + @import 'node_modules/bootstrap-5.1.3/scss/bootstrap'; @import './bootstrap-icons'; diff --git a/resources/beike/shop/default/footer.scss b/resources/beike/shop/default/footer.scss index 053aff9a..7de6e421 100644 --- a/resources/beike/shop/default/footer.scss +++ b/resources/beike/shop/default/footer.scss @@ -1,8 +1,9 @@ @charset "UTF-8"; footer { - background: #F8F9FA; - margin-top: 3rem; + // background: #F8F9FA; + background: #fafafa; + margin-top: 5rem; .footer-top { padding: 2.2rem 0; @@ -37,6 +38,14 @@ footer { .footer-content { padding: 3rem 0; + a { + color: #666; + + &:hover { + color: $primary; + } + } + .footer-content-left { @media (min-width: 768px) { width: 76%; diff --git a/resources/beike/shop/default/header.scss b/resources/beike/shop/default/header.scss index 00c9af55..6fb1765c 100644 --- a/resources/beike/shop/default/header.scss +++ b/resources/beike/shop/default/header.scss @@ -4,7 +4,8 @@ header { // box-shadow: 0px 1px 10px rgba(0, 0, 0, .04); background: #fff; body:not(.page-home) & { - border-bottom: 1px solid #e5e5e5; + box-shadow: 0 6px 12px 0 rgba(0, 0, 0, .04); + // border-bottom: 1px solid #e5e5e5; } .top-wrap { @@ -45,7 +46,7 @@ header { .logo { img { - max-width: 170px; + max-width: 140px; max-height: 30px; } } diff --git a/resources/beike/shop/default/product.scss b/resources/beike/shop/default/product.scss index 30afd5d7..103fb5ec 100644 --- a/resources/beike/shop/default/product.scss +++ b/resources/beike/shop/default/product.scss @@ -10,9 +10,8 @@ body.page-product { } } } - .peoduct-info { - padding-left: 3rem; + .peoduct-info { .rating-wrap { margin-bottom: 2rem; @@ -25,11 +24,51 @@ body.page-product { } .price-wrap { + margin-bottom: 2rem; + .new-price { margin-right: .6rem; font-size: 1.6rem; line-height: 1; } } + + .attribute-wrap { + margin-bottom: 2rem; + + .table { + + } + } + + .quantity-wrap { + .quantity-input { + max-width: 5rem; + text-align: center; + } + } + } + + .product-description { + .nav-tabs { + .nav-link { + border: none; + + &.active { + position: relative; + background-color: transparent; + color: $primary; + + &:before { + border-top: 1px solid $primary; + content: ""; + position: absolute; + bottom: 0; + left: 0; + right: 0; + } + } + } + } } } \ No newline at end of file diff --git a/themes/default/layout/footer.blade.php b/themes/default/layout/footer.blade.php index e62b2263..a2aab63d 100644 --- a/themes/default/layout/footer.blade.php +++ b/themes/default/layout/footer.blade.php @@ -30,37 +30,37 @@
Hot links
Hot links
Hot links
Hot links
diff --git a/themes/default/layout/header.blade.php b/themes/default/layout/header.blade.php index 58cd8cb9..534c9907 100644 --- a/themes/default/layout/header.blade.php +++ b/themes/default/layout/header.blade.php @@ -3,7 +3,7 @@
-
- Delivery - Help - 028-0000000 +
@@ -61,7 +61,7 @@