Skip to content
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

Merge upstream with dawn/main #34 #50

Open
wants to merge 792 commits into
base: main
Choose a base branch
from

Conversation

olafghanizadeh
Copy link

Fixes #35

ludoboludo and others added 30 commits April 28, 2023 11:33
* Refactor with new color schemas and setting types

* Revert badge color refactor and general cleanup

* Replace remaining hardcoded background-1 classes

* Update scheme 1 info

* Small fixes

* Update 14 translation files

* Refactor scheme drop logic

* Update 6 translation files

* Handle vars differently

---------

Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
…2582)

* Fix play button hovers when 3D Lift is active.

* Linting.
* Fix improper image size for collapsible content

* Refactoring and renaming variables.

* Fix prettier issue.

* Minor refactor.
* Change the slider width to 60%

* Change the slider width to 60%

* Add missing ';'

Co-authored-by: Ken Meleta <30790058+kmeleta@users.noreply.github.com>

---------

Co-authored-by: Ken Meleta <30790058+kmeleta@users.noreply.github.com>
* Stop auto-rotation after first interaction with an arrow button.

Prevent auto-rotation for mobile.

Change settings for auto-rotation.

* Change 'resize' to 'change' and max-width to min-width.

* Apply the current changes to the announcement bar only.

* Renaming variables in JS.

* Add a condition for the announcement bar for JS.

* Refactoring JS code.

* Refactor JS.

* Combine mediaQuery into array.
* Remove color scheme default info text

* Manually remove translations
* Raise hovered card above adjacent cards.

* Target more specific classes.

* Increase the z-index so that complementary slides work.

* Only change z-index for hovered articles.

* Remove unnecessary z-index rule.

* Ensure cards don't overlap search popover.

---------

Co-authored-by: Ludo <ludo.segura@shopify.com>
allow multiple announcement bars in header
* Made mobile drawer full width by default-header

* removed the small vertical line border kept appearing on drawer menu when l1,l2&l3 links were opened

* reverted code to include border for customization for tablet and desktop and removed it for mobile version

* removed border in mobile and added it in tablet version using media queries

* removed white space per suggestion
* seperated color scheme for header and menu

* made changes to remove white space as suggested from eugene

* made some changes requested by ken

* changed Header color scheme to Color scheme per yoann request

* removed header_color_scheme translation and set the label back to the global string for color scheme

* Update 15 translation files

* Update 5 translation files

---------

Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
* added vertical padding and made l2 bold to mega menu

* added vertical padding to drop down

* fixed default UI for dropdown and mega menu

* added hover effect to all l2 links and fixed overlapping or mega menu

* adding padding to l3 links and fixed hover effect for dropdown

* reverted the mega menu back to the current setting

* changed horizontal grid gap on mega menu and vertical paddings on dropdown menu

* made vertical grid gap at 1.8 rem to match the 3 rem vertical paddings on mega-menu container

* removed the unnecessary lines of code

* removed the text-thickness that was making l2/l3 links a different size from l1 links

* added a hover effect over active link

