diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index 2ad586cb1..b4e0c7229 100644 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -73,9 +73,9 @@ Route::group(['middleware' => ['web']], function () { 'view' => 'admin::customers.edit' ])->name('admin.customer.edit'); - // Route::put('customer/reviews/edit/{id}', 'Webkul\Core\Http\Controllers\CustomerController@update')->defaults('_config', [ - // 'redirect' => 'admin.customer.index' - // ])->name('admin.customer.update'); + Route::put('customer/edit/{id}', 'Webkul\Core\Http\Controllers\CustomerController@update')->defaults('_config', [ + 'redirect' => 'admin.customer.index' + ])->name('admin.customer.update'); // dummy number i.e-1 is used for creating view only diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index d6d02a5e7..f402b62c4 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -1542,7 +1542,7 @@ section.product-detail { form { display: flex; flex-direction: row; - justify-content: space-between; + // justify-content: space-between; width: 100%; div.product-image-group { @@ -1614,17 +1614,23 @@ section.product-detail { display: block; position: relative; background: #F2F2F2; - width: 480px; + width: 100%; max-height: 480px; + img { + width: 100%; + height: 480px; + max-height: 480px; + } + .whishlist-icon { - margin-top: -475px; + margin-top: -100%; float: right; margin-right: 10px; } .share-icon { - margin-top: -475px; + margin-top: -100%; float: right; margin-right: 40px; } @@ -1648,19 +1654,21 @@ section.product-detail { margin-top: 10px; .addtocart { - width: 293px; + border-radius: 0px; + width: 49%; background: black; } .buynow { - width: 293px; + border-radius: 0px; + width: 49%; float:right; } } } .details { - width: 50%; + width: 47.5%; .product-price { margin-bottom: 14px; @@ -1903,10 +1911,12 @@ section.product-detail { .addtocart { width: 49%; background: #000000; + border-radius: 0px; } .buynow { width: 49%; + border-radius: 0px; } } } @@ -1992,10 +2002,12 @@ section.product-detail { .addtocart { width: 49%; background: #000000; + border-radius: 0px; } .buynow { width: 49%; + border-radius: 0px; } } } diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css index 3ba45c58a..faf11f2ce 100644 --- a/public/themes/default/assets/css/shop.css +++ b/public/themes/default/assets/css/shop.css @@ -1568,9 +1568,6 @@ section.product-detail div.layouter form { -webkit-box-direction: normal; -ms-flex-direction: row; flex-direction: row; - -webkit-box-pack: justify; - -ms-flex-pack: justify; - justify-content: space-between; width: 100%; } @@ -1657,18 +1654,24 @@ section.product-detail div.layouter form div.product-image-group div .product-he display: block; position: relative; background: #F2F2F2; - width: 480px; + width: 100%; + max-height: 480px; +} + +section.product-detail div.layouter form div.product-image-group div .product-hero-image img { + width: 100%; + height: 480px; max-height: 480px; } section.product-detail div.layouter form div.product-image-group div .product-hero-image .whishlist-icon { - margin-top: -475px; + margin-top: -100%; float: right; margin-right: 10px; } section.product-detail div.layouter form div.product-image-group div .product-hero-image .share-icon { - margin-top: -475px; + margin-top: -100%; float: right; margin-right: 40px; } @@ -1691,17 +1694,19 @@ section.product-detail div.layouter form div.product-image-group .cart-fav-seg { } section.product-detail div.layouter form div.product-image-group .cart-fav-seg .addtocart { - width: 293px; + border-radius: 0px; + width: 49%; background: black; } section.product-detail div.layouter form div.product-image-group .cart-fav-seg .buynow { - width: 293px; + border-radius: 0px; + width: 49%; float: right; } section.product-detail div.layouter form .details { - width: 50%; + width: 47.5%; } section.product-detail div.layouter form .details .product-price { @@ -1837,9 +1842,11 @@ section.product-detail div.layouter form .details .full-description { section.product-detail div.layouter form .details .attributes .cart-fav-seg .addtocart { width: 49%; background: #000000; + border-radius: 0px; } section.product-detail div.layouter form .details .attributes .cart-fav-seg .buynow { width: 49%; + border-radius: 0px; } } @@ -1906,9 +1913,11 @@ section.product-detail div.layouter form .details .full-description { section.product-detail div.layouter form .details .attributes .cart-fav-seg .addtocart { width: 49%; background: #000000; + border-radius: 0px; } section.product-detail div.layouter form .details .attributes .cart-fav-seg .buynow { width: 49%; + border-radius: 0px; } }