Skip to content

[Page theme] Blend #14534

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 11 commits into from
Feb 21, 2025
Merged

[Page theme] Blend #14534

merged 11 commits into from
Feb 21, 2025

Conversation

andersonjeccel
Copy link
Contributor

@andersonjeccel andersonjeccel commented Jan 30, 2025 •
edited
Loading

Q A
Bug fix? (use the a.b branch) 🟢
New feature/enhancement? (use the a.x branch) 🟢
Deprecations? 🔴
BC breaks? (use the c.x branch) 🔴
Automated tests included? 🔴
Related user documentation PR URL mautic/user-documentation#...
Related developer documentation PR URL mautic/developer-documentation-new#...
Issue(s) addressed Fixes #...

Description

This PR adds the Blend theme focused on material download

Features:
✅ Custom open source font (Inter) applied to all text and hosted locally (no external servers for improved privacy)
✅ Logo won't get distorted when replaced
✅ Background image can be changed in GrapesJS
✅ Includes message for GDPR after form
✅ You can place a quote
✅ Really, really fast
✅ Responsive with no glitches and mobile first

Warning

Git configuration added as required by project lead
This PR depends on a fix released in 5.2 that wasn't merged onto 6.x yet

Desktop

thumbnail (4)

Mobile

127 0 0 1_32787_page_preview_15 (4)

📋 Steps to test this PR:

  1. Open this PR on Gitpod or pull down for testing locally (see docs on testing PRs here)
  2. Open Landing pages > New
  3. Pick Blend
  4. Open the builder and have fun

@andersonjeccel andersonjeccel requested review from a team, mchojrin and laurielim January 30, 2025 11:59
@codecov Codecov
Copy link

codecov bot commented Jan 30, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 64.21%. Comparing base (e09b6fe) to head (59dec77).
Report is 2 commits behind head on 6.x.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff            @@
##                6.x   #14534   +/-   ##
=========================================
  Coverage     64.21%   64.21%           
  Complexity    34568    34568           
=========================================
  Files          2268     2268           
  Lines        103274   103274           
=========================================
  Hits          66319    66319           
  Misses        36955    36955

@andersonjeccel andersonjeccel self-assigned this Jan 30, 2025
@andersonjeccel andersonjeccel added T1 Low difficulty to fix (issue) or test (PR) ready-to-test PR's that are ready to test code-review-needed PR's that require a code review before merging enhancement Any improvement to an existing feature or functionality forms Anything related to forms landing-pages Anything related to landing pages themes Anything related to themes builder-grapesjs Anything related to the GrapesJS email or landing page builders labels Jan 30, 2025
@andersonjeccel andersonjeccel added this to the 6.0.0-beta milestone Jan 30, 2025
@andersonjeccel andersonjeccel added the user-experience Anything related to related to workflows, feedback, and navigation label Jan 30, 2025
matbcvo
matbcvo reviewed Feb 7, 2025
View reviewed changes
andersonjeccel and others added 2 commits February 11, 2025 10:43
@andersonjeccel @matbcvo
Update themes/blend/composer.json
2850d05 
Co-authored-by: Martin Vooremäe <martin.vooremae@gmail.com>
@andersonjeccel
Merge branch '6.x' into blend-theme
6817ed0
@andersonjeccel andersonjeccel mentioned this pull request Feb 21, 2025
Merged
RCheesley
RCheesley approved these changes Feb 21, 2025
View reviewed changes
Copy link
Member

@RCheesley RCheesley left a comment

Choose a reason for hiding this comment

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

Love this - and I love that you give them clear directions how to change the background image in the content too. Great job! 🚀

@RCheesley RCheesley added code-review-passed PRs which have passed code review user-testing-passed PRs which have been successfully tested by the required number of people. ready-to-commit PR's with 2 successful tests, 1 approval, automated tests and docs and is ready to be merged and removed code-review-needed PR's that require a code review before merging ready-to-test PR's that are ready to test labels Feb 21, 2025
@RCheesley
Copy link
Member

https://github.com/mautic/theme-blend is created and ready for merge :)

RCheesley
RCheesley reviewed Feb 21, 2025
View reviewed changes
matbcvo
matbcvo reviewed Feb 21, 2025
View reviewed changes
@matbcvo matbcvo added the pending-feedback PR's and issues that are awaiting feedback from the author label Feb 21, 2025
@ricfreire
Copy link

I tested the theme as requested by @RCheesley.

image

When resizing the screen to a smaller size, the spacing appears too large. I suggest setting a gap: 20px; for .sidebars. Additionally, setting width: 100%; on .sidebar--right would help utilize the available space more effectively, ensuring the content and vibrant image fill the screen properly.

image
For better readability on mobile, I recommend adding a media query for .quote--text to reduce the font size to 30px; and setting margin-top: 10px;, matching the spacing used in .quote--author to maintain consistency.

image

The .sidebars class is currently set to align-items: center;, but it should be changed to align-items: flex-start; to prevent the glitch occurring on mobile.

image
Unexpected additional theme in Gitpod? When opening this PR, it loads not only the Blend theme but also another one called Capture. Was this intended?

@andersonjeccel
Copy link
Contributor Author

@ricfreire The additional theme is there because it was already merged :)

@andersonjeccel andersonjeccel removed the pending-feedback PR's and issues that are awaiting feedback from the author label Feb 21, 2025
RCheesley
RCheesley approved these changes Feb 21, 2025
View reviewed changes
Copy link
Member

@RCheesley RCheesley left a comment

Choose a reason for hiding this comment

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

GTG!

@RCheesley RCheesley merged commit 2ba23de into mautic:6.x Feb 21, 2025
18 checks passed
@andersonjeccel andersonjeccel deleted the blend-theme branch February 24, 2025 07:26
@RCheesley RCheesley modified the milestones: 6.0.0-beta, 6.0.0-beta2 Mar 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matbcvo matbcvo matbcvo left review comments

@RCheesley RCheesley RCheesley approved these changes

@mchojrin mchojrin Awaiting requested review from mchojrin mchojrin was automatically assigned from mautic/ux-ui-tiger-team

@laurielim laurielim Awaiting requested review from laurielim laurielim was automatically assigned from mautic/ux-ui-tiger-team

Assignees

@andersonjeccel andersonjeccel

Labels
builder-grapesjs Anything related to the GrapesJS email or landing page builders code-review-passed PRs which have passed code review enhancement Any improvement to an existing feature or functionality forms Anything related to forms landing-pages Anything related to landing pages ready-to-commit PR's with 2 successful tests, 1 approval, automated tests and docs and is ready to be merged T1 Low difficulty to fix (issue) or test (PR) themes Anything related to themes user-experience Anything related to related to workflows, feedback, and navigation user-testing-passed PRs which have been successfully tested by the required number of people.
Projects
Open Source Fridays
Status: 🥳 Done
UX/UI Tiger Team
Status: Done
Milestone
6.0.0-beta2
Development

Successfully merging this pull request may close these issues.
5 participants
@andersonjeccel @RCheesley @ricfreire @matbcvo @driskell