* removed uneccessary link size and white space
* Fix color for image in password (#2608)

* [Image behavior] fixed background jitter fix on mobile (#2611)

* [Animation in editor] Remove transform translate when re rendering and re ordering blocks (#2614)

* Remove transform translate when re rendering and re ordering blocks

* target only what's needed

* [bug] Horizontal scrolling on mobile.  (#2617)

* Add overflow-x:hidden to prevent horizontal scrolling on mobile.

* Change margin for slider for mobile and tablet.

* Remove redundant preconnect to cdn.shopify.com (#2621)

* Update reverse scheme (#2626)

* [Footer] Remove Global Media settings inheritance from images (#2631)

* Send timezone offset as string instead of integer (#2636)

* Fix slider scrolling issue (#2635)

* Fix background gradient for Related Products. (#2641)

* Update from Shopify for theme dawn/release/10.0.0

Committed from shop: Skeleton Theme

* Quick add remove animation from image and content (#2657)

* Add default values for color scheme group (#2660)

* Revert unwanted changes (#2669)

* Update from Shopify for theme dawn/release/10.0.0

Committed from shop: Skeleton Theme

* Revert "Update from Shopify for theme dawn/release/10.0.0"

This reverts commit 89d927e.

* Remove forced white text color in Image Banner & Slideshow (#2663)

* Remove forced white color.

* Change color scheme for Dawn's default homepage Image Banner..

* Remove warning about color scheme usage.

* Fix bug with transparent buttons on mobile.

* Remove unused info key from translated files.

* Update display of button when it's in a mobile container.

* Update existing placeholder images (#2610)

* Update existing placeholder images

* Featured collection and product card

* Featured product section

* Collection list section

* Featured blog and multirow sections

* Slideshow: change order of placeholder images

* Collage adjustments for product and collection cards

* Image with text adjustments

* Featured product: re-add `.product--no-media` selectors

* Update featured product section

* Update `card-collection`

* Cleanup `card-collection`

---------

Co-authored-by: Ludo <ludo.segura@shopify.com>

* Gradient fix for transparent background medias and cards (#2651)

* Fix media, product, and collection cards placeholder (#2682)

* Fix missing else for collection cards (#2692)

---------

Co-authored-by: Sofia Matulis <sofiamatulis@users.noreply.github.com>
Co-authored-by: Eugene Kasimov <105315663+eugenekasimov@users.noreply.github.com>
Co-authored-by: Mateusz Krzeszowiak <mateusz.krzeszowiak@shopify.com>
Co-authored-by: Lucas Lacerda <37168033+LucasLacerdaUX@users.noreply.github.com>
Co-authored-by: Kjell Reigstad <kjell@kjellr.com>
Co-authored-by: shopify[bot] <79544226+shopify[bot]@users.noreply.github.com>
Co-authored-by: Ken Meleta <30790058+kmeleta@users.noreply.github.com>
Co-authored-by: Andrew Etchen <andrew.etchen@shopify.com>
* Rename announcement-bar to utility-bar section.
Add basic logic for social-icons in the utility-bar.

* Remove social icons from the utility bar for tablet

Remove social icons snippet

* Prevent auto-rotation after users interact with arrow buttons.

Change the slider width for screens wider than 1200px.

Rename back a file name from utility-bar to announcement-bar.

* Prevent auto-rotation for mobile.

Reduce social icons sizes for in the utility bar.

Change grid system.

* Prevent showing bottom-border when the utility bar is empty.

* Add layout for screens under 1200px.

* Adjust a separater line for max-width: 1199px

* Revert announcement-bar name. Remove additional layout for desktop under 1120px. Remove JS logic.

* Minor changes.

* Refactor of css classes.

Refactor of liquid logic.

Use social-icons as a snippet.

* Refactor in social-icons snippet.

Change the naming in css accordingly BEM.

* Update 14 translation files

* Update 6 translation files

* Change label for show_social.

* Update 15 translation files

* Update 5 translation files

---------

Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
* Use live region to announce recipient form

* Inject text instead of toogling aria-hidden

* Announce form collapsed when checkbox unticked

* Update 20 translation files

* Update 4 translation files

* Update 6 translation files

---------

Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
* added horizontal and vertical padding in Mobile drawer

* vertical padding and horizontal padding work with large lists-need to fix padding w/out scrollbar

* all icons, links are aligned with the close button and shop icon on mobile

* horizontal and vertical paddings all equate to 3rem around Nav and utility links

* added padding to close button on l3 links, adjusted padding for social links

* fixed close button padding
* made the test/default blog post 3 by default

* blog default posts are not mobile responsive and on a slider. created snippet for blog-placeholder that renders into featured-blog with changable arguments

* removed commented out code

* default blog posts now are modifiable by post-limit and column number presets

* reformated code, reverted header back to h1, removed snippet, and made changes as suggested

* noticed the blog section needs a margin bottom when color scheme is applied

* removed padding from blog and removed date and author presets

* Fix link formatting in Related Products heading (#2680)

* fix default UI for dropdown and mega menu (#2644)

* added vertical padding and made l2 bold to mega menu

* added vertical padding to drop down

* fixed default UI for dropdown and mega menu

* added hover effect to all l2 links and fixed overlapping or mega menu

* adding padding to l3 links and fixed hover effect for dropdown

* reverted the mega menu back to the current setting

* changed horizontal grid gap on mega menu and vertical paddings on dropdown menu

* made vertical grid gap at 1.8 rem to match the 3 rem vertical paddings on mega-menu container

* removed the unnecessary lines of code

* removed the text-thickness that was making l2/l3 links a different size from l1 links

* added a hover effect over active link

* removed uneccessary link size and white space

* Add release/v10.0.0 branch fixes to main (#2693)

* Fix color for image in password (#2608)

* [Image behavior] fixed background jitter fix on mobile (#2611)

* [Animation in editor] Remove transform translate when re rendering and re ordering blocks (#2614)

* Remove transform translate when re rendering and re ordering blocks

* target only what's needed

* [bug] Horizontal scrolling on mobile.  (#2617)

* Add overflow-x:hidden to prevent horizontal scrolling on mobile.

* Change margin for slider for mobile and tablet.

* Remove redundant preconnect to cdn.shopify.com (#2621)

* Update reverse scheme (#2626)

* [Footer] Remove Global Media settings inheritance from images (#2631)

* Send timezone offset as string instead of integer (#2636)

* Fix slider scrolling issue (#2635)

* Fix background gradient for Related Products. (#2641)

* Update from Shopify for theme dawn/release/10.0.0

Committed from shop: Skeleton Theme

* Quick add remove animation from image and content (#2657)

* Add default values for color scheme group (#2660)

* Revert unwanted changes (#2669)

* Update from Shopify for theme dawn/release/10.0.0

Committed from shop: Skeleton Theme

* Revert "Update from Shopify for theme dawn/release/10.0.0"

This reverts commit 89d927e.

* Remove forced white text color in Image Banner & Slideshow (#2663)

* Remove forced white color.

* Change color scheme for Dawn's default homepage Image Banner..

* Remove warning about color scheme usage.

* Fix bug with transparent buttons on mobile.

* Remove unused info key from translated files.

* Update display of button when it's in a mobile container.

* Update existing placeholder images (#2610)

* Update existing placeholder images

* Featured collection and product card

* Featured product section

* Collection list section

* Featured blog and multirow sections

* Slideshow: change order of placeholder images

* Collage adjustments for product and collection cards

* Image with text adjustments

* Featured product: re-add `.product--no-media` selectors

* Update featured product section

* Update `card-collection`

* Cleanup `card-collection`

---------

Co-authored-by: Ludo <ludo.segura@shopify.com>

* Gradient fix for transparent background medias and cards (#2651)

* Fix media, product, and collection cards placeholder (#2682)

* Fix missing else for collection cards (#2692)

---------

Co-authored-by: Sofia Matulis <sofiamatulis@users.noreply.github.com>
Co-authored-by: Eugene Kasimov <105315663+eugenekasimov@users.noreply.github.com>
Co-authored-by: Mateusz Krzeszowiak <mateusz.krzeszowiak@shopify.com>
Co-authored-by: Lucas Lacerda <37168033+LucasLacerdaUX@users.noreply.github.com>
Co-authored-by: Kjell Reigstad <kjell@kjellr.com>
Co-authored-by: shopify[bot] <79544226+shopify[bot]@users.noreply.github.com>
Co-authored-by: Ken Meleta <30790058+kmeleta@users.noreply.github.com>
Co-authored-by: Andrew Etchen <andrew.etchen@shopify.com>

* made the test/default blog post 3 by default

* added updated placeholder image

* added the different placeholder images, while maintaining ability to edit with presets

* blog card theme settings work on default blog posts

* removed css that wasn't being used

* reverted to original code without theme settings

* fixed prettier error by removing extra quotation mark and made test blog default instead of news

---------

Co-authored-by: Jon Neill <jonathan.neill@shopify.com>
Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: Sofia Matulis <sofiamatulis@users.noreply.github.com>
Co-authored-by: Eugene Kasimov <105315663+eugenekasimov@users.noreply.github.com>
Co-authored-by: Mateusz Krzeszowiak <mateusz.krzeszowiak@shopify.com>
Co-authored-by: Lucas Lacerda <37168033+LucasLacerdaUX@users.noreply.github.com>
Co-authored-by: Kjell Reigstad <kjell@kjellr.com>
Co-authored-by: shopify[bot] <79544226+shopify[bot]@users.noreply.github.com>
Co-authored-by: Ken Meleta <30790058+kmeleta@users.noreply.github.com>
Co-authored-by: Andrew Etchen <andrew.etchen@shopify.com>
lhoffbeck and others added 30 commits June 6, 2024 11:15
* Deduplicate the option value IDs after option value selection changes in quick add modal
* Add gigantic heading size.

* Use global translations in multirow.

* Standardize heading font size offerings.

* Change "Gigantic" to "Giant"

* Set line height for new font size.

* Update 10 translation files

* Decrease Giant font size, update line height too.

* Define line height for hxl.

* Fix incorrect reference.

* Set large line height to 1.1 all the time.

* Adjust `vw` value in clamp so that the Giant font size is always larger than the Extra Large.

* Change string to "Extra Extra Large"

* Change text case.

* Update 13 translation files

* Update 4 translation files

* Update 2 translation files

* Update 1 translation file

---------

Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
* Limit the number of stylesheets on the page

* Apply suggestions from code review

Co-authored-by: Ludo <ludo.segura@shopify.com>

* Improve the logic and wording a bit

---------

Co-authored-by: Ludo <ludo.segura@shopify.com>
* [Product] Zoom on hover fix on variant change (#3511)

* Zoom on hover fix on variant change

* add conditional

* Add early return in updateQuantityRules function if no quantity selector is present (#3515)

* Fix bug where request url contains duplicated params when switching before the prior response is returned (#3521)

* Fixes bug where image flashes when switching to variant with the same featured image; fixes bug where variant without featured image would fallback to the product image (#3516)

Fix issue with thumbnail not updating

* Fixed bug when reading selected option values. Removed unused script tag containing variant json. (#3520)

* escape titles that weren't (#3514)

* Support multiple product templates for the same combined listing (#3526)

* Updated quick order list to rely on the variant title field (#3528)

* Release15fix (#3531)

* Revert "Update from Shopify for theme dawn/release/15.0.0"

This reverts commit 5b20d89.

* Revert "Update from Shopify for theme dawn/release/15.0.0"

This reverts commit f0b822d.

* Revert "Update from Shopify for theme dawn/release/15.0.0"

This reverts commit 64e1d8e.

* Revert "Update from Shopify for theme dawn/release/15.0.0"

This reverts commit a8a7529.

---------

Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: Arthur <48017311+Roi-Arthur@users.noreply.github.com>
Co-authored-by: Lars Hoffbeck <lars.hoffbeck@shopify.com>
Co-authored-by: shopify[bot] <79544226+shopify[bot]@users.noreply.github.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
* Fixed issues when header is hidden

* Fixed predictive search on search page

* Made it so that the drawer still shows up
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
* Make sure a default price is shown when we're showing placeholder content

* address review comments

* update one more spot to use the new variable
* Revert a small tweak that wasn't necessary and a reference to the product (#3573)

* also add release notes and update theme version
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
* Moved snippets to assets and changed to svg
* Changed snippet icon rendering to use new inline_asset_content filter
* Removed hardcoded SVGs
* Made SVGs valid
* Refactored + Optimized svg files (#3586)

---------

Co-authored-by: Ludo <ludo.segura@shopify.com>
Co-authored-by: melissaperreault <melissa.perreault@shopify.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
* Release notes + version bump

* Fixed arrow in announcement bar and caret in product variant dropdown

* Fixed announcement bar with multiple blocks

* Adjustment to variant picker caret

* Fixed multicolumn and mega menu

* Updated release note
* Update 1 translation file

* Update 3 translation files

* Update 1 translation file

* Update 1 translation file

---------

Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
* Remove deprecated languages (#3627)

* Update translation.yml

* Delete locales/vi.schema.json (last in batch)

---------

Co-authored-by: translation-platform-development[bot] <76217502+translation-platform-development[bot]@users.noreply.github.com>

* Remove doubled semicolons (#3635)

* remove overflow hidden on body when necessary (#3636)

* add release notes and version bump

---------

Co-authored-by: translation-platform-development[bot] <76217502+translation-platform-development[bot]@users.noreply.github.com>
Co-authored-by: Eugene Kasimov <105315663+eugenekasimov@users.noreply.github.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Co-authored-by: translation-platform[bot] <34770790+translation-platform[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge live-Dawn with the new Dawn 3.0 changes