Skip to content

Font Awesome Update v6.0.0 #192

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Font Awesome Update v6.0.0 #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e03d1d
Font Awesome 6 icon packages have been added to fa6-icons.php.
Jul 31, 2024
8db4172
Allows optional use of Font Awesome 4, 5, and 6 version packages. Fon…
Jul 31, 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
19 changes: 15 additions & 4 deletions classes/setup.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,14 +576,25 @@ public static function add_admin_enqueue_scripts() {
wp_enqueue_style( 'wp-color-picker' );
wp_enqueue_script( 'wp-color-picker' );

// Font awesome 4 and 5 loader
$font_awesome_version = 'fa6';

if ( apply_filters( 'csf_fa4', false ) ) {
$font_awesome_version = 'fa4';
} elseif ( apply_filters( 'csf_fa5', false ) ) {
$font_awesome_version = 'fa5';
}

// Font awesome 4, 5 and 6 loader
if ( $font_awesome_version === 'fa4' ) {
wp_enqueue_style( 'csf-fa', 'https://cdn.jsdelivr.net/npm/[email protected]/css/font-awesome.min.css', array(), '4.7.0', 'all' );
} else {
} elseif ( $font_awesome_version === 'fa5' ) {
wp_enqueue_style( 'csf-fa5', 'https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/all.min.css', array(), '5.15.5', 'all' );
wp_enqueue_style( 'csf-fa5-v4-shims', 'https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/v4-shims.min.css', array(), '5.15.5', 'all' );
} else {
wp_enqueue_style( 'csf-fa6', 'https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/all.min.css', array(), '6.6.0', 'all' );
wp_enqueue_style( 'csf-fa6-v4-shims', 'https://cdn.jsdelivr.net/npm/@fortawesome/[email protected]/css/v4-shims.min.css', array(), '6.6.0', 'all' );
}

// Check for developer mode
$min = ( self::$premium && SCRIPT_DEBUG ) ? '' : '.min';

Expand Down Expand Up @@ -804,4 +815,4 @@ public static function field( $field = array(), $value = '', $unique = '', $wher
*/
if ( ! class_exists( 'CSF' ) ) {
class CSF extends CSF_Setup{}
}
}
15 changes: 15 additions & 0 deletions fields/icon/fa6-icons.php
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion functions/actions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,14 @@ function csf_get_icons() {

ob_start();

$icon_library = ( apply_filters( 'csf_fa4', false ) ) ? 'fa4' : 'fa5';
$icon_library = 'fa6';

if ( apply_filters( 'csf_fa4', false ) ) {
$icon_library = 'fa4';
} elseif ( apply_filters( 'csf_fa5', false ) ) {
$icon_library = 'fa5';
}

CSF::include_plugin_file( 'fields/icon/'. $icon_library .'-icons.php' );

$icon_lists = apply_filters( 'csf_field_icon_add_icons', csf_get_default_icons() );
Expand Down