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.

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

Upgrade Font Awesome v4 => v6 #30779

Merged
merged 12 commits into from
Aug 1, 2024
Merged

Upgrade Font Awesome v4 => v6 #30779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e21f7f2
update FontAwesome 4 => 6
ufundo Jul 30, 2024
00cd983
add v4 shims with our own namespacing
ufundo Jul 30, 2024
5e60b6f
load all icons in icon picker
ufundo Jul 30, 2024
12d37f6
only use font awesome font for placeholder
ufundo Jul 31, 2024
4e7c3d9
use sans serif first to avoid comic sansy quick search placeholder
ufundo Jul 31, 2024
514d921
remove font-weight from dashlet header icons
ufundo Jul 31, 2024
31545bb
move icon picker styles to stylesheet
ufundo Jul 31, 2024
ce08c6d
add crm-i class to iconpicker starting value to ensure shims are loaded
ufundo Jul 31, 2024
83c51eb
include brand icons
ufundo Jul 31, 2024
d0e5e64
crmIconPicker: include brands, eliminate duplicates
colemanw Jul 31, 2024
3088ebc
combine shim rules to save space
ufundo Aug 1, 2024
1458d5f
crmIconPicker - Move stylesheet, include aliases in search
colemanw Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CRM/Core/Resources/Common.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,11 @@ protected static function coreResourceList($region) {
"packages/jquery/plugins/jquery.mousewheel.min.js",
"bower_components/select2/select2.min.js",
"bower_components/select2/select2.min.css",
"bower_components/font-awesome/css/font-awesome.min.css",
"bower_components/font-awesome/css/all.min.css",
// shims for fontawesome 4 - webfonts are loaded from the package
"bower_components/font-awesome/css/v4-font-face.min.css",
// we load our own version of the shim with crm-i namespace
"css/crm-i-v4-shims.css",
"packages/jquery/plugins/jquery.form.min.js",
"packages/jquery/plugins/jquery.timeentry.min.js",
"packages/jquery/plugins/jquery.blockUI.min.js",
Expand Down
2 changes: 1 addition & 1 deletion Civi/Standalone/WebEntrypoint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public static function installer(): void {
// The base URL for loading resource files (images/javascripts) for this project. Includes trailing slash.
'res' => $coreUrl . '/setup/res/',
'jquery.js' => $coreUrl . '/bower_components/jquery/dist/jquery.min.js',
'font-awesome.css' => $coreUrl . '/bower_components/font-awesome/css/font-awesome.min.css',
'font-awesome.css' => $coreUrl . '/bower_components/font-awesome/css/all.min.css',
]);
\Civi\Setup\BasicRunner::run($ctrl);
exit();
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
"ignore": ["fonts", "test", "tasks", "lib"]
},
"font-awesome": {
"url": "https://github.com/FortAwesome/Font-Awesome/archive/v4.7.0.zip",
"url": "https://github.com/FortAwesome/Font-Awesome/releases/download/6.6.0/fontawesome-free-6.6.0-web.zip",
"ignore": ["*/.*", "*.json", "src", "*.yml", "Gemfile", "Gemfile.lock", "*.md"]
},
"marked": {
Expand Down
Loading