New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Inventory status block #1979
Inventory status block #1979
Conversation
sections/featured-product.liquid
Outdated
{{ block.shopify_attributes }} | ||
> | ||
{{- block.settings.text -}} | ||
{%- if product.selected_or_first_available_variant.available and product.selected_or_first_available_variant.inventory_management == 'shopify' -%} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if we could move this product.selected_or_first_available_variant.inventory_management == 'shopify'
check to the backend level.
Do you see any advantage on it?
The code would look like:
{%- if product.selected_or_first_available_variant.available and product.selected_or_first_available_variant.shopify_inventory_managed? -%}
Hi Eugene! Here are the updates i told you about : Figma My recommendation would be :
Also, we did a quick updates on the orange and green status UI! |
…block to featured-product.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure what's causing this, but I'm seeing different things displayed for two different products 🤔
The stock indicator is hidden for some variants/sizes of the Louise Slide Sandal, which is what we expect. But for some variants/sizes, the price gets hidden completely. Also, for Shoe Test variant product I'm seeing "not quantity" for variants that aren't in stock.
30-31-ww779-r16tt.mp4
@eugenekasimov can we update the threshold slider name to "Low inventory threshold"? |
Thanks for paying attention to this. This "issue" not related to this PR, but I have already brought it up to designers so they know about it. When some existing variant has stock 0 then you see That "not quantity" is just a label that is set in admin, it's just a coincidence that it says "quantity". Normally it could be "color" or whatever. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking good 👌
assets/global.js
Outdated
if (inventory && inventorySource == null) inventory.classList.add('hidden'); | ||
if (inventory && inventorySource !== null) inventory.classList.remove('hidden'); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if we should keep showing the container to prevent the jumping of the white space. I know you're not into that weird white space but that would match the current approach.
And when we have some decisions taken on that other issue you created that talks about it we can change the approach if needed 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I still feel that I don't want to keep extra whitespace dedicated for this Inventory block. But honestly, it's something that we can easily change at any time. I suggest we don't take much time on this so far.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah I think we can keep the whitespace for now to match what we currently have and then we can revisit later if we want to avoid the white space.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, I changed class .hidden
to visually-hidden
and add attribute aria-hidden
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey, i think it would be better to remove all the white space when a block disappears (even for price) but i agree we can just keep the current logic for now (keeping the white space like for prices). Let's just fix that issue later, for every block.
locales/en.default.schema.json
Outdated
}, | ||
"inventory_threshold": { | ||
"label": "Low inventory threshold", | ||
"info": "Choose 0 to always show in stock if available." |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if this info
bit is actually useful 🤔 Maybe it's just me though 😅
Choose 0 to always show the status as 'in stock' if the variant is available.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does it seem too obvious for you? Is that what you mean?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just find it a bit confusing. I think the wording could be better. But maybe it's only confusing to me. cc: @YoannJailin
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ludoboludo how about this one?
« Shows low stock status when quantity is below the threshold. Choose 0 to always show in stock if the product is available. »
I wonder if it's not confusing to refer to the variant.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I even wonder if it needs help text ? Or maybe something to explain how this value they're using is used.
Anything below the threshold set will show a
low stock status unless it's 0.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good a few more comments in a couple extra scenarios. Let me know if you want to pair to discuss them "in person"
{{- 'products.product.inventory_out_of_stock' | t -}} | ||
{%- endif -%} | ||
{%- endif -%} | ||
{%- endif -%} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Continuing with my earlier comment and looking at the code a bit more I realise there is a lot of repeated code here. Mainly the svg code but this in general hard to read and understand. I also think there is a bug in the current implementation. If you have a product with negative inventory you will still go into the in-stock or low-stock condition, becauseinventory_quantity != 0
will match negative numbers and you’ll never reach the ‘continue selling’ condition (in stock), unless the inventory is at exactly 0.
Below is an example of how this could look like if we move the conditional logic into a liquid tag:
Note: I understand this is few lines longer, but personally I feel this is more readable. Also, I have not run this
{%- if product.selected_or_first_available_variant.inventory_management == 'shopify' -%}
{%- liquid
assing variant = product.selected_or_first_available_variant
assign inventory_quantity = variant.inventory_quantity
assign show_inventory_quantity = block.settings.show_inventory_quantity
assign inventory_threshold = block.settings.inventory_threshold
assign in_stock = false
assign low_stock = false
assign continue_selling = false
assign color_in_stock_rgb = '62, 214, 96'
assign color_low_stock_rgb = '238, 148, 65'
assign color_sold_out_rgb = '200, 200, 200'
assign color = ''
assign text = ''
if inventory_quantity > 0
assign in_stock = true
if inventory_quantity <= inventory_threshold
assign low_stock = true
endif
endif
if variant.inventory_policy == 'continue'
assign continue_selling = true
endif
if in_stock
assign color = color_in_stock_rgb
assign text = 'products.product.inventory_in_stock' | t
if low_stock
assign color = color_low_stock_rgb
if show_inventory_quantity
assign text = 'products.product.inventory_low_stock_show_count' | t: quantity: inventory_quantity
else
assign text = 'products.product.inventory_low_stock' | t
endif
elsif show_inventory_quantity
assign text = 'products.product.inventory_in_stock_show_count' | t: quantity: inventory_quantity
endif
elsif continue_selling
assign color = color_in_stock_rgb
assign text = 'products.product.inventory_in_stock' | t
else
assign color = '200, 200, 200'
assign text = 'products.product.inventory_out_of_stock' | t
endif
-%}
<svg width="15" height="15" role="presentation">
<circle cx="7.5" cy="7.5" r="7.5" fill="rgb({{- color -}}, 0.3)"/>
<circle cx="7.5" cy="7.5" r="5" stroke="rgb(255, 255, 255)" stroke-width="1" fill="rgb({{- color -}})"/>
</svg>
{{- text -}}
{%- endif -%}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey @baldurh thanks a lot for your suggestions. We will definitely keep them in mind for the future improvement because they make sence. For now my prioritize will be inventory_quantity != 0
because it affects the functionality. Really good catch. Thanks a lot!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good 😊 glad to help!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Works well 👌 Didn't notice any bugs.
I have one small suggestion and I can re approve once it's been implemented, if decided to be necessary.
sections/main-product.liquid
Outdated
{%- if product.selected_or_first_available_variant.inventory_management == 'shopify' -%} | ||
{%- if product.selected_or_first_available_variant.inventory_quantity > 0 -%} | ||
{%- if product.selected_or_first_available_variant.inventory_quantity <= block.settings.inventory_threshold -%} | ||
<svg width="15" height="15" role="presentation"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a small thing but on most of our SVGs we now have aria-hidden="true"
and removed the the role="presentation"
recently so maybe we should follow the same pattern here: #2037
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should try and add this change before we merge 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, I'll do it now. Thanks Ludo.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've tested this and it to work well for me 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good on my end 🤔 👍 🎉
* Add "Maximum Products to Show" setting to Product Recommendations section (Shopify#1429) * Add missing gradient support (Shopify#1304) * Add missing gradients to cards * Enforce solid bg on quantity input * Add gradient to cart notification * Add to nav, img banner, facets, slideshow, etc * Add to media modal * Add to submenu * Remove search popup gradient * Fix mobile facets scrolling/background * Adjust mobile nav gradients * Cleanup * fix border radius on combination inputs * Fix password page email signup input (Shopify#1421) * Setup theme-check GitHub annotations (Shopify#1422) * test something real quick (Shopify#1467) * Cleanup product media grid spacing (Shopify#1444) * Cleanup product media grid * Adjust grid selectors * Hopefully fix arrow alignment * Fix non-stacked item widths * Update color list order and simplify section string (Shopify#1413) * update color list order * change announcement bar string * fix label * update collapsible content * update email signup banner * update footer * update header * update image banner * update image with text * update password header and footer * update email signup * update rich text and slideshow * update missing translations * Update 20 translation files * Update sections/announcement-bar.liquid Co-authored-by: Ludo <ludo.segura@shopify.com> Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> Co-authored-by: Ludo <ludo.segura@shopify.com> * Add mega menu (Shopify#1316) * Simplify header dropdown menu CSS selectors * Create popup utility class to apply popup global settings styles * Add mega menu settings to header section. Add en locale. Add mega menu liquid as snippet. Add mega menu css * Fix indent * Add info to menu type setting * Remove condition for showing dropdown menus for subcategories with no children * Force zero border-radius and top/bottom border for mega menu container since it's full width * Update 1 translation file * Prevent mega menu shadows from overlapping header by reducing menu content z-index. Clean up unused CSS * Add todo * Show mega menu top border only if header does not have separator line enabled * Remove empty line * Update 16 translation files * Update 3 translation files * Remove mega menu snippet since contents are not being re-used. Add mega menu liquid in header directly instead * Update assets/component-mega-menu.css Co-authored-by: MM <martina.marien@shopify.com> * Rename utility class * Add mega menu content layout and styles (Shopify#1338) * Add grid for mega menu content and styles for links * Remove role="list" from ul elements since list is ul elements' default role * Adjust link styles * Set mega menu content max height based on viewport height. Use header bottom position set in JS for calculation * Round position value down instead of up to be more consistent with other instances where --header-bottom-position value is set in JS * Fix spacing * Change level 2 link color to better distinguish from level 3 links * Revert mega menu heading opacity to improve color contrast * Merge branch 'add-mega-menu' of https://github.com/Shopify/dawn into add-mega-menu-content # Conflicts: # snippets/mega-menu.liquid * Add id to mega menu content container (JS will use id to add aria-control attribute to summary element). Add role="list" to ul in mega menu for a11y (when list bullets are removed some assistive technologies may not convey ul as list without explicit role) * Fix typo * Combine css properties for same class * Set mega menu links to display block to ensure bigger touch target * Add some bottom offset to menu max-height to prevent iOS Safari from cutting off bottom of menu * Update link style (remove uppercase) for 2nd level links that have no children * Update L2 link font to bold. Use Liquid to calculate bold font-weight value: "bold" will be +300 relative to default body font-weight, but restricted to max of 1000 * Address feedback. Add explicit role="list" for a11y (when list bullets are removed some assistive technologies may not convey ul as list without explicit role) * Use rem instead of px * Remove redundant css * Update line height to account for body scale * Move JS to set header bottom position CSS variable to its own custom HTML component. This is to ensure this snippet of JS does not run if not needed * Remove usage of --viewport-height since its value may not have been set * Update references (in JS and CSS) to details-disclosure to also account for header-menu which extends details-disclosure * Update logic to set --header-bottom-position-desktop value when menu is toggled, instead of in constructor. This ensures the header is visible when the value is calculated Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> Co-authored-by: MM <martina.marien@shopify.com> * Update translations: merchant (Shopify#1474) * Update 1 translation file (Shopify#1475) * Center align payment terms form text when there is no image (Shopify#1473) * Add grid settings to collections list (Shopify#1469) * Feat. collection updates (Shopify#1295) * Update 20 translation files (Shopify#1487) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Theme check manual fixes (Shopify#1379) * Clean up behaviour when there are only L2 links mega menu (Shopify#1492) * Center mega menu (Shopify#1482) * Update 1 translation file (Shopify#1499) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Video alt text info content update (Shopify#935) * Video alt text info content update * Update locales/en.default.schema.json * Update locales/en.default.schema.json * Update 4 translation files * Update 3 translation files * Update 9 translation files * Update 3 translation files * Update 1 translation file Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Adjust color contrast for Vendor on the cart page (Shopify#1462) * Add support for boolean filters (Shopify#1456) * Fixed condensed mega menu (Shopify#1504) * Fixed condensed mega menu * Fixed bug where product page thumbnail slider arrows were appearing when they shouldnt (Shopify#1510) * Fixed multicolumn gap spacing on mobile (Shopify#1505) * Fixed multicolumn gap spacing on mobile * Fixed max price display on filter drawer (Shopify#1512) * Theme check TemplateLength (Shopify#1511) * Add PR checkbox for theme documentation (Shopify#1516) * Add PR checkbox for theme documentation * Update .github/PULL_REQUEST_TEMPLATE.md * Update 1 translation file (Shopify#1517) * Update 1 translation file (Shopify#1528) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update 1 translation file (Shopify#1533) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update 1 translation file (Shopify#1536) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Quick Add (Shopify#1388) * Featured Collection : Fix max width setting (Shopify#1538) * Fix product rating help doc links (Shopify#1532) * fix links for product rating * Update 20 translation files * update os2 links and remove /en * update other URL to remove the language path * Update 20 translation files Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Prevent empty heading in contact form (Shopify#1515) * Only render contact heading if not empty * Add fallback form heading * Move title string * Update 21 translation files * Update 3 translation files * Update 6 translation files Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Move slideshow control buttons when set to autorotate (Shopify#1523) * Update 1 translation file (Shopify#1554) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Hide inactive mobile menu items from screen readers (Shopify#1493) * Hide mobile menu ancestors from screen readers * Account for close button * Cleanup on drawer close * Account for mobile facets drawer * Vertical filter (Shopify#1443) * Remove transforms from image with text content (Shopify#1560) * Fix shop link on giftcard page (Shopify#1557) Co-authored-by: Max@SMAKK <max-smakk@MacBook-Pro-4.local> * Using font size and spacing for mega menu hierarchy (Shopify#1520) * Using font size and spacing for mega menu hierarchy Co-authored-by: LucasLacerdaUX <lucas.lacerda@shopify.com> Co-authored-by: Lucas Lacerda <37168033+LucasLacerdaUX@users.noreply.github.com> * Update translations: buyer (Shopify#1581) * Update 1 translation file * Update 1 translation file Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Quick Add: Fix button overflow on mobile carousel (Shopify#1567) * Update spacing (Shopify#1588) * Vertical filter UX follow ups (Shopify#1568) * Vertical filter follow ups * Fix button alignment * Fix search sort * Fix sort * Fix wrapping * Fix overflow * Fix empty space * Fix button no js * Fix button style * Fix filter column * Apply secondary style * Apply button * Fix search * Fix no-js layout for drawer and product count position (Shopify#1572) * fix no-js layout for drawer and product count position * udpate vertical product count position on drawer on desktop * fix broken html * remove unnecessary facets class * update some logic to fix state after rebase * fix spacing * Update margin formatting Co-authored-by: Ludo <ludo.segura@shopify.com> * Update padding formatting Co-authored-by: Ludo <ludo.segura@shopify.com> * Add hidden inputs to preserve search queries (Shopify#1585) * fix no-js layout for drawer and product count position * udpate vertical product count position on drawer on desktop * fix broken html * remove unnecessary facets class * update some logic to fix state after rebase * fix spacing * Add hidden inputs to preserve search queries Co-authored-by: MM <martina.marien@shopify.com> Co-authored-by: Ludo <ludo.segura@shopify.com> * Version bump v5.0.0 (Shopify#1624) * Remove unused setting (Shopify#1617) * Update 5 translation files (Shopify#1626) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update 1 translation file (Shopify#1634) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Remove recaptcha visibility hidden on contact form (Shopify#1637) * Fix Product strucure-data markup for Brand property (Shopify#1600) * Fix empty collection links (Shopify#1639) * Fix first image lazy load on main product section (Shopify#1286) * Make sure first image is not lazy loaded * Use a single liquid tag * Update sections/main-product.liquid Co-authored-by: Andrew Etchen <andrew.etchen@shopify.com> Co-authored-by: Andrew Etchen <andrew.etchen@shopify.com> * replace the hex code by currentColor (Shopify#1591) * Cart drawer (Shopify#1544) * Fix button spinner in Safari (Shopify#1646) * Rich text improvements (Shopify#1635) * [Header] add setting to tweak top and bottom padding (Shopify#1654) * Add header padding setting * Update minimum to 5 * Changed defaults * Update header with option 2 * Remove unnecessary code * Update translations: buyer (Shopify#1659) * Update translations: merchant (Shopify#1681) * Remove gradient when slide container is set to be hidden on desktop (Shopify#1643) * Revert flex grow on collage card__content (Shopify#1662) * Update minimum header padding to zero (Shopify#1688) * Fix a typo in main-product.liquid (Shopify#1647) * 1-click Quick Add for products with 1 non-default variant (Shopify#1610) * Add 1-click quick-add support for products with exactly 1 non-default variant * Revert "Add 1-click quick-add support for products with exactly 1 non-default variant" This reverts commit 41648ca. * Add 1-click quick-add support for products with exactly 1 non-default variant * Switch to Variants Size * Update spacing below product media (Shopify#1689) * Update spacing below product media * Update visible * Remove extra spacing * Update desktop layout * Revert button type and button 1 ids (Shopify#1705) * Update Banner image and logo Image to use `image_tag` (Shopify#1701) * Fix product media slider peek (Shopify#1696) * Account for gap spacing in product slider width * Prevent slider arrows with single media * Remove alt text to improve screen reader experience (Shopify#1679) * Update Subtotal header for a11y (Shopify#1680) * Remove extra whitespace on Quick Add modals (Shopify#1706) * Always centered * Non centered * Revert height * Set height to initial height * Revert fixed height * Remove extra * Update 1 translation file (Shopify#1715) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * [Collapsible content] Add vertical padding to blocks (Shopify#1655) * Fix padding. top and bottom now gets 1.5rem * Set padding-top to 0 * Fix syntax error caused by missing calc in product CSS (Shopify#1703) * Update 1 translation file (Shopify#1739) * Cart drawer section fix (Shopify#1742) * Update translations: merchant (Shopify#1757) * Version bump v6.0.0 (Shopify#1769) * Version bump Update theme version to v6.0.0 * Update release-notes.md * Update release-notes.md Co-authored-by: Ludo <ludo.segura@shopify.com> * Update release-notes.md Co-authored-by: Ludo <ludo.segura@shopify.com> * Update release-notes.md Co-authored-by: Lucas Lacerda <37168033+LucasLacerdaUX@users.noreply.github.com> * Update release-notes.md Co-authored-by: Ludo <ludo.segura@shopify.com> Co-authored-by: Lucas Lacerda <37168033+LucasLacerdaUX@users.noreply.github.com> * Fix box shadow being cut off on sliders (Shopify#1772) * Update contact-form.liquid (Shopify#1716) * Update main-cart-items.liquid (Shopify#1717) * Update main-collection-banner.liquid (Shopify#1718) * Remove menu title requirement (Shopify#1763) * Menu heading Remove requirement for menu heading in footer to display * Update footer.liquid * Remove helper text * Remove translations * Update footer * Update footer * Update footer * Update footer * Revert changes * Fixes * Update * Update to footer * Badge padding update (Shopify#1785) * Add video button aria label (Shopify#1728) * Change aria for active pagination nav control (Shopify#1727) * Update 1 translation file (Shopify#1809) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Warn users that link opens in a new window (Shopify#1735) * Add unique ids to card-product.liquid headings and product state badges (Shopify#1731) * Badge product card position copy update (Shopify#1795) * Badge product card position copy update * Update 7 translation files * Update 3 translation files * Update 6 translation files * Update 3 translation files * Update 1 translation file Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Distinct View All IDs for screen readers (Shopify#1733) * Fix Quick Add when cart type is set to Page (remove data-cart-type) (Shopify#1817) * Replaced a missing </div> tag in main-search.liquid (Shopify#1804) * version bump to 6.0.2 (Shopify#1819) * Add help text to the Variant Pills settings area (Shopify#1782) * Add help text to the Variant Pills settings section. * Update copy as per reviews. * Update 5 translation files * Update 4 translation files * Update 8 translation files * Update 2 translation files * Update 1 translation file Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update translations: buyer (Shopify#1828) * Update 1 translation file * Update locales/th.json Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> Co-authored-by: Ludo <ludo.segura@shopify.com> * Update translations: merchant (Shopify#1818) * Update 1 translation file * Update 1 translation file * Update 1 translation file * Update locales/th.schema.json * Update 1 translation file * Update th.schema.json Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> Co-authored-by: Ludo <ludo.segura@shopify.com> * Remove duplicate .hidden class in base.css (Shopify#1811) * Setting border-top to 0.1rem to match with header navigation (Shopify#1802) updating component-facets.css to match div line width from the header * Add period to Cart global setting info text (Shopify#1751) * add period to info text * Update 1 translation file * Update 9 translation files * Update 9 translation files * Update 1 translation file Co-authored-by: Melissa Perreault <melissaperreault@Melissas-MacBook-Pro.local> Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Add focus ring/border in Windows High Contrast mode (Shopify#1729) * Update 1 translation file (Shopify#1836) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Announcment alignment (Shopify#1770) * Announcement and translation * Alignment for announcement bar * Translations * Update alignment and order of options. * Update locales/th.schema.json Co-authored-by: Andrew Etchen <andrew.etchen@shopify.com> * Uniform padding with link * Make colour go full width * Full width hover and justify text * Update sections/announcement-bar.liquid Co-authored-by: Ludo <ludo.segura@shopify.com> * Remove justify * Remove justify Co-authored-by: Andrew Etchen <andrew.etchen@shopify.com> Co-authored-by: Ludo <ludo.segura@shopify.com> * Add pagination to main collection list (Shopify#1745) * Jsonify customer sections (Shopify#1640) * Update translations: merchant (Shopify#1843) * Update 20 translation files * Update 1 translation file * Update 20 translation files Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update 1 translation file (Shopify#1849) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update PULL_REQUEST_TEMPLATE.md * Remove CLA from probot and use new GitHub action (Shopify#1859) * Update 1 translation file (Shopify#1862) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Add `reopened` activity type (Shopify#1874) * add vendor to popup notification when vendor checkbox is checked (Shopify#1870) * Add proper product title to data-shopify-title (Shopify#1858) * Update 1 translation file (Shopify#1872) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Use param_name instead of label to construct an id for filter values (Shopify#839) * Fix linting issues in feature-product and main-product sections (Shopify#1873) * fix linting issues in feature-product and main-product sections * use button--secondary when dynamic checkout or subscriptions enabled (Shopify#1875) * [Card Settings] Break card global settings into Blog, Collection and Product Cards (Shopify#1774) * [Header] New logo position (Shopify#1864) * update predictive search container width (Shopify#1878) * update predictive search container width on small screens * Update 20 translation files (Shopify#1891) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Fix filter bug to allow filters to be removed (Shopify#1890) * [Product layout] Add desktop media position (Shopify#1720) * Update 2 translation files (Shopify#1896) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Switch blog header img to eager instead of lazy load (Shopify#1894) * Update 1 translation file (Shopify#1899) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * fix(sections/header): remove duplicated classnames (Shopify#1853) * change done in pickup availability (Shopify#1831) * Fix spaces in menu IDs by replacing titles with handles (Shopify#1846) * Increase left and top edge for zoom-icon element (Shopify#1902) * Increase left and top edge for zoom-icon element * Minor changes that I forgot undo * Delete unnecessary whitespace * Change left and top edges to 1.2rem * fix: drawer - typing in quantity and pressing enter empties cart (Shopify#1881) * hide quick add button when javascript is disabled (Shopify#1904) * hide quick add button when javascript disabled * Update PULL_REQUEST_TEMPLATE.md (Shopify#1892) * Update PULL_REQUEST_TEMPLATE.md * Update PULL_REQUEST_TEMPLATE.md Adding hidden markdown * Update .github/PULL_REQUEST_TEMPLATE.md Co-authored-by: MM <martina.marien@shopify.com> * Update .github/PULL_REQUEST_TEMPLATE.md Co-authored-by: Lucas Lacerda <37168033+LucasLacerdaUX@users.noreply.github.com> * Apply suggestions from code review * Update .github/PULL_REQUEST_TEMPLATE.md * Edit based on feedback Co-authored-by: MM <martina.marien@shopify.com> Co-authored-by: Lucas Lacerda <37168033+LucasLacerdaUX@users.noreply.github.com> * Update Lighthouse CI (Shopify#1898) * Update card style default for collage (Shopify#1922) * Update 1 translation file (Shopify#1924) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update PULL_REQUEST_TEMPLATE.md to include visual change reference (Shopify#1923) * Update PULL_REQUEST_TEMPLATE.md * Change bold to heading markup * Fix slider padding and whitespace issue on Safari (Shopify#1669) * Update 1 translation file (Shopify#1928) * Add a max width to iframes within the product info container (Shopify#1929) * Fix popup cart notification overlap in the latest Safari version (Shopify#1912) * Fix video controls on the feat product section (Shopify#1940) * Update 1 translation file (Shopify#1948) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update 1 translation file (Shopify#1949) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update 1 translation file (Shopify#1951) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * [Product page] Add 2 column layout for desktop and mobile (Shopify#1766) * Android menu drawer account fix (Shopify#1945) * Fix android menu drawer not showing account * remove unnecessary code * Update 8 translation files (Shopify#1956) * Use image tag (Shopify#1906) * image_tag in collage * image_tag in multicolumn * image_tag in slideshow * image_tag in image_with_text * image_tag in collapsible-content * image_tag in video * Apply suggestions from code review Co-authored-by: Lucas Lacerda <37168033+LucasLacerdaUX@users.noreply.github.com> * PR review: Clean up whitespace on capture def Co-authored-by: Kyle Conrad <kcomrade53@gmail.com> Co-authored-by: Lucas Lacerda <37168033+LucasLacerdaUX@users.noreply.github.com> Co-authored-by: Kyle Conrad <kyle.conrad@shopify.com> * Complementary products (Shopify#1938) * Update translations: buyer (Shopify#1963) * Update 29 translation files * Update 1 translation file Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Fix shadow being cut on featured collection slider, featured blog slider and collection list slider (Shopify#1961) * Fix shadow being cut on feat collection slider * Missing commit * Remove file * Rename * Add class * Remove Product Subtitle block from Featured Product section (Shopify#1964) * Remove Text Block for Product Subtitle on Dawn's pre-configured Product Page and Featured Collection sections * Remove caption from block order * Revert change for json templates * [Complementary product] Keep text alignment to the left for horizontal cards (Shopify#1965) * Keep text alignment to the left for horizontal cards * prevent image padding from global product cards settings to apply * Update version and release notes (Shopify#1966) * fix margin-top on middle center header option (Shopify#1970) * Update 1 translation file (Shopify#1967) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * fix slider controls showing in certain scenarios on mobile (Shopify#1973) * fix closing element (Shopify#1981) * Variant media modal fix (Shopify#1985) * Fix duplicate class attr issue * Prevent use of lazy_load variable in complementary block * Ensure complementary block loads card css (Shopify#1991) * [Complementary block] update url from the info text to the latest (Shopify#1974) * update url from the info text to the latest * fix parentheses * Update 20 translation files Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Add version bump and release notes (Shopify#1997) * Enable language/country selector by default (Shopify#1988) * Fetch the header (LCP) image at high priority (Shopify#1918) * [Product page] "Icon with text" block (Shopify#1933) Add a new Icon-With-Text block to Product Page * Add shopify attributes to description block on product page (Shopify#2005) * Add variant picker sold out UI [temporary solution] (Shopify#1407) * Move product media gallery and modal into snippets [Refactor] (Shopify#1934) * Move product media gallery and modal into snippets * Gallery snippet api adjustments * Fixes for featured product flexibility * Exclude media_size from gallery api * Update 1 translation file (Shopify#2023) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Remove setting for variant styling (Shopify#2025) * Remove setting for variant styling * wrong edit fix * Update 30 translation files (Shopify#2026) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Minor improvements to product media liquid [Refactor] (Shopify#2022) * Refactor ratio usage in product thumbnail * Fix zoom icon placement and featured product issues * Minor updates * Prevent ui changes from variant selection queues (Shopify#2030) * Prevent hidden Variant Picker block from breaking Quick Add (Shopify#2049) * Fix 'Cannot read properties of null' error in SliderComponent (Shopify#2053) * remove redundant role from SVGs (Shopify#2037) * remove redundant role from SVGs * hide icons from screen readers * Fix z-index issue for mega menu in Safari (Shopify#2034) * Fix z-index issue for mega menu in Safari * add comment with context * small edits * change approach * [PDP] Add SKU block (Shopify#1987) Add SKU block to PDP * Adjust mobile media selectors for new product-thumbnail markup (Shopify#2050) * Add zoom flexibility (Shopify#1983) add 'lightbox', 'hover', and 'none' zoom settings to images * Prevent media background on deferred-media container (Shopify#2068) * Add Inventory status block (Shopify#1979) * [Product page & feat. product] Fix unavailable variant issue (Shopify#2031) * Reset to default * Reset files * Reset changes Co-authored-by: Sofia Matulis <sofiamatulis@users.noreply.github.com> Co-authored-by: Ken Meleta <30790058+kmeleta@users.noreply.github.com> Co-authored-by: Andrew Etchen <andrew.etchen@shopify.com> Co-authored-by: Charles-Philippe Clermont <cp.clermont@shopify.com> Co-authored-by: melissaperreault <melissa.perreault@shopify.com> Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> Co-authored-by: Ludo <ludo.segura@shopify.com> Co-authored-by: Kai <KaichenWang@users.noreply.github.com> Co-authored-by: MM <martina.marien@shopify.com> Co-authored-by: Talia Harrison-Marcassa <taliahm@users.noreply.github.com> Co-authored-by: Caroline <mllegeorgesand@gmail.com> Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com> Co-authored-by: Lucas Lacerda <37168033+LucasLacerdaUX@users.noreply.github.com> Co-authored-by: Maximilian Bredow <30573532+bredowmax@users.noreply.github.com> Co-authored-by: Max@SMAKK <max-smakk@MacBook-Pro-4.local> Co-authored-by: LucasLacerdaUX <lucas.lacerda@shopify.com> Co-authored-by: Antonio J <antonio.jhun62@gmail.com> Co-authored-by: Baldur Helgason <baldur.helgason@gmail.com> Co-authored-by: Alexander <alex@inso.codes> Co-authored-by: Lee Siong Chan <leesiongchan@users.noreply.github.com> Co-authored-by: Peretz Cohen <pizzaz93@users.noreply.github.com> Co-authored-by: boltgolt <boltgolt@gmail.com> Co-authored-by: Alistair Lane <alistair.lane@shopify.com> Co-authored-by: Oliviammarcello <60230008+Oliviammarcello@users.noreply.github.com> Co-authored-by: James <james@thoughtandmortar.com> Co-authored-by: Kjell Reigstad <1202812+kjellr@users.noreply.github.com> Co-authored-by: Gage <ItsGageHolland@gmail.com> Co-authored-by: Daniel Nieuwenhuizen <danielvan@gmail.com> Co-authored-by: Melissa Perreault <melissaperreault@Melissas-MacBook-Pro.local> Co-authored-by: Yevhenii Huselietov <d46k16@gmail.com> Co-authored-by: Monica Mateiu <monica.mateiu@gmail.com> Co-authored-by: Monica Mateiu <monica.mateiu@shopify.com> Co-authored-by: Sia <siakaramalegos@gmail.com> Co-authored-by: Kasper Andersson <KasperAndersson@users.noreply.github.com> Co-authored-by: Muhammad Abdullah <76752572+dexter845@users.noreply.github.com> Co-authored-by: Nathan Dawson <n_dawson@me.com> Co-authored-by: Eugene Kasimov <105315663+eugenekasimov@users.noreply.github.com> Co-authored-by: Robert <treboryx@gmail.com> Co-authored-by: Tyler Rowsell <tyler.rowsell@shopify.com> Co-authored-by: Kyle Conrad <kcomrade53@gmail.com> Co-authored-by: Kyle Conrad <kyle.conrad@shopify.com> Co-authored-by: Lucas Kim <s.lucas.kim@gmail.com> Co-authored-by: Sia <sia.karamalegos@shopify.com> Co-authored-by: CFX <cfxd@users.noreply.github.com>
* Add "Maximum Products to Show" setting to Product Recommendations section (Shopify#1429) * Add missing gradient support (Shopify#1304) * Add missing gradients to cards * Enforce solid bg on quantity input * Add gradient to cart notification * Add to nav, img banner, facets, slideshow, etc * Add to media modal * Add to submenu * Remove search popup gradient * Fix mobile facets scrolling/background * Adjust mobile nav gradients * Cleanup * fix border radius on combination inputs * Fix password page email signup input (Shopify#1421) * Setup theme-check GitHub annotations (Shopify#1422) * test something real quick (Shopify#1467) * Cleanup product media grid spacing (Shopify#1444) * Cleanup product media grid * Adjust grid selectors * Hopefully fix arrow alignment * Fix non-stacked item widths * Update color list order and simplify section string (Shopify#1413) * update color list order * change announcement bar string * fix label * update collapsible content * update email signup banner * update footer * update header * update image banner * update image with text * update password header and footer * update email signup * update rich text and slideshow * update missing translations * Update 20 translation files * Update sections/announcement-bar.liquid Co-authored-by: Ludo <ludo.segura@shopify.com> Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> Co-authored-by: Ludo <ludo.segura@shopify.com> * Add mega menu (Shopify#1316) * Simplify header dropdown menu CSS selectors * Create popup utility class to apply popup global settings styles * Add mega menu settings to header section. Add en locale. Add mega menu liquid as snippet. Add mega menu css * Fix indent * Add info to menu type setting * Remove condition for showing dropdown menus for subcategories with no children * Force zero border-radius and top/bottom border for mega menu container since it's full width * Update 1 translation file * Prevent mega menu shadows from overlapping header by reducing menu content z-index. Clean up unused CSS * Add todo * Show mega menu top border only if header does not have separator line enabled * Remove empty line * Update 16 translation files * Update 3 translation files * Remove mega menu snippet since contents are not being re-used. Add mega menu liquid in header directly instead * Update assets/component-mega-menu.css Co-authored-by: MM <martina.marien@shopify.com> * Rename utility class * Add mega menu content layout and styles (Shopify#1338) * Add grid for mega menu content and styles for links * Remove role="list" from ul elements since list is ul elements' default role * Adjust link styles * Set mega menu content max height based on viewport height. Use header bottom position set in JS for calculation * Round position value down instead of up to be more consistent with other instances where --header-bottom-position value is set in JS * Fix spacing * Change level 2 link color to better distinguish from level 3 links * Revert mega menu heading opacity to improve color contrast * Merge branch 'add-mega-menu' of https://github.com/Shopify/dawn into add-mega-menu-content # Conflicts: # snippets/mega-menu.liquid * Add id to mega menu content container (JS will use id to add aria-control attribute to summary element). Add role="list" to ul in mega menu for a11y (when list bullets are removed some assistive technologies may not convey ul as list without explicit role) * Fix typo * Combine css properties for same class * Set mega menu links to display block to ensure bigger touch target * Add some bottom offset to menu max-height to prevent iOS Safari from cutting off bottom of menu * Update link style (remove uppercase) for 2nd level links that have no children * Update L2 link font to bold. Use Liquid to calculate bold font-weight value: "bold" will be +300 relative to default body font-weight, but restricted to max of 1000 * Address feedback. Add explicit role="list" for a11y (when list bullets are removed some assistive technologies may not convey ul as list without explicit role) * Use rem instead of px * Remove redundant css * Update line height to account for body scale * Move JS to set header bottom position CSS variable to its own custom HTML component. This is to ensure this snippet of JS does not run if not needed * Remove usage of --viewport-height since its value may not have been set * Update references (in JS and CSS) to details-disclosure to also account for header-menu which extends details-disclosure * Update logic to set --header-bottom-position-desktop value when menu is toggled, instead of in constructor. This ensures the header is visible when the value is calculated Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> Co-authored-by: MM <martina.marien@shopify.com> * Update translations: merchant (Shopify#1474) * Update 1 translation file (Shopify#1475) * Center align payment terms form text when there is no image (Shopify#1473) * Add grid settings to collections list (Shopify#1469) * Feat. collection updates (Shopify#1295) * Update 20 translation files (Shopify#1487) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Theme check manual fixes (Shopify#1379) * Clean up behaviour when there are only L2 links mega menu (Shopify#1492) * Center mega menu (Shopify#1482) * Update 1 translation file (Shopify#1499) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Video alt text info content update (Shopify#935) * Video alt text info content update * Update locales/en.default.schema.json * Update locales/en.default.schema.json * Update 4 translation files * Update 3 translation files * Update 9 translation files * Update 3 translation files * Update 1 translation file Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Adjust color contrast for Vendor on the cart page (Shopify#1462) * Add support for boolean filters (Shopify#1456) * Fixed condensed mega menu (Shopify#1504) * Fixed condensed mega menu * Fixed bug where product page thumbnail slider arrows were appearing when they shouldnt (Shopify#1510) * Fixed multicolumn gap spacing on mobile (Shopify#1505) * Fixed multicolumn gap spacing on mobile * Fixed max price display on filter drawer (Shopify#1512) * Theme check TemplateLength (Shopify#1511) * Add PR checkbox for theme documentation (Shopify#1516) * Add PR checkbox for theme documentation * Update .github/PULL_REQUEST_TEMPLATE.md * Update 1 translation file (Shopify#1517) * Update 1 translation file (Shopify#1528) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update 1 translation file (Shopify#1533) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update 1 translation file (Shopify#1536) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Quick Add (Shopify#1388) * Featured Collection : Fix max width setting (Shopify#1538) * Fix product rating help doc links (Shopify#1532) * fix links for product rating * Update 20 translation files * update os2 links and remove /en * update other URL to remove the language path * Update 20 translation files Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Prevent empty heading in contact form (Shopify#1515) * Only render contact heading if not empty * Add fallback form heading * Move title string * Update 21 translation files * Update 3 translation files * Update 6 translation files Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Move slideshow control buttons when set to autorotate (Shopify#1523) * Update 1 translation file (Shopify#1554) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Hide inactive mobile menu items from screen readers (Shopify#1493) * Hide mobile menu ancestors from screen readers * Account for close button * Cleanup on drawer close * Account for mobile facets drawer * Vertical filter (Shopify#1443) * Remove transforms from image with text content (Shopify#1560) * Fix shop link on giftcard page (Shopify#1557) Co-authored-by: Max@SMAKK <max-smakk@MacBook-Pro-4.local> * Using font size and spacing for mega menu hierarchy (Shopify#1520) * Using font size and spacing for mega menu hierarchy Co-authored-by: LucasLacerdaUX <lucas.lacerda@shopify.com> Co-authored-by: Lucas Lacerda <37168033+LucasLacerdaUX@users.noreply.github.com> * Update translations: buyer (Shopify#1581) * Update 1 translation file * Update 1 translation file Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Quick Add: Fix button overflow on mobile carousel (Shopify#1567) * Update spacing (Shopify#1588) * Vertical filter UX follow ups (Shopify#1568) * Vertical filter follow ups * Fix button alignment * Fix search sort * Fix sort * Fix wrapping * Fix overflow * Fix empty space * Fix button no js * Fix button style * Fix filter column * Apply secondary style * Apply button * Fix search * Fix no-js layout for drawer and product count position (Shopify#1572) * fix no-js layout for drawer and product count position * udpate vertical product count position on drawer on desktop * fix broken html * remove unnecessary facets class * update some logic to fix state after rebase * fix spacing * Update margin formatting Co-authored-by: Ludo <ludo.segura@shopify.com> * Update padding formatting Co-authored-by: Ludo <ludo.segura@shopify.com> * Add hidden inputs to preserve search queries (Shopify#1585) * fix no-js layout for drawer and product count position * udpate vertical product count position on drawer on desktop * fix broken html * remove unnecessary facets class * update some logic to fix state after rebase * fix spacing * Add hidden inputs to preserve search queries Co-authored-by: MM <martina.marien@shopify.com> Co-authored-by: Ludo <ludo.segura@shopify.com> * Version bump v5.0.0 (Shopify#1624) * Remove unused setting (Shopify#1617) * Update 5 translation files (Shopify#1626) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update 1 translation file (Shopify#1634) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Remove recaptcha visibility hidden on contact form (Shopify#1637) * Fix Product strucure-data markup for Brand property (Shopify#1600) * Fix empty collection links (Shopify#1639) * Fix first image lazy load on main product section (Shopify#1286) * Make sure first image is not lazy loaded * Use a single liquid tag * Update sections/main-product.liquid Co-authored-by: Andrew Etchen <andrew.etchen@shopify.com> Co-authored-by: Andrew Etchen <andrew.etchen@shopify.com> * replace the hex code by currentColor (Shopify#1591) * Cart drawer (Shopify#1544) * Fix button spinner in Safari (Shopify#1646) * Rich text improvements (Shopify#1635) * [Header] add setting to tweak top and bottom padding (Shopify#1654) * Add header padding setting * Update minimum to 5 * Changed defaults * Update header with option 2 * Remove unnecessary code * Update translations: buyer (Shopify#1659) * Update translations: merchant (Shopify#1681) * Remove gradient when slide container is set to be hidden on desktop (Shopify#1643) * Revert flex grow on collage card__content (Shopify#1662) * Update minimum header padding to zero (Shopify#1688) * Fix a typo in main-product.liquid (Shopify#1647) * 1-click Quick Add for products with 1 non-default variant (Shopify#1610) * Add 1-click quick-add support for products with exactly 1 non-default variant * Revert "Add 1-click quick-add support for products with exactly 1 non-default variant" This reverts commit 41648ca. * Add 1-click quick-add support for products with exactly 1 non-default variant * Switch to Variants Size * Update spacing below product media (Shopify#1689) * Update spacing below product media * Update visible * Remove extra spacing * Update desktop layout * Revert button type and button 1 ids (Shopify#1705) * Update Banner image and logo Image to use `image_tag` (Shopify#1701) * Fix product media slider peek (Shopify#1696) * Account for gap spacing in product slider width * Prevent slider arrows with single media * Remove alt text to improve screen reader experience (Shopify#1679) * Update Subtotal header for a11y (Shopify#1680) * Remove extra whitespace on Quick Add modals (Shopify#1706) * Always centered * Non centered * Revert height * Set height to initial height * Revert fixed height * Remove extra * Update 1 translation file (Shopify#1715) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * [Collapsible content] Add vertical padding to blocks (Shopify#1655) * Fix padding. top and bottom now gets 1.5rem * Set padding-top to 0 * Fix syntax error caused by missing calc in product CSS (Shopify#1703) * Update 1 translation file (Shopify#1739) * Cart drawer section fix (Shopify#1742) * Update translations: merchant (Shopify#1757) * Version bump v6.0.0 (Shopify#1769) * Version bump Update theme version to v6.0.0 * Update release-notes.md * Update release-notes.md Co-authored-by: Ludo <ludo.segura@shopify.com> * Update release-notes.md Co-authored-by: Ludo <ludo.segura@shopify.com> * Update release-notes.md Co-authored-by: Lucas Lacerda <37168033+LucasLacerdaUX@users.noreply.github.com> * Update release-notes.md Co-authored-by: Ludo <ludo.segura@shopify.com> Co-authored-by: Lucas Lacerda <37168033+LucasLacerdaUX@users.noreply.github.com> * Fix box shadow being cut off on sliders (Shopify#1772) * Update contact-form.liquid (Shopify#1716) * Update main-cart-items.liquid (Shopify#1717) * Update main-collection-banner.liquid (Shopify#1718) * Remove menu title requirement (Shopify#1763) * Menu heading Remove requirement for menu heading in footer to display * Update footer.liquid * Remove helper text * Remove translations * Update footer * Update footer * Update footer * Update footer * Revert changes * Fixes * Update * Update to footer * Badge padding update (Shopify#1785) * Add video button aria label (Shopify#1728) * Change aria for active pagination nav control (Shopify#1727) * Update 1 translation file (Shopify#1809) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Warn users that link opens in a new window (Shopify#1735) * Add unique ids to card-product.liquid headings and product state badges (Shopify#1731) * Badge product card position copy update (Shopify#1795) * Badge product card position copy update * Update 7 translation files * Update 3 translation files * Update 6 translation files * Update 3 translation files * Update 1 translation file Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Distinct View All IDs for screen readers (Shopify#1733) * Fix Quick Add when cart type is set to Page (remove data-cart-type) (Shopify#1817) * Replaced a missing </div> tag in main-search.liquid (Shopify#1804) * version bump to 6.0.2 (Shopify#1819) * Add help text to the Variant Pills settings area (Shopify#1782) * Add help text to the Variant Pills settings section. * Update copy as per reviews. * Update 5 translation files * Update 4 translation files * Update 8 translation files * Update 2 translation files * Update 1 translation file Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update translations: buyer (Shopify#1828) * Update 1 translation file * Update locales/th.json Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> Co-authored-by: Ludo <ludo.segura@shopify.com> * Update translations: merchant (Shopify#1818) * Update 1 translation file * Update 1 translation file * Update 1 translation file * Update locales/th.schema.json * Update 1 translation file * Update th.schema.json Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> Co-authored-by: Ludo <ludo.segura@shopify.com> * Remove duplicate .hidden class in base.css (Shopify#1811) * Setting border-top to 0.1rem to match with header navigation (Shopify#1802) updating component-facets.css to match div line width from the header * Add period to Cart global setting info text (Shopify#1751) * add period to info text * Update 1 translation file * Update 9 translation files * Update 9 translation files * Update 1 translation file Co-authored-by: Melissa Perreault <melissaperreault@Melissas-MacBook-Pro.local> Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Add focus ring/border in Windows High Contrast mode (Shopify#1729) * Update 1 translation file (Shopify#1836) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Announcment alignment (Shopify#1770) * Announcement and translation * Alignment for announcement bar * Translations * Update alignment and order of options. * Update locales/th.schema.json Co-authored-by: Andrew Etchen <andrew.etchen@shopify.com> * Uniform padding with link * Make colour go full width * Full width hover and justify text * Update sections/announcement-bar.liquid Co-authored-by: Ludo <ludo.segura@shopify.com> * Remove justify * Remove justify Co-authored-by: Andrew Etchen <andrew.etchen@shopify.com> Co-authored-by: Ludo <ludo.segura@shopify.com> * Add pagination to main collection list (Shopify#1745) * Jsonify customer sections (Shopify#1640) * Update translations: merchant (Shopify#1843) * Update 20 translation files * Update 1 translation file * Update 20 translation files Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update 1 translation file (Shopify#1849) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update PULL_REQUEST_TEMPLATE.md * Remove CLA from probot and use new GitHub action (Shopify#1859) * Update 1 translation file (Shopify#1862) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Add `reopened` activity type (Shopify#1874) * add vendor to popup notification when vendor checkbox is checked (Shopify#1870) * Add proper product title to data-shopify-title (Shopify#1858) * Update 1 translation file (Shopify#1872) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Use param_name instead of label to construct an id for filter values (Shopify#839) * Fix linting issues in feature-product and main-product sections (Shopify#1873) * fix linting issues in feature-product and main-product sections * use button--secondary when dynamic checkout or subscriptions enabled (Shopify#1875) * [Card Settings] Break card global settings into Blog, Collection and Product Cards (Shopify#1774) * [Header] New logo position (Shopify#1864) * update predictive search container width (Shopify#1878) * update predictive search container width on small screens * Update 20 translation files (Shopify#1891) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Fix filter bug to allow filters to be removed (Shopify#1890) * [Product layout] Add desktop media position (Shopify#1720) * Update 2 translation files (Shopify#1896) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Switch blog header img to eager instead of lazy load (Shopify#1894) * Update 1 translation file (Shopify#1899) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * fix(sections/header): remove duplicated classnames (Shopify#1853) * change done in pickup availability (Shopify#1831) * Fix spaces in menu IDs by replacing titles with handles (Shopify#1846) * Increase left and top edge for zoom-icon element (Shopify#1902) * Increase left and top edge for zoom-icon element * Minor changes that I forgot undo * Delete unnecessary whitespace * Change left and top edges to 1.2rem * fix: drawer - typing in quantity and pressing enter empties cart (Shopify#1881) * hide quick add button when javascript is disabled (Shopify#1904) * hide quick add button when javascript disabled * Update PULL_REQUEST_TEMPLATE.md (Shopify#1892) * Update PULL_REQUEST_TEMPLATE.md * Update PULL_REQUEST_TEMPLATE.md Adding hidden markdown * Update .github/PULL_REQUEST_TEMPLATE.md Co-authored-by: MM <martina.marien@shopify.com> * Update .github/PULL_REQUEST_TEMPLATE.md Co-authored-by: Lucas Lacerda <37168033+LucasLacerdaUX@users.noreply.github.com> * Apply suggestions from code review * Update .github/PULL_REQUEST_TEMPLATE.md * Edit based on feedback Co-authored-by: MM <martina.marien@shopify.com> Co-authored-by: Lucas Lacerda <37168033+LucasLacerdaUX@users.noreply.github.com> * Update Lighthouse CI (Shopify#1898) * Update card style default for collage (Shopify#1922) * Update 1 translation file (Shopify#1924) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update PULL_REQUEST_TEMPLATE.md to include visual change reference (Shopify#1923) * Update PULL_REQUEST_TEMPLATE.md * Change bold to heading markup * Fix slider padding and whitespace issue on Safari (Shopify#1669) * Update 1 translation file (Shopify#1928) * Add a max width to iframes within the product info container (Shopify#1929) * Fix popup cart notification overlap in the latest Safari version (Shopify#1912) * Fix video controls on the feat product section (Shopify#1940) * Update 1 translation file (Shopify#1948) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update 1 translation file (Shopify#1949) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Update 1 translation file (Shopify#1951) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * [Product page] Add 2 column layout for desktop and mobile (Shopify#1766) * Android menu drawer account fix (Shopify#1945) * Fix android menu drawer not showing account * remove unnecessary code * Update 8 translation files (Shopify#1956) * Use image tag (Shopify#1906) * image_tag in collage * image_tag in multicolumn * image_tag in slideshow * image_tag in image_with_text * image_tag in collapsible-content * image_tag in video * Apply suggestions from code review Co-authored-by: Lucas Lacerda <37168033+LucasLacerdaUX@users.noreply.github.com> * PR review: Clean up whitespace on capture def Co-authored-by: Kyle Conrad <kcomrade53@gmail.com> Co-authored-by: Lucas Lacerda <37168033+LucasLacerdaUX@users.noreply.github.com> Co-authored-by: Kyle Conrad <kyle.conrad@shopify.com> * Complementary products (Shopify#1938) * Update translations: buyer (Shopify#1963) * Update 29 translation files * Update 1 translation file Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Fix shadow being cut on featured collection slider, featured blog slider and collection list slider (Shopify#1961) * Fix shadow being cut on feat collection slider * Missing commit * Remove file * Rename * Add class * Remove Product Subtitle block from Featured Product section (Shopify#1964) * Remove Text Block for Product Subtitle on Dawn's pre-configured Product Page and Featured Collection sections * Remove caption from block order * Revert change for json templates * [Complementary product] Keep text alignment to the left for horizontal cards (Shopify#1965) * Keep text alignment to the left for horizontal cards * prevent image padding from global product cards settings to apply * Update version and release notes (Shopify#1966) * fix margin-top on middle center header option (Shopify#1970) * Update 1 translation file (Shopify#1967) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * fix slider controls showing in certain scenarios on mobile (Shopify#1973) * fix closing element (Shopify#1981) * Variant media modal fix (Shopify#1985) * Fix duplicate class attr issue * Prevent use of lazy_load variable in complementary block * Ensure complementary block loads card css (Shopify#1991) * [Complementary block] update url from the info text to the latest (Shopify#1974) * update url from the info text to the latest * fix parentheses * Update 20 translation files Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Add version bump and release notes (Shopify#1997) * Enable language/country selector by default (Shopify#1988) * Fetch the header (LCP) image at high priority (Shopify#1918) * [Product page] "Icon with text" block (Shopify#1933) Add a new Icon-With-Text block to Product Page * Add shopify attributes to description block on product page (Shopify#2005) * Add variant picker sold out UI [temporary solution] (Shopify#1407) * Move product media gallery and modal into snippets [Refactor] (Shopify#1934) * Move product media gallery and modal into snippets * Gallery snippet api adjustments * Fixes for featured product flexibility * Exclude media_size from gallery api * Update 1 translation file (Shopify#2023) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Remove setting for variant styling (Shopify#2025) * Remove setting for variant styling * wrong edit fix * Update 30 translation files (Shopify#2026) Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> * Minor improvements to product media liquid [Refactor] (Shopify#2022) * Refactor ratio usage in product thumbnail * Fix zoom icon placement and featured product issues * Minor updates * Prevent ui changes from variant selection queues (Shopify#2030) * Prevent hidden Variant Picker block from breaking Quick Add (Shopify#2049) * Fix 'Cannot read properties of null' error in SliderComponent (Shopify#2053) * remove redundant role from SVGs (Shopify#2037) * remove redundant role from SVGs * hide icons from screen readers * Fix z-index issue for mega menu in Safari (Shopify#2034) * Fix z-index issue for mega menu in Safari * add comment with context * small edits * change approach * [PDP] Add SKU block (Shopify#1987) Add SKU block to PDP * Adjust mobile media selectors for new product-thumbnail markup (Shopify#2050) * Add zoom flexibility (Shopify#1983) add 'lightbox', 'hover', and 'none' zoom settings to images * Prevent media background on deferred-media container (Shopify#2068) * Add Inventory status block (Shopify#1979) * [Product page & feat. product] Fix unavailable variant issue (Shopify#2031) Co-authored-by: Sofia Matulis <sofiamatulis@users.noreply.github.com> Co-authored-by: Ken Meleta <30790058+kmeleta@users.noreply.github.com> Co-authored-by: Andrew Etchen <andrew.etchen@shopify.com> Co-authored-by: Charles-Philippe Clermont <cp.clermont@shopify.com> Co-authored-by: melissaperreault <melissa.perreault@shopify.com> Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com> Co-authored-by: Ludo <ludo.segura@shopify.com> Co-authored-by: Kai <KaichenWang@users.noreply.github.com> Co-authored-by: MM <martina.marien@shopify.com> Co-authored-by: Talia Harrison-Marcassa <taliahm@users.noreply.github.com> Co-authored-by: Caroline <mllegeorgesand@gmail.com> Co-authored-by: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com> Co-authored-by: Lucas Lacerda <37168033+LucasLacerdaUX@users.noreply.github.com> Co-authored-by: Maximilian Bredow <30573532+bredowmax@users.noreply.github.com> Co-authored-by: Max@SMAKK <max-smakk@MacBook-Pro-4.local> Co-authored-by: LucasLacerdaUX <lucas.lacerda@shopify.com> Co-authored-by: Antonio J <antonio.jhun62@gmail.com> Co-authored-by: Baldur Helgason <baldur.helgason@gmail.com> Co-authored-by: Alexander <alex@inso.codes> Co-authored-by: Lee Siong Chan <leesiongchan@users.noreply.github.com> Co-authored-by: Peretz Cohen <pizzaz93@users.noreply.github.com> Co-authored-by: boltgolt <boltgolt@gmail.com> Co-authored-by: Alistair Lane <alistair.lane@shopify.com> Co-authored-by: Oliviammarcello <60230008+Oliviammarcello@users.noreply.github.com> Co-authored-by: James <james@thoughtandmortar.com> Co-authored-by: Kjell Reigstad <1202812+kjellr@users.noreply.github.com> Co-authored-by: Gage <ItsGageHolland@gmail.com> Co-authored-by: Daniel Nieuwenhuizen <danielvan@gmail.com> Co-authored-by: Melissa Perreault <melissaperreault@Melissas-MacBook-Pro.local> Co-authored-by: Yevhenii Huselietov <d46k16@gmail.com> Co-authored-by: Monica Mateiu <monica.mateiu@gmail.com> Co-authored-by: Monica Mateiu <monica.mateiu@shopify.com> Co-authored-by: Sia <siakaramalegos@gmail.com> Co-authored-by: Kasper Andersson <KasperAndersson@users.noreply.github.com> Co-authored-by: Muhammad Abdullah <76752572+dexter845@users.noreply.github.com> Co-authored-by: Nathan Dawson <n_dawson@me.com> Co-authored-by: Eugene Kasimov <105315663+eugenekasimov@users.noreply.github.com> Co-authored-by: Robert <treboryx@gmail.com> Co-authored-by: Tyler Rowsell <tyler.rowsell@shopify.com> Co-authored-by: Kyle Conrad <kcomrade53@gmail.com> Co-authored-by: Kyle Conrad <kyle.conrad@shopify.com> Co-authored-by: Lucas Kim <s.lucas.kim@gmail.com> Co-authored-by: Sia <sia.karamalegos@shopify.com> Co-authored-by: CFX <cfxd@users.noreply.github.com>
PR Summary:
This PR adds an Inventory block to the main-product section. The block allows you to display/hide an amount of items in stock. You can also set a threshold to display "In stock" or "Low stock" status. If stock is 0 then "Out of stock" is displayed. For unavailable variants nothing will be displayed.
Internal Figma
Why are these changes introduced?
Fixes #870
What approach did you take?
renderProductInfo ()
andsetUnavailable
functions to update the inventory stock upon variant selection or hide the block if the varian is not available or is sold out.<noscript>
wrapper] to ensure the inventory quantity is displayed when JS is disabled..product--no-media .product__inventory
as an additional declaration in the [section-main-product.css
] to center the inventory block for products with no media/images.Decision log
In stock
backorder
continue selling
so we don't want to take a guess this wayin stock
can be odd as products with an inventory above0
and lower than the threshold set in the editor setting will show asLow stock
. Going from one to the other seem weirdTesting steps/scenarios
Continue selling when out of stock
in Admin. A good example will be Louise Slide Sandal. Size 36 and 41. It's supposed to show In stock.Show Inventory count
setting off.Demo links
Editor