Skip to content

Commit

Permalink
Merge pull request bagisto#10025 from bagisto/2.2
Browse files Browse the repository at this point in the history
feat: 2.2 updates
  • Loading branch information
devansh-webkul authored Jul 18, 2024
2 parents a04e1d8 + 11b9026 commit bf51183
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 14 deletions.
4 changes: 2 additions & 2 deletions packages/Webkul/Product/src/ProductImage.php
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,11 @@ private function getFallbackImageUrls(): array

$mediumImageUrl = core()->getConfigData('catalog.products.cache_medium_image.url')
? Storage::url(core()->getConfigData('catalog.products.cache_medium_image.url'))
: bagisto_asset('images/small-product-placeholder.webp', 'shop');
: bagisto_asset('images/medium-product-placeholder.webp', 'shop');

$largeImageUrl = core()->getConfigData('catalog.products.cache_large_image.url')
? Storage::url(core()->getConfigData('catalog.products.cache_large_image.url'))
: bagisto_asset('images/small-product-placeholder.webp', 'shop');
: bagisto_asset('images/large-product-placeholder.webp', 'shop');

return [
'small_image_url' => $smallImageUrl,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class="flex cursor-pointer items-center gap-x-2.5 px-2.5 py-3.5 text-base font-m
<!-- Filters Container -->
<template v-else>
<div class="panel-side journal-scroll grid max-h-[1320px] min-w-[342px] grid-cols-[1fr] overflow-y-auto overflow-x-hidden max-xl:min-w-[270px] md:max-w-[400px] md:pr-7">
<div class="panel-side journal-scroll grid max-h-[1320px] min-w-[342px] grid-cols-[1fr] overflow-y-auto overflow-x-hidden max-xl:min-w-[270px] md:max-w-[400px] md:ltr:pr-7 md:rtl:pl-7">
<!-- Filters Header Container -->
<div class="flex h-[50px] items-center justify-between border-b border-zinc-200 pb-2.5 max-md:hidden">
<p class="text-lg font-semibold max-sm:font-medium">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,13 @@
<!-- Hero Image -->
@if ($category->banner_path)
<div class="container mt-8 px-[60px] max-lg:px-8 max-md:mt-4 max-md:px-4">
<div>
<img
class="aspect-[4/1] max-h-full max-w-full rounded-xl"
src="{{ $category->banner_url }}"
alt="{{ $category->name }}"
width="1320"
height="300"
>
</div>
<x-shop::media.images.lazy
class="aspect-[4/1] max-h-full max-w-full rounded-xl"
src="{{ $category->banner_url }}"
alt="{{ $category->name }}"
width="1320"
height="300"
/>
</div>
@endif

Expand Down

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/themes/shop/default/build/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"src/Resources/assets/css/app.css": {
"file": "assets/app-96ca2ca5.css",
"file": "assets/app-56a32297.css",
"isEntry": true,
"src": "src/Resources/assets/css/app.css"
},
Expand Down

0 comments on commit bf51183

Please sign in to comment.