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

standalone: fix double <h1> and padding on select2 drops dev/core#4831 #28560

Merged

Conversation

artfulrobot
Copy link
Contributor

@artfulrobot artfulrobot commented Dec 7, 2023

Fixes https://lab.civicrm.org/dev/core/-/issues/4831 and also fixes problem introduced by #28471 that doubled the <h1> on angularjs pages.

Before:

image

Now:

image

Copy link

civibot bot commented Dec 7, 2023

🤖 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 🔗

@artfulrobot
Copy link
Contributor Author

@colemanw I've tagged you on this because it touches the angular code for identifying the "cms" page title.

@artfulrobot artfulrobot force-pushed the artfulrobot-core-4831-followup-pr2871 branch 2 times, most recently from 22cc572 to 4fc1c27 Compare December 12, 2023 09:02
@artfulrobot
Copy link
Contributor Author

@colemanw ok the updated pr

  • uses your suggestion on the union CSS selector, but also rewrites that whole bit in plain ol' JS because it's 2023 and we don't need to use two libraries to do that anymore. The new code is clearer to read (I think); slightly fewer bytes; and undetectably faster/more green.
  • Renamed a var containing HTML to make it clear that it contains HTML not a plain text.
  • removes the <del> bit - not needed, still works for deleted contacts.
  • cleans up the rule in the css.

@artfulrobot artfulrobot force-pushed the artfulrobot-core-4831-followup-pr2871 branch from 4fc1c27 to e98988c Compare December 12, 2023 09:49
@artfulrobot
Copy link
Contributor Author

I've tested in D10 (to check I hadn't broken previous behaviour) and standalone.

@colemanw
Copy link
Member

Great work, thanks Rich & sorry for all the nitpickyness.

@colemanw colemanw merged commit 4efe0d5 into civicrm:master Dec 12, 2023
@artfulrobot
Copy link
Contributor Author

@colemanw thanks for the merge, that messed up select2 padding was really annoying me! no worries about nitpickiness, a lot of standalone is still a mix of "I put this random code in here and it sort of worked" and better new code, so always good to question.

@colemanw
Copy link
Member

Yea @artfulrobot I think some of the standalone templates were copied back from an ancient version of Civi so lots of outdated things to fix up.

colemanw added a commit to colemanw/civicrm-core that referenced this pull request Jun 7, 2024
This regressed probably due to a combination of civicrm#28560 and civicrm#29694
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants