diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index 03189a737..b5e7d6337 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -17,7 +17,113 @@ display: block; } + // product card, requires no changes for responsiveness. + .product-grid-4 { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(235px, 1fr)); + grid-auto-rows: auto; + grid-column-gap: 48px; + grid-row-gap: 15px; + } + + .product-grid-3 { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(235px, 1fr)); + grid-gap: 27px; + grid-auto-rows: auto; + } + + @media only screen and (max-width: 854px) { + .product-grid-4 { + grid-template-columns: 29.5% 29.5% 29.5%; + grid-column-gap: 35px; + } + } + + @media only screen and (max-width: 653px) { + .product-grid-4 { + grid-template-columns: 48.5% 48.5%; + grid-column-gap: 17px; + } + } + + .product-card { + position: relative; + + .product-image { + max-height: 350px; + max-width: 280px; + margin-bottom: 10px; + background: #F2F2F2; + + img { + display: block; + width: 100%; + } + } + + .product-name { + margin-bottom: 14px; + width: 100%; + color: $font-color; + + a { + color: $font-color; + } + } + + .product-description { + display: none; + } + + .product-ratings { + width: 100%; + + .icon { + width: 16px; + height: 16px; + } + } + + .cart-wish-wrap { + display: inline-flex; + justify-content: flex-start; + align-items: center; + height: 40px; + + .addtocart { + margin-right: 10px; + text-transform: uppercase; + } + + .add-to-wishlist { + margin-top: 5px; + } + } + + .sticker { + border-radius: 100px; + position: absolute; + top: 10px; + left: 10px; + text-transform: uppercase; + padding: 4px 13px; + font-size: 14px; + color: #fff; + + &.sale { + background: #FF6472; + } + + &.new { + background: #2ED04C; + } + } + } + .product-list { + min-height: 200px; + .product-card { width: 100%; display: inline-block; @@ -43,6 +149,12 @@ margin-bottom: 0; } } + + &.empty { + h2 { + font-size: 20px; + } + } } section.featured-products { @@ -182,11 +294,8 @@ section.slider-block { //responsive css for slider @media only screen and (max-width: 770px) { - section.slider-block { - div.slider-content { - div.slider-control { display: flex; justify-content:space-between; @@ -997,6 +1106,7 @@ section.product-detail { width: 49%; background: black; white-space: nowrap; + text-transform: uppercase; } .buynow { @@ -1004,6 +1114,7 @@ section.product-detail { width: 49%; float:right; white-space: nowrap; + text-transform: uppercase; } } } diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/components.scss b/packages/Webkul/Shop/src/Resources/assets/sass/components.scss index de24f9f32..b4c9bfa0a 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/components.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/components.scss @@ -1,86 +1,4 @@ -.product-card { - .product-image { - max-height: 350px; - max-width: 280px; - margin-bottom: 10px; - background: #F2F2F2; - - img { - display: block; - width: 100%; - } - } - - .product-name { - margin-bottom: 14px; - width: 100%; - color: $font-color; - - a { - color: $font-color; - } - } - - .product-description { - display: none; - } - - .product-ratings { - width: 100%; - - .icon { - width: 16px; - height: 16px; - } - } - - .cart-wish-wrap { - display: inline-flex; - justify-content: flex-start; - align-items: center; - height: 40px; - - .addtocart { - margin-right: 10px; - text-transform: uppercase; - } - - .add-to-wishlist { - margin-top: 5px; - } - } -} - -// product card, requires no changes for responsiveness. -.product-grid-4 { - display: grid; - grid-template-columns: repeat(auto-fill, minmax(235px, 1fr)); - grid-auto-rows: auto; - grid-column-gap: 48px; - grid-row-gap: 15px; -} - -.product-grid-3 { - display: grid; - grid-template-columns: repeat(auto-fill, minmax(235px, 1fr)); - grid-gap: 27px; - grid-auto-rows: auto; -} - -@media only screen and (max-width: 854px) { - .product-grid-4 { - grid-template-columns: 29.5% 29.5% 29.5%; - grid-column-gap: 35px; - } -} - -@media only screen and (max-width: 653px) { - .product-grid-4 { - grid-template-columns: 48.5% 48.5%; - grid-column-gap: 17px; - } -} @media only screen and (max-width: 425px) { .product-card { diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index 894a5ab36..eba7c0777 100644 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -4,11 +4,7 @@ return [ 'home' => [ 'page-title' => 'Bagisto - Home', 'featured-products' => 'Featured Products', - 'new-products' => 'New Products', - - 'product-card' => [ - 'add-to-cart' => 'ADD TO CART' - ] + 'new-products' => 'New Products' ], 'footer' => [ @@ -198,7 +194,13 @@ return [ 'up-sell-title' => 'We found other products you might like!', 'reviews-title' => 'Ratings & Reviews', 'write-review-btn' => 'Write Review', - 'choose-option' => 'Choose an option' + 'choose-option' => 'Choose an option', + 'sale' => 'Sale', + 'new' => 'New', + 'empty' => 'No products available in this category.', + 'add-to-cart' => 'Add To Cart', + 'buy-now' => 'Buy Now', + 'whoops' => 'Whoops!' ], 'wishlist' => [ @@ -219,7 +221,8 @@ return [ ], 'title' => 'Shopping Cart', - 'empty' => 'Shopping Cart Is Empty', + 'empty' => 'Your shopping cart is empty.', + 'update-cart' => 'Update Cart', 'continue-shopping' => 'Continue Shopping', 'proceed-to-checkout' => 'Proceed To Checkout', 'remove' => 'Remove', diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php index 53ac65869..f8b072085 100644 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php @@ -22,7 +22,9 @@