Skip to content

Commit

Permalink
Upgrade to font awesome 5
Browse files Browse the repository at this point in the history
Use new package name for font awesome and also add a compatibility
layer with version 4, because we have a lot of icons placed around
all Sonata bundles and packages
  • Loading branch information
jordisala1991 authored and VincentLanglet committed Apr 29, 2021
1 parent 6d326aa commit 4ca4375
Show file tree
Hide file tree
Showing 106 changed files with 9,733 additions and 2,837 deletions.
2 changes: 1 addition & 1 deletion assets/js/Admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ const Admin = {
Admin.log('[core|setup_xeditable] configure xeditable on', subject);
jQuery('.x-editable', subject).editable({
emptyclass: 'editable-empty btn btn-sm btn-default',
emptytext: '<i class="fa fa-pencil"></i>',
emptytext: '<i class="fas fa-pencil-alt"></i>',
container: 'body',
placement: 'auto',
success(response) {
Expand Down
7 changes: 6 additions & 1 deletion assets/scss/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@
*/

@import "~bootstrap/dist/css/bootstrap.css";
@import "~font-awesome/scss/font-awesome";

// Add Font Awesome Free and the v4 compatibility layer
// this layer should only be removed when we are sure we have replaced
// all icons to the new naming on all Sonata code
@import "~@fortawesome/fontawesome-free/css/all.css";
@import "~@fortawesome/fontawesome-free/css/v4-shims.css";

// Add Source Sans Pro Font with all options
// This font is used by AdminLTE
Expand Down
6 changes: 3 additions & 3 deletions docs/cookbook/recipe_custom_action.rst
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ Create a template for that button:

<li>
<a class="sonata-action-element" href="{{ admin.generateUrl('import') }}">
<i class="fa fa-level-up"></i> {{ 'import_action'|trans({}, 'SonataAdminBundle') }}
<i class="fas fa-level-up-alt"></i> {{ 'import_action'|trans({}, 'SonataAdminBundle') }}
</a>
</li>
Expand All @@ -300,7 +300,7 @@ Create a template for that button:
.. code-block:: html+jinja

<a class="btn btn-link btn-flat" href="{{ admin.generateUrl('import') }}">
<i class="fa fa-level-up"></i> {{ 'import_action'|trans({}, 'SonataAdminBundle') }}
<i class="fas fa-level-up-alt"></i> {{ 'import_action'|trans({}, 'SonataAdminBundle') }}
</a>
Or you can pass values as array::
Expand All @@ -311,7 +311,7 @@ Or you can pass values as array::
'label' => 'import_action',
'translation_domain' => 'SonataAdminBundle',
'url' => $this->generateUrl('import'),
'icon' => 'level-up',
'icon' => 'level-up-alt',
];

return $actions;
Expand Down
6 changes: 3 additions & 3 deletions docs/cookbook/recipe_knp_menu.rst
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ The following configuration uses a menu provider to populate the menu group ``my
groups:
my_group:
provider: 'MyBundle:MyMenuProvider:getMyMenu'
icon: '<i class="fa fa-edit"></i>'
icon: '<i class="fas fa-edit"></i>'
With KnpMenuBundle you can create a custom menu by using a builder class
or by declaring it as a service. Please see the `Knp documentation`_ for
Expand Down Expand Up @@ -163,7 +163,7 @@ name ``sonata.admin.event.configure.menu.sidebar``::
'label' => 'Daily and monthly reports',
'route' => 'app_reports_index',
])->setExtras([
'icon' => '<i class="fa fa-bar-chart"></i>',
'icon' => '<i class="fas fa-chart-bar"></i>',
]);
}
}
Expand Down Expand Up @@ -232,7 +232,7 @@ open and ignore open/close effects:
keep_open: true
label: sonata_media
label_catalogue: SonataMediaBundle
icon: '<i class="fa fa-image"></i>'
icon: '<i class="fas fa-image"></i>'
items:
- sonata.media.admin.media
- sonata.media.admin.gallery
Expand Down
8 changes: 4 additions & 4 deletions docs/cookbook/recipe_workflow_integration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ You can use the provided extension to take care of your entity admin.
arguments:
- '@workflow.registry'
- transitions_icons:
start_review: fa fa-question
interrupt_review: fa fa-edit
restart_review: fa fa-question
publish: fa fa-check
start_review: fas fa-question
interrupt_review: fas fa-edit
restart_review: fas fa-question
publish: fas fa-check
.. code-block:: yaml
Expand Down
4 changes: 2 additions & 2 deletions docs/reference/action_list.rst
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ Example::
'collapse' => true
])
->add('upvotes', null, [
'label_icon' => 'fa fa-thumbs-o-up'
'label_icon' => 'fas fa-thumbs-up'
])
->add('actions', null, [
'header_class' => 'customActions',
Expand Down Expand Up @@ -662,7 +662,7 @@ If you want to show only the ``label_icon``::

->add('upvotes', null, [
'label' => false,
'label_icon' => 'fa fa-thumbs-o-up',
'label_icon' => 'fas fa-thumbs-up',
])

Mosaic view button
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Full Configuration Options
form_type: standard
default_group: default
default_label_catalogue: SonataAdminBundle
default_icon: '<i class="fa fa-folder"></i>'
default_icon: '<i class="fas fa-folder"></i>'
dropdown_number_groups_per_colums: 2
title_mode: ~ # One of "single_text"; "single_image"; "both"
Expand Down
4 changes: 2 additions & 2 deletions docs/reference/preview_mode.rst
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ expects a different object you can set your own variables prior to calling ``par
{% block formactions %}
<button class="btn btn-success" type="submit" name="btn_preview_approve">
<i class="fa fa-check"></i>
<i class="fas fa-check"></i>
{{ 'btn_preview_approve'|trans({}, 'SonataAdminBundle') }}
</button>
<button class="btn btn-danger" type="submit" name="btn_preview_decline">
<i class="fa fa-times"></i>
<i class="fas fa-times"></i>
{{ 'btn_preview_decline'|trans({}, 'SonataAdminBundle') }}
</button>
{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"dependencies": {
"@fontsource/source-sans-pro": "^4.2",
"@fortawesome/fontawesome-free": "^5.15",
"admin-lte": "^2.4",
"bootstrap": "^3.3",
"components-font-awesome": "^4.7",
"icheck": "^1.0",
"jquery": "^2.2",
"jquery-form": "^4.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Block/AdminSearchBlockService.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public function configureSettings(OptionsResolver $resolver): void
'query' => '',
'page' => 0,
'per_page' => 10,
'icon' => '<i class="fa fa-list"></i>',
'icon' => '<i class="fas fa-list"></i>',
])
->setRequired('admin_code')
->setAllowedTypes('admin_code', ['string']);
Expand Down
2 changes: 1 addition & 1 deletion src/DependencyInjection/Admin/AbstractTaggedAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ abstract class AbstractTaggedAdmin implements TaggedAdminInterface
*
* @deprecated since sonata-project/sonata-admin 3.x, will be removed in 4.0
*/
public const MOSAIC_ICON_CLASS = 'fa fa-th-large fa-fw';
public const MOSAIC_ICON_CLASS = 'fas fa-th-large fa-fw';

/**
* The code related to the admin.
Expand Down
4 changes: 2 additions & 2 deletions src/DependencyInjection/Admin/TaggedAdminInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ interface TaggedAdminInterface extends MutableTemplateRegistryAwareInterface
public const ADMIN_TAG = 'sonata.admin';

public const DEFAULT_LIST_MODES = [
'list' => ['class' => 'fa fa-list fa-fw'],
'mosaic' => ['class' => 'fa fa-th-large fa-fw'],
'list' => ['class' => 'fas fa-list fa-fw'],
'mosaic' => ['class' => 'fas fa-th-large fa-fw'],
];

/**
Expand Down
2 changes: 1 addition & 1 deletion src/DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public function getConfigTreeBuilder(): TreeBuilder
->info('Label Catalogue used for admin services if one isn\'t provided.')
->end()
->scalarNode('default_icon')
->defaultValue('<i class="fa fa-folder"></i>')
->defaultValue('<i class="fas fa-folder"></i>')
->info('Icon used for admin services if one isn\'t provided.')
->end()
->integerNode('dropdown_number_groups_per_colums')->defaultValue(2)->end()
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/public/app.css

Large diffs are not rendered by default.

Binary file added src/Resources/public/fonts/fa-brands-400.eot
Binary file not shown.
Binary file added src/Resources/public/fonts/fa-brands-400.ttf
Binary file not shown.
Binary file added src/Resources/public/fonts/fa-brands-400.woff
Binary file not shown.
Binary file added src/Resources/public/fonts/fa-brands-400.woff2
Binary file not shown.
Binary file added src/Resources/public/fonts/fa-regular-400.eot
Binary file not shown.
Binary file added src/Resources/public/fonts/fa-regular-400.ttf
Binary file not shown.
Binary file added src/Resources/public/fonts/fa-regular-400.woff
Binary file not shown.
Binary file not shown.
Binary file added src/Resources/public/fonts/fa-solid-900.eot
Binary file not shown.
Binary file added src/Resources/public/fonts/fa-solid-900.ttf
Binary file not shown.
Binary file added src/Resources/public/fonts/fa-solid-900.woff
Binary file not shown.
Binary file added src/Resources/public/fonts/fa-solid-900.woff2
Binary file not shown.
Binary file removed src/Resources/public/fonts/fontawesome-webfont.eot
Binary file not shown.
Binary file removed src/Resources/public/fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file removed src/Resources/public/fonts/fontawesome-webfont.woff
Binary file not shown.
Binary file removed src/Resources/public/fonts/fontawesome-webfont.woff2
Binary file not shown.
Loading

3 comments on commit 4ca4375

@cecicifu
Copy link
Contributor

@cecicifu cecicifu commented on 4ca4375 Apr 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Menu collapse icon isn't working (?) Thanks.
Image link

@jordisala1991
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check with #7136

@cecicifu
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, thanks u ! :D

Please sign in to comment.