Skip to content

RiverLea 1.3.6 - Fixes GL#108, GL#109, #31994 & couple more - #32077

Merged
ufundo merged 3 commits into
civicrm:6.0from
vingle:6.0
Feb 14, 2025
Merged

RiverLea 1.3.6 - Fixes GL#108, GL#109, #31994 & couple more#32077
ufundo merged 3 commits into
civicrm:6.0from
vingle:6.0

Conversation

@vingle

@vingle vingle commented Feb 13, 2025

Copy link
Copy Markdown
Contributor

Overview

This fixes four regressions: two major (breaks functionality), two minor (restores Greenwich functionality). It also makes two changes.

Regression 1 - code/pre formatting is wrapping on one line (#108) - before

image

Regression 1 - after

image

Regression 2 - HackneyBrook/DarkMode: Notification text colour illegible - before

image Replaces one part of this PR: #31994 cc @ufundo.

Regression 2 - after

image

Regression (minor) 3 - Responsive: make dashlets stack on Civi Dashboard under 990px (same as Greenwich) - before

image

Regression 3 - after

image

Regression 4 (minor) - Show Add Address without hover on Contact Dashboard (#109) + Change 1 - Swapped edit icon for add icon on add address on Contact Dashboard (#109) & adjust appearance - before

image

Regression 4 + Change 1 - after

image
NB - doesn't work fully on Thames because of Thames custom CSS overrides - cc @artfulrobot

Change 2 - Select2 search box now fills width of Select, neatens padding. - before

image

Change 2 - after

image

Comments

Strictly speaking I'm assuming the four regressions should go against 6.0.RC and the two changes on 6.1.alpha. One of the changes is entangled with one regression, and the other change was identified while fixing another regression. Hopefully these can be merged together.

@civibot

civibot Bot commented Feb 13, 2025

Copy link
Copy Markdown

🤖 Thank you for contributing to CiviCRM! ❤️ We will need to test and review this PR. 👷

Introduction for new contributors...
  • If this is your first PR, an admin will greenlight automated testing with the command ok to test or add to whitelist.
  • A series of tests will automatically run. You can see the results at the bottom of this page (if there are any problems, it will include a link to see what went wrong).
  • A demo site will be built where anyone can try out a version of CiviCRM that includes your changes.
  • If this process needs to be repeated, an admin will issue the command test this please to rerun tests and build a new demo site.
  • Before this PR can be merged, it needs to be reviewed. Please keep in mind that reviewers are volunteers, and their response time can vary from a few hours to a few weeks depending on their availability and their knowledge of this particular part of CiviCRM.
  • A great way to speed up this process is to "trade reviews" with someone - find an open PR that you feel able to review, and leave a comment like "I'm reviewing this now, could you please review mine?" (include a link to yours). You don't have to wait for a response to get started (and you don't have to stop at one!) the more you review, the faster this process goes for everyone 😄
  • To ensure that you are credited properly in the final release notes, please add yourself to contributor-key.yml
  • For more information about contributing, see CONTRIBUTING.md.
Quick links for reviewers...

➡️ Online demo of this PR 🔗

@civibot civibot Bot added the 6.0 label Feb 13, 2025
@vingle vingle changed the title 1.3.6 - Fixes #108, #109, HackneyBrook DarkMode Notification colour & couple more RiverLea 1.3.6 - Fixes GL#108, GL#109, #31994 & couple more Feb 13, 2025
@colemanw

Copy link
Copy Markdown
Member

Thanks @vingle I agree this should all be merged into 6.0.

@colemanw colemanw added the merge ready PR will be merged after a few days if there are no objections label Feb 13, 2025
@ufundo

ufundo commented Feb 13, 2025

Copy link
Copy Markdown
Contributor

All looks good and safe to me. I think we should merge now to get the most testing-in-use on the RC branch

@ufundo

ufundo commented Feb 13, 2025

Copy link
Copy Markdown
Contributor

Test fail looks unrelated, like a flake

@ufundo
ufundo merged commit 396a81b into civicrm:6.0 Feb 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.0 merge ready PR will be merged after a few days if there are no objections

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants