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 stage into main #3189

Merged
merged 13 commits into from
Nov 13, 2024
Merged

Merge stage into main #3189

merged 13 commits into from
Nov 13, 2024

Conversation

mokimo
Copy link
Contributor

@mokimo mokimo commented Nov 13, 2024

Merge #3181 into main and DO NOT SQUASH. The diff is misleading, this has already been merged but git doesn't correctly identify the commits. If you do a few spot checks, the files already match what's on main.

Milo:

Deva309 and others added 13 commits November 12, 2024 09:16
* Color changes

* Promo background color fix

* Add text and subtext font color changes in megamenu

* cross cloud menu background color changes

* Fix reveiew comments

* colors hexcode formatted as lowercase for css variables

* Bug fix MWPW-161889
…updating href (#3142)

* MWPW-161590 [MEP] Update placeholders before updating href

* unit test updates

* MWPW-161871 [MEP] useblockcode action fails if page is on milo site (#3161)

* stash

* ready to publish

* interact call coming back but timing out

* working on a fast connection

* clean up ifs

* working with promise

* use camel case on let variable

* unit tests

* update unit tests

* MWPW-149504 [MILO][MEP] Move entitlements object to the same JSON file used by the library (#3047)

* create mepxlg branch

* update library

* require full hostname match

* update reference for unit test

* switch to use config instead of domain list and stub response in unit test

* update fetch to 2

* updating another fetch to 2

* restore normalizePath to use preview domains on preview links

* preload segment list json

* use getFederatedUrl instead

* import at top so we don't have to make normalizePath async

* MWPW-148129 [MILO][MEP][GNAV] Able to use select by url feature with federated link (#3064)

* add federated link function to registerInBlockActions

* add to unit test

* add unit test coverage

* initial commit

* Fix useblock code issue

---------

Co-authored-by: vgoodric <vgoodric@adobe.com>
Co-authored-by: Vivian A Goodrich <101133187+vgoodric@users.noreply.github.com>

* MWPW-161606 [MEP] Modify within modals with MEP (#3171)

initial commit publish

Co-authored-by: viloria <viloria@adobe.com>

* add conditionals

---------

Co-authored-by: Mark Perry <124626043+markpadbe@users.noreply.github.com>
Co-authored-by: viloria <viloria@adobe.com>
* Added logo changes for older GNAV experience

* Lint Fix

* Logo alighned to left for older GNAV
* Use schedule as source for CDT

* seperate start and end

* Added unit tests
…g plans section (#3103)

* remive tabindex=0 as the attributes from merchcard div

* fresh commit with same changes as commit 1 after resolving the merge conflict

* Redesign mini-compare chart. Added checkmarks for icons. Backward compatibility using "checkmark" class. Horizontal line added.

* Revert "Redesign mini-compare chart. Added checkmarks for icons. Backward compatibility using "checkmark" class. Horizontal line added."

This reverts commit 610807a.

* run build in mas

* run build

---------

Co-authored-by: Rohit Sahu <rosahu@adobe.com>
* Revert "MWPW-156749: Fix video CLS " (#2899) (#2900)

Revert "MWPW-156749: Fix video CLS  (#2849)"

This reverts commit d4134c8.

* [MWPW-159903] Fix quiz video marquees (#3009) (#3013)

fix quiz marquees

* [MWPW-159328] handle a case where there are not placeholders availabl… (#3014)

[MWPW-159328] handle a case where there are not placeholders available (#2998)

* [MWPW-159328] handle a case where there are not palceholders availble

* fixed typos

---------

Co-authored-by: Denys Fedotov <denlight@gmail.com>
Co-authored-by: Denys Fedotov <dfedotov@Denyss-MacBook-Pro.local>

* MWPW-146211 [MILO][MEP] Option to select all elements (#2976) (#3023)

* stash

* stash

* stash

* working well

* set updated command list for inline

* remove querySelector function

* unit test and custom block fix

* updates for in-block

* merch-card-collection unit test fixed

* unit test updates

* more unit test repair

* linting errors

* more linting

* Fix Invalid selector test

* add coverage

* force git checks to refire

* remove comment

* pass rootEl to getSelectedElements for use when needed (gnav)

* skip if clause in codecov

---------

Co-authored-by: Vivian A Goodrich <101133187+vgoodric@users.noreply.github.com>
Co-authored-by: markpadbe <markp@adobe.com>

* MWPW-158455: Promobar overlays with localnav elements in devices (#2991)

* Revert "MWPW-156749: Fix video CLS " (#2899) (#2900)

Revert "MWPW-156749: Fix video CLS  (#2849)"

This reverts commit d4134c8.

* Changing z-index of promobar and popup

* Changing z-index of promobar and popup

* Reverting z-index to 4 for promobar

---------

Co-authored-by: milo-pr-merge[bot] <169241390+milo-pr-merge[bot]@users.noreply.github.com>
Co-authored-by: Okan Sahin <39759830+mokimo@users.noreply.github.com>
Co-authored-by: Blaine Gunn <Blainegunn@gmail.com>
Co-authored-by: Akansha Arora <>

* Replaces CSS 'body *' with '.consonant-Wrapper *'

---------

Co-authored-by: milo-pr-merge[bot] <169241390+milo-pr-merge[bot]@users.noreply.github.com>
Co-authored-by: Okan Sahin <39759830+mokimo@users.noreply.github.com>
Co-authored-by: Blaine Gunn <Blainegunn@gmail.com>
Co-authored-by: Denys Fedotov <denlight@gmail.com>
Co-authored-by: Denys Fedotov <dfedotov@Denyss-MacBook-Pro.local>
Co-authored-by: Rares Munteanu <overmyheadandbody@gmail.com>
Co-authored-by: Vivian A Goodrich <101133187+vgoodric@users.noreply.github.com>
Co-authored-by: markpadbe <markp@adobe.com>
Co-authored-by: Akansha Arora <akanshaarora090@gmail.com>
* relative urls caas support

* added unit tests
* a links underline, a.quite added

* added styles to omit header/footer

* added default link styles for headlines and lockup area

* minor :hover style alignment on cards-horiz, marquee-anchors, brick

* removed dubs underline on links

* removed styles overrides to support double in horiz-card, marquee-anch, brick

* [MWPW-145672] Remove Gnav global link styles

* [MWPW-161624] Link farm double underline on focus

* Ensure sub text in anchors is underlined correctly

* Ensure sub text in anchors is underlined correctly

---------

Co-authored-by: thi64146 <thi64146@adobe.com>
…nd individual SVG assets (#3183)

Revert "MWPW-140452 - Icon authoring in milo using the federal repo and individual SVG assets (#2986)"

This reverts commit f379815.

Co-authored-by: Rares Munteanu <overmyheadandbody@gmail.com>
Copy link
Contributor

aem-code-sync bot commented Nov 13, 2024

Hello, I'm the AEM Code Sync Bot and I will run some actions to deploy your branch and validate page speed.
In case there are problems, just click a checkbox below to rerun the respective action.

  • Re-run PSI checks
  • Re-sync branch
Commits

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

Copy link

codecov bot commented Nov 13, 2024

Codecov Report

Attention: Patch coverage is 97.50324% with 77 lines in your changes missing coverage. Please review.

Project coverage is 96.37%. Comparing base (ee9d4a1) to head (966fae7).
Report is 134 commits behind head on main.

Files with missing lines Patch % Lines
libs/blocks/preflight/panels/performance.js 78.86% 56 Missing ⚠️
libs/utils/samplerum.js 68.65% 21 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3189      +/-   ##
==========================================
- Coverage   98.46%   96.37%   -2.10%     
==========================================
  Files          68      245     +177     
  Lines        8167    56598   +48431     
==========================================
+ Hits         8042    54548   +46506     
- Misses        125     2050    +1925     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

aem-code-sync bot commented Nov 13, 2024

Page Scores Audits Google
📱 /?martech=off PERFORMANCE A11Y SEO BEST PRACTICES SI FCP LCP TBT CLS PSI
🖥️ /?martech=off PERFORMANCE A11Y SEO BEST PRACTICES SI FCP LCP TBT CLS PSI

@mokimo mokimo merged commit cf2b92c into main Nov 13, 2024
13 of 15 checks passed
@mokimo mokimo deleted the fix-main branch November 13, 2024 14:05
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.

10 participants