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

Setup UI - Restore icons (FontAwesome 6 support) #183

Merged
merged 1 commit into from
Sep 4, 2024

Conversation

totten
Copy link
Member

@totten totten commented Sep 4, 2024

Overview

Fix missing icons when installing on Backdrop 5.77+.

Follow-up to 5.77.alpha's civicrm/civicrm-core#30779 (cc @ufundo @herbdool)

Before

No pencil icon. Instead, HTTP error.

Screenshot from 2024-09-03 23-28-51

After

Icon works

Screenshot from 2024-09-03 23-28-13

Comments

The fix is for 5.77-rc. We'll need to make sure to merge-forward to master.

Copy link

civibot bot commented Sep 4, 2024

(Standard links)

@civibot civibot bot added the 1.x-5.77 label Sep 4, 2024
@eileenmcnaughton
Copy link
Contributor

@totten
Copy link
Member Author

totten commented Sep 4, 2024

Thanks, good catch @eileenmcnaughton. I guess it probably should have the .min.

I arbitrarily copy-pasted one of the existing references from civicrm-core.git, but they appear to be mixed:

CRM/Core/Resources/Common.php:      "bower_components/font-awesome/css/all.min.css",
js/jquery/jquery.crmIconPicker.js:        $.get(CRM.config.resourceBase + 'bower_components/font-awesome/css/all.css').done(function(data) {
templates/CRM/common/fatal.tpl:    @import url({$config->resourceBase}bower_components/font-awesome/css/font-awesome.min.css);
tools/standalone/router.php:      'font-awesome.css' => $coreUrl . '/bower_components/font-awesome/css/all.min.css',

So crmIconPicker grabs all.css, but the regular web UI and the standalone-installer both use all.min.css.

@totten totten changed the title Setup UI - Restore icons Setup UI - Restore icons (FontAwesome 6 support) Sep 4, 2024
@ufundo
Copy link
Contributor

ufundo commented Sep 4, 2024

I think it makes sense icon picker grabs the unminified for safer/saner regexing (it's looking for classes in the css file to present as options), but everywhere else should be .min

@ufundo ufundo merged commit 4662035 into civicrm:1.x-5.77 Sep 4, 2024
1 check was pending
@totten totten deleted the 1.x-5.77-font branch September 4, 2024 07:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants