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

Reenable menu shadow for reporting menu #21689

Merged
merged 12 commits into from
Jan 19, 2024
Merged

Reenable menu shadow for reporting menu #21689

merged 12 commits into from
Jan 19, 2024

Conversation

sgiehl
Copy link
Member

@sgiehl sgiehl commented Dec 14, 2023

Description:

I've also included some css tweaks . Instead of a padding the pagewarp now only uses a margin. That way that space won't be included in UI tests of the pagewrap anymore. This will require an update of a lot screenshots (as the free space will be removed), but we will no longer have problems with the menu shadow on screenshots.

Review

@sgiehl sgiehl force-pushed the menushadow branch 8 times, most recently from 19c8a58 to 73ec693 Compare December 15, 2023 14:56
@sgiehl
Copy link
Member Author

sgiehl commented Dec 15, 2023

The CSS tweaks I've added should help a lot around UI tests regarding the menu shadow being visible and also around the free space visible on some screens, when the menu is higher than the reports.
Note: Merging this would mean we need to update the sceenshots once in all plugins, but we would have less failures in plugins due to changes in the menu in the future.

@matomo-org/core-reviewers @AltamashShaikh @snake14 Would you mind taking a quick look at the changes and share your opinion?

@sgiehl sgiehl added this to the 5.0.1 milestone Dec 15, 2023
@sgiehl sgiehl added c: Design / UI For issues that impact Matomo's user interface or the design overall. c: Tests & QA For issues related to automated tests or making it easier to QA & test issues. labels Dec 15, 2023
@michalkleiner
Copy link
Contributor

The changes in general look ok. As commented above, we can do flex: none on the lefthand menu and then we don't need to do any width calc on the pageWrap itself, it would always behave as needed.

I'm not a big fan of having values like 9px or 18px (not on 4, or even better, 8px grid), but that's a discussion for another time.

@sgiehl sgiehl force-pushed the menushadow branch 2 times, most recently from d2b2e5c to 16dc6b8 Compare December 18, 2023 14:36
@sgiehl sgiehl force-pushed the menushadow branch 2 times, most recently from 962a811 to 7c33493 Compare January 3, 2024 06:46
@sgiehl sgiehl marked this pull request as ready for review January 3, 2024 06:47
@sgiehl sgiehl modified the milestones: 5.0.1, 5.1.0 Jan 4, 2024
@sgiehl sgiehl force-pushed the menushadow branch 3 times, most recently from bb91b0e to 1ecd276 Compare January 17, 2024 14:14
@sgiehl sgiehl requested a review from a team January 17, 2024 15:14
Copy link
Contributor

@michalkleiner michalkleiner left a comment

Choose a reason for hiding this comment

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

Code change looks good. Some more UI test screenshots need updating.

@sgiehl
Copy link
Member Author

sgiehl commented Jan 18, 2024

I've now created PRs for the submodules where the UI tests were failing. Guess we should merge them and update the submodules in this PR before merging. The remaining failing UI tests are unrelated.

Copy link
Contributor

@michalkleiner michalkleiner left a comment

Choose a reason for hiding this comment

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

This is good for me but would be good to get another 👀 from @matomo-org/core-reviewers

@sgiehl sgiehl requested a review from mneudert January 18, 2024 13:11
plugins/CoreHome/stylesheets/layout.less Outdated Show resolved Hide resolved
plugins/CoreHome/stylesheets/layout.less Outdated Show resolved Hide resolved
tests/UI/specs/UIIntegration_spec.js Show resolved Hide resolved
@sgiehl
Copy link
Member Author

sgiehl commented Jan 19, 2024

@AltamashShaikh @snake14 I'm going to merge this PR now. It will most likely cause a lot of failures in UI tests of plugins. All tests taking a screenshot of the pageWrap element will get (a bit) smaller. But the changes in this PR will also prevent that parts of the menu shadow will be visible on such screenshots (so any hacks around that will no longer be needed). Also the height of the pageWarp element isn't impacted by the menu height anymore. This should make those UI tests a bit more stable and more independent from changes in core.

@sgiehl sgiehl merged commit 1875efb into 5.x-dev Jan 19, 2024
21 of 25 checks passed
@sgiehl sgiehl deleted the menushadow branch January 19, 2024 10:17
@snake14
Copy link
Contributor

snake14 commented Jan 21, 2024

@AltamashShaikh @snake14 I'm going to merge this PR now. It will most likely cause a lot of failures in UI tests of plugins. All tests taking a screenshot of the pageWrap element will get (a bit) smaller. But the changes in this PR will also prevent that parts of the menu shadow will be visible on such screenshots (so any hacks around that will no longer be needed). Also the height of the pageWarp element isn't impacted by the menu height anymore. This should make those UI tests a bit more stable and more independent from changes in core.

Thank you @sgiehl . That's great news. I've been hoping this would be merged soon. I'll start updating the plugins.

@snake14
Copy link
Contributor

snake14 commented Jan 22, 2024

Oh. @sgiehl Are these changes going to be back-ported to 4.x? We currently have several plugins with failing builds due to the navigation shadow.

@sgiehl
Copy link
Member Author

sgiehl commented Jan 22, 2024

@snake14 We will most likely only backport security fixes to 4.x-dev. So this won't be backported.

@snake14
Copy link
Contributor

snake14 commented Jan 22, 2024

@snake14 We will most likely only backport security fixes to 4.x-dev. So this won't be backported.

@sgiehl Just thought I'd check since the marketplace changes that broke the builds was backported. I'll simply update the 4.x screenshots if this fix isn't going to be applied to that branch.

@sgiehl sgiehl added the not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. label Apr 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c: Design / UI For issues that impact Matomo's user interface or the design overall. c: Tests & QA For issues related to automated tests or making it easier to QA & test issues. not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants