From 6cfecc90d8d8a7ba6ab40b17b5cc832581244540 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Sat, 20 Apr 2019 15:46:44 +0100 Subject: [PATCH 1/5] initial commit --- .../tmpl/associations/default.php | 2 +- .../com_banners/tmpl/banners/default.php | 2 +- .../com_banners/tmpl/clients/default.php | 2 +- .../tmpl/categories/default.php | 2 +- .../com_contact/tmpl/contacts/default.php | 2 +- .../com_content/tmpl/articles/default.php | 2 +- .../com_content/tmpl/featured/default.php | 2 +- .../com_cpanel/Model/SystemModel.php | 6 +- .../com_fields/tmpl/fields/default.php | 2 +- .../com_fields/tmpl/groups/default.php | 2 +- .../com_languages/tmpl/languages/default.php | 2 +- .../com_languages/tmpl/override/edit.php | 2 +- .../com_languages/tmpl/overrides/default.php | 2 +- .../components/browser/items/directory.vue | 2 +- .../scripts/components/browser/items/file.vue | 2 +- .../components/browser/items/video.vue | 2 +- .../scripts/components/tree/item.vue | 4 +- .../styles/components/_media-browser.scss | 4 +- .../styles/components/_media-tree.scss | 2 +- .../components/com_menus/presets/joomla.xml | 2 +- .../components/com_menus/presets/modern.xml | 2 +- .../com_menus/tmpl/items/default.php | 2 +- .../com_menus/tmpl/menus/default.php | 2 +- .../com_modules/tmpl/modules/default.php | 2 +- .../com_newsfeeds/tmpl/newsfeeds/default.php | 2 +- .../com_plugins/tmpl/plugins/default.php | 2 +- .../com_redirect/tmpl/links/default.php | 2 +- .../components/com_tags/tmpl/tags/default.php | 2 +- .../com_templates/tmpl/styles/default.php | 2 +- .../com_templates/tmpl/template/default.php | 10 +- .../tmpl/template/default_tree.php | 2 +- .../com_users/tmpl/groups/default.php | 2 +- .../com_users/tmpl/levels/default.php | 2 +- .../com_users/tmpl/notes/default.php | 2 +- .../com_users/tmpl/users/default.php | 2 +- .../com_workflow/tmpl/stages/default.php | 2 +- .../com_workflow/tmpl/transitions/default.php | 2 +- .../com_workflow/tmpl/workflows/default.php | 2 +- .../modules/mod_latest/tmpl/default.php | 2 +- .../modules/mod_logged/tmpl/default.php | 2 +- .../modules/mod_popular/tmpl/default.php | 2 +- .../mod_quickicon/Helper/QuickIconHelper.php | 2 +- .../modules/mod_status/tmpl/default.php | 10 +- administrator/templates/atum/component.php | 2 +- administrator/templates/atum/error_full.php | 2 +- administrator/templates/atum/error_login.php | 4 +- .../templates/atum/joomla.asset.json | 8 +- administrator/templates/atum/login.php | 4 +- .../templates/atum/scss/_variables.scss | 2 +- .../{font-awesome.scss => fontawesome.scss} | 5 +- build/build-modules-js/compilecss.es6.js | 2 +- build/build-modules-js/settings.json | 15 +- .../widgets/languageStrings/widget.css | 2 +- .../widgets/sqlqueries/widget.css | 2 +- build/media_source/system/scss/_icomoon.scss | 134 +++++++++--------- installation/template/error.php | 2 +- installation/template/index.php | 2 +- installation/template/scss/template.scss | 10 +- package-lock.json | 18 +-- package.json | 2 +- .../extensionupdate/extensionupdate.php | 2 +- .../quickicon/overridecheck/overridecheck.php | 2 +- plugins/system/debug/debug.php | 4 +- templates/cassiopeia/joomla.asset.json | 2 +- templates/cassiopeia/scss/_variables.scss | 2 +- templates/cassiopeia/scss/template.scss | 4 +- .../scss/vendor/bootstrap/_dropdown.scss | 2 +- 67 files changed, 170 insertions(+), 174 deletions(-) rename administrator/templates/atum/scss/{font-awesome.scss => fontawesome.scss} (53%) diff --git a/administrator/components/com_associations/tmpl/associations/default.php b/administrator/components/com_associations/tmpl/associations/default.php index 533c4c91a5469..094fb0f380eb0 100644 --- a/administrator/components/com_associations/tmpl/associations/default.php +++ b/administrator/components/com_associations/tmpl/associations/default.php @@ -102,7 +102,7 @@ editor, $item->checked_out_time, 'associations.', $canCheckin); ?> - '; ?> + '; ?> escape($item->title); ?> diff --git a/administrator/components/com_banners/tmpl/banners/default.php b/administrator/components/com_banners/tmpl/banners/default.php index 7e5f99dc6015e..22a8d391b6853 100644 --- a/administrator/components/com_banners/tmpl/banners/default.php +++ b/administrator/components/com_banners/tmpl/banners/default.php @@ -135,7 +135,7 @@ editor, $item->checked_out_time, 'banners.', $canCheckin); ?> - checked_out ? '' : ''; ?> + checked_out ? '' : ''; ?> escape($item->name); ?> diff --git a/administrator/components/com_banners/tmpl/clients/default.php b/administrator/components/com_banners/tmpl/clients/default.php index 5c7028bcb2912..02429834abae5 100644 --- a/administrator/components/com_banners/tmpl/clients/default.php +++ b/administrator/components/com_banners/tmpl/clients/default.php @@ -117,7 +117,7 @@ editor, $item->checked_out_time, 'clients.', $canCheckin); ?> - checked_out ? '' : ''; ?> + checked_out ? '' : ''; ?> escape($item->name); ?> diff --git a/administrator/components/com_categories/tmpl/categories/default.php b/administrator/components/com_categories/tmpl/categories/default.php index 6a4454d9d9ddc..b107e6ac176dc 100644 --- a/administrator/components/com_categories/tmpl/categories/default.php +++ b/administrator/components/com_categories/tmpl/categories/default.php @@ -194,7 +194,7 @@ editor, $item->checked_out_time, 'categories.', $canCheckin); ?> - checked_out ? '' : ''; ?> + checked_out ? '' : ''; ?> escape($item->title); ?> diff --git a/administrator/components/com_contact/tmpl/contacts/default.php b/administrator/components/com_contact/tmpl/contacts/default.php index a97d837976693..fc98667060391 100644 --- a/administrator/components/com_contact/tmpl/contacts/default.php +++ b/administrator/components/com_contact/tmpl/contacts/default.php @@ -144,7 +144,7 @@ editor, $item->checked_out_time, 'contacts.', $canCheckin); ?> - checked_out ? '' : ''; ?> + checked_out ? '' : ''; ?> escape($item->name); ?> diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php index 43732dadedc1c..fb2fc1f7dfab3 100644 --- a/administrator/components/com_content/tmpl/articles/default.php +++ b/administrator/components/com_content/tmpl/articles/default.php @@ -268,7 +268,7 @@ editor, $item->checked_out_time, 'articles.', $canCheckin); ?> - checked_out ? '' : ''; ?> + checked_out ? '' : ''; ?> escape($item->title); ?> diff --git a/administrator/components/com_content/tmpl/featured/default.php b/administrator/components/com_content/tmpl/featured/default.php index ac980dea478ea..bcffd4961b0b5 100644 --- a/administrator/components/com_content/tmpl/featured/default.php +++ b/administrator/components/com_content/tmpl/featured/default.php @@ -249,7 +249,7 @@ editor, $item->checked_out_time, 'articles.', $canCheckin); ?> - checked_out ? '' : ''; ?> + checked_out ? '' : ''; ?> escape($item->title); ?> diff --git a/administrator/components/com_cpanel/Model/SystemModel.php b/administrator/components/com_cpanel/Model/SystemModel.php index 372837dbb6a80..799c7253bed00 100644 --- a/administrator/components/com_cpanel/Model/SystemModel.php +++ b/administrator/components/com_cpanel/Model/SystemModel.php @@ -35,10 +35,10 @@ public function getItems() { $user = Factory::getUser(); $systemSection = new SystemHeader('COM_CPANEL_SYSTEM_SETUP', 'cog'); - $maintainSection = new SystemHeader('MOD_MENU_MAINTAIN', 'refresh'); - $infoSection = new SystemHeader('MOD_MENU_INFORMATION', 'refresh'); + $maintainSection = new SystemHeader('MOD_MENU_MAINTAIN', 'sync'); + $infoSection = new SystemHeader('MOD_MENU_INFORMATION', 'sync'); $installSection = new SystemHeader('MOD_MENU_INSTALL', 'download'); - $manageSection = new SystemHeader('MOD_MENU_MANAGE', 'refresh'); + $manageSection = new SystemHeader('MOD_MENU_MANAGE', 'sync'); $updateSection = new SystemHeader('MOD_MENU_UPDATE', 'upload'); $templateSection = new SystemHeader('MOD_MENU_TEMPLATES', 'image'); $accessSection = new SystemHeader('MOD_MENU_ACCESS', 'lock'); diff --git a/administrator/components/com_fields/tmpl/fields/default.php b/administrator/components/com_fields/tmpl/fields/default.php index 6d43e413cbf54..a8af964887d45 100644 --- a/administrator/components/com_fields/tmpl/fields/default.php +++ b/administrator/components/com_fields/tmpl/fields/default.php @@ -135,7 +135,7 @@ editor, $item->checked_out_time, 'fields.', $canCheckin); ?> - checked_out ? '' : ''; ?> + checked_out ? '' : ''; ?> escape($item->title); ?> diff --git a/administrator/components/com_fields/tmpl/groups/default.php b/administrator/components/com_fields/tmpl/groups/default.php index 6deb6e5f56598..a860ca349a235 100644 --- a/administrator/components/com_fields/tmpl/groups/default.php +++ b/administrator/components/com_fields/tmpl/groups/default.php @@ -125,7 +125,7 @@ editor, $item->checked_out_time, 'groups.', $canCheckin); ?> - checked_out ? '' : ''; ?> + checked_out ? '' : ''; ?> escape($item->title); ?> diff --git a/administrator/components/com_languages/tmpl/languages/default.php b/administrator/components/com_languages/tmpl/languages/default.php index 2952c0b01efad..834e12f6164f8 100644 --- a/administrator/components/com_languages/tmpl/languages/default.php +++ b/administrator/components/com_languages/tmpl/languages/default.php @@ -121,7 +121,7 @@ - escape($item->title); ?> + escape($item->title); ?> escape($item->title); ?> diff --git a/administrator/components/com_languages/tmpl/override/edit.php b/administrator/components/com_languages/tmpl/override/edit.php index c263318aa9da1..3b4c78c9363a7 100644 --- a/administrator/components/com_languages/tmpl/override/edit.php +++ b/administrator/components/com_languages/tmpl/override/edit.php @@ -105,7 +105,7 @@ - + diff --git a/administrator/components/com_languages/tmpl/overrides/default.php b/administrator/components/com_languages/tmpl/overrides/default.php index 17e1817e15627..3123c5fb994c0 100644 --- a/administrator/components/com_languages/tmpl/overrides/default.php +++ b/administrator/components/com_languages/tmpl/overrides/default.php @@ -74,7 +74,7 @@ - escape($key); ?> + escape($key); ?> escape($key); ?> diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue b/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue index f2bfea4f1a636..205678acadfe8 100644 --- a/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue +++ b/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue @@ -4,7 +4,7 @@ @dblclick.stop.prevent="onPreviewDblClick()">
- +
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/file.vue b/administrator/components/com_media/resources/scripts/components/browser/items/file.vue index 85e4a6ba8343d..0bbd3882f100c 100644 --- a/administrator/components/com_media/resources/scripts/components/browser/items/file.vue +++ b/administrator/components/com_media/resources/scripts/components/browser/items/file.vue @@ -3,7 +3,7 @@
- +
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/video.vue b/administrator/components/com_media/resources/scripts/components/browser/items/video.vue index fe4a1f22f737f..dd7700aa9dabb 100644 --- a/administrator/components/com_media/resources/scripts/components/browser/items/video.vue +++ b/administrator/components/com_media/resources/scripts/components/browser/items/video.vue @@ -3,7 +3,7 @@
- +
diff --git a/administrator/components/com_media/resources/scripts/components/tree/item.vue b/administrator/components/com_media/resources/scripts/components/tree/item.vue index 62895e66ed868..7799cd18e5012 100644 --- a/administrator/components/com_media/resources/scripts/components/tree/item.vue +++ b/administrator/components/com_media/resources/scripts/components/tree/item.vue @@ -33,8 +33,8 @@ iconClass() { return { fa: true, - 'fa-folder-o': !this.isOpen, - 'fa-folder-open-o': this.isOpen, + 'fa-folder': !this.isOpen, + 'fa-folderpen-o': this.isOpen, } } }, diff --git a/administrator/components/com_media/resources/styles/components/_media-browser.scss b/administrator/components/com_media/resources/styles/components/_media-browser.scss index 71ff41b5885aa..c82134ed2ae24 100644 --- a/administrator/components/com_media/resources/styles/components/_media-browser.scss +++ b/administrator/components/com_media/resources/styles/components/_media-browser.scss @@ -95,7 +95,7 @@ left: 0; width: calc(#{$grid-item-icon-size} * 1.3); height: calc(#{$grid-item-icon-size} * 1.3); - font-family: FontAwesome; + font-family: "Font Awesome 5 Free"; font-size: $grid-item-icon-size; line-height: calc(#{$grid-item-icon-size} * 1.3); text-align: center; @@ -347,7 +347,7 @@ transition: all .2s cubic-bezier(.4, .0, .2, 1); } &::before { - font-family: FontAwesome; + font-family:"Font Awesome 5 Free"; color: $table-item-icon-color; .selected & { color: $table-item-icon-color-selected; diff --git a/administrator/components/com_media/resources/styles/components/_media-tree.scss b/administrator/components/com_media/resources/styles/components/_media-tree.scss index ecef74311c2e5..5258cbf73b6fd 100644 --- a/administrator/components/com_media/resources/styles/components/_media-tree.scss +++ b/administrator/components/com_media/resources/styles/components/_media-tree.scss @@ -33,7 +33,7 @@ ul.media-tree { padding: 4px 10px; &::before { margin-right: 6px; - font-family: FontAwesome; + font-family:"Font Awesome 5 Free"; color: $sidebar-tree-icon-color; content: $sidebar-tree-folder-icon; } diff --git a/administrator/components/com_menus/presets/joomla.xml b/administrator/components/com_menus/presets/joomla.xml index d5759a45a9284..c40cbf1b0fe82 100644 --- a/administrator/components/com_menus/presets/joomla.xml +++ b/administrator/components/com_menus/presets/joomla.xml @@ -14,7 +14,7 @@ editor, $item->checked_out_time, 'items.', $canCheckin); ?> protected) : ?> - checked_out ? '' : ''; ?> + checked_out ? '' : ''; ?> diff --git a/administrator/components/com_menus/tmpl/menus/default.php b/administrator/components/com_menus/tmpl/menus/default.php index 38719a13a741c..30088ecf149ee 100644 --- a/administrator/components/com_menus/tmpl/menus/default.php +++ b/administrator/components/com_menus/tmpl/menus/default.php @@ -102,7 +102,7 @@
- + escape($item->title); ?> diff --git a/administrator/components/com_modules/tmpl/modules/default.php b/administrator/components/com_modules/tmpl/modules/default.php index 1904e6e3d7ed5..ac8cb82f54eb2 100644 --- a/administrator/components/com_modules/tmpl/modules/default.php +++ b/administrator/components/com_modules/tmpl/modules/default.php @@ -134,7 +134,7 @@ editor, $item->checked_out_time, 'modules.', $canCheckin); ?> - checked_out ? '' : ''; ?> + checked_out ? '' : ''; ?> escape($item->title); ?> diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php index 23b627d0ad796..d5c0bcd449b01 100644 --- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php +++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php @@ -133,7 +133,7 @@ editor, $item->checked_out_time, 'newsfeeds.', $canCheckin); ?> - checked_out ? '' : ''; ?> + checked_out ? '' : ''; ?> escape($item->name); ?> diff --git a/administrator/components/com_plugins/tmpl/plugins/default.php b/administrator/components/com_plugins/tmpl/plugins/default.php index a96300c9b766b..6f1f92f7fe390 100644 --- a/administrator/components/com_plugins/tmpl/plugins/default.php +++ b/administrator/components/com_plugins/tmpl/plugins/default.php @@ -108,7 +108,7 @@ editor, $item->checked_out_time, 'plugins.', $canCheckin); ?> - checked_out ? '' : ''; ?> + checked_out ? '' : ''; ?> name; ?> diff --git a/administrator/components/com_redirect/tmpl/links/default.php b/administrator/components/com_redirect/tmpl/links/default.php index f561719658cbe..8897e490481ac 100644 --- a/administrator/components/com_redirect/tmpl/links/default.php +++ b/administrator/components/com_redirect/tmpl/links/default.php @@ -108,7 +108,7 @@ - escape(str_replace(Uri::root(), '', rawurldecode($item->old_url))); ?> + escape(str_replace(Uri::root(), '', rawurldecode($item->old_url))); ?> escape(str_replace(Uri::root(), '', rawurldecode($item->old_url))); ?> diff --git a/administrator/components/com_tags/tmpl/tags/default.php b/administrator/components/com_tags/tmpl/tags/default.php index a8f6ca78d2903..a96b73282d900 100644 --- a/administrator/components/com_tags/tmpl/tags/default.php +++ b/administrator/components/com_tags/tmpl/tags/default.php @@ -189,7 +189,7 @@ editor, $item->checked_out_time, 'tags.', $canCheckin); ?> - checked_out ? '' : ''; ?> + checked_out ? '' : ''; ?> escape($item->title); ?> diff --git a/administrator/components/com_templates/tmpl/styles/default.php b/administrator/components/com_templates/tmpl/styles/default.php index c65133b8d1bc0..fbe00ee93bbc6 100644 --- a/administrator/components/com_templates/tmpl/styles/default.php +++ b/administrator/components/com_templates/tmpl/styles/default.php @@ -76,7 +76,7 @@ - escape($item->title); ?> + escape($item->title); ?> escape($item->title); ?> diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php index be459a7b0c6c7..0f2dff51beffb 100644 --- a/administrator/components/com_templates/tmpl/template/default.php +++ b/administrator/components/com_templates/tmpl/template/default.php @@ -151,7 +151,7 @@   -   +   @@ -246,7 +246,7 @@ . '&id=' . $input->getInt('id') . '&file=' . $this->file . '&' . $token; ?> -  name; ?> +  name; ?> @@ -269,7 +269,7 @@ . '&id=' . $input->getInt('id') . '&file=' . $this->file . '&' . $token; ?> -  name; ?> +  name; ?> @@ -295,7 +295,7 @@ . '&id=' . $input->getInt('id') . '&file=' . $this->file . '&' . $token; ?> - name; ?> + name; ?> @@ -321,7 +321,7 @@ . '&id=' . $input->getInt('id') . '&file=' . $this->file . '&' . $token; ?> -  name; ?> +  name; ?> diff --git a/administrator/components/com_templates/tmpl/template/default_tree.php b/administrator/components/com_templates/tmpl/template/default_tree.php index ee515fb658b9b..7fe629a9d13df 100644 --- a/administrator/components/com_templates/tmpl/template/default_tree.php +++ b/administrator/components/com_templates/tmpl/template/default_tree.php @@ -59,7 +59,7 @@
  • id . '&file=' . $value->id); ?>'> -  escape($value->name); ?> +  escape($value->name); ?>
    • diff --git a/administrator/components/com_users/tmpl/groups/default.php b/administrator/components/com_users/tmpl/groups/default.php index c31f21835ab5c..5ea6bd76d5342 100644 --- a/administrator/components/com_users/tmpl/groups/default.php +++ b/administrator/components/com_users/tmpl/groups/default.php @@ -91,7 +91,7 @@ $item->level + 1)); ?> - escape($item->title); ?> + escape($item->title); ?> escape($item->title); ?> diff --git a/administrator/components/com_users/tmpl/levels/default.php b/administrator/components/com_users/tmpl/levels/default.php index 8f8e5ff71cfcd..6a76cebf9cb9e 100644 --- a/administrator/components/com_users/tmpl/levels/default.php +++ b/administrator/components/com_users/tmpl/levels/default.php @@ -116,7 +116,7 @@ - escape($item->title); ?> + escape($item->title); ?> escape($item->title); ?> diff --git a/administrator/components/com_users/tmpl/notes/default.php b/administrator/components/com_users/tmpl/notes/default.php index dfab444ce8f0f..f217bfab578a7 100644 --- a/administrator/components/com_users/tmpl/notes/default.php +++ b/administrator/components/com_users/tmpl/notes/default.php @@ -86,7 +86,7 @@ subject ?: Text::_('COM_USERS_EMPTY_SUBJECT'); ?> - checked_out ? '' : ''; ?> + checked_out ? '' : ''; ?> escape($subject); ?> diff --git a/administrator/components/com_users/tmpl/users/default.php b/administrator/components/com_users/tmpl/users/default.php index 21915a51aaa64..dae57409ca616 100644 --- a/administrator/components/com_users/tmpl/users/default.php +++ b/administrator/components/com_users/tmpl/users/default.php @@ -105,7 +105,7 @@
    - escape($item->name); ?> + escape($item->name); ?> escape($item->name); ?> diff --git a/administrator/components/com_workflow/tmpl/stages/default.php b/administrator/components/com_workflow/tmpl/stages/default.php index 690378bb6dc77..665b2a7e487a8 100644 --- a/administrator/components/com_workflow/tmpl/stages/default.php +++ b/administrator/components/com_workflow/tmpl/stages/default.php @@ -126,7 +126,7 @@ - '; ?> + '; ?> escape(Text::_($item->title)); ?> diff --git a/administrator/components/com_workflow/tmpl/transitions/default.php b/administrator/components/com_workflow/tmpl/transitions/default.php index 6308d446d15b4..ae7da77a09826 100644 --- a/administrator/components/com_workflow/tmpl/transitions/default.php +++ b/administrator/components/com_workflow/tmpl/transitions/default.php @@ -122,7 +122,7 @@ - '; ?> + '; ?> escape(Text::_($item->title)); ?> diff --git a/administrator/components/com_workflow/tmpl/workflows/default.php b/administrator/components/com_workflow/tmpl/workflows/default.php index a58f97cf6cee6..827125028cfe7 100644 --- a/administrator/components/com_workflow/tmpl/workflows/default.php +++ b/administrator/components/com_workflow/tmpl/workflows/default.php @@ -138,7 +138,7 @@ - '; ?> + '; ?> escape(Text::_($item->title)); ?> diff --git a/administrator/modules/mod_latest/tmpl/default.php b/administrator/modules/mod_latest/tmpl/default.php index 287d6175be8c3..1992140c8e80d 100644 --- a/administrator/modules/mod_latest/tmpl/default.php +++ b/administrator/modules/mod_latest/tmpl/default.php @@ -33,7 +33,7 @@ link) : ?> - title, ENT_QUOTES, 'UTF-8'); ?> + title, ENT_QUOTES, 'UTF-8'); ?> title, ENT_QUOTES, 'UTF-8'); ?> diff --git a/administrator/modules/mod_logged/tmpl/default.php b/administrator/modules/mod_logged/tmpl/default.php index ff61cafa1658a..49a07b972d8af 100644 --- a/administrator/modules/mod_logged/tmpl/default.php +++ b/administrator/modules/mod_logged/tmpl/default.php @@ -35,7 +35,7 @@ editLink)) : ?> - name, ENT_QUOTES, 'UTF-8'); ?> + name, ENT_QUOTES, 'UTF-8'); ?> name, ENT_QUOTES, 'UTF-8'); ?> diff --git a/administrator/modules/mod_popular/tmpl/default.php b/administrator/modules/mod_popular/tmpl/default.php index 43d21de6049dd..d74b36cc09eac 100644 --- a/administrator/modules/mod_popular/tmpl/default.php +++ b/administrator/modules/mod_popular/tmpl/default.php @@ -39,7 +39,7 @@ link) : ?> - title, ENT_QUOTES, 'UTF-8'); ?> + title, ENT_QUOTES, 'UTF-8'); ?> title, ENT_QUOTES, 'UTF-8'); ?> diff --git a/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php b/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php index d0ca208e5175d..b1da939e2f456 100644 --- a/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php +++ b/administrator/modules/mod_quickicon/Helper/QuickIconHelper.php @@ -68,7 +68,7 @@ public static function &getButtons(Registry $params, CMSApplication $application self::$buttons[$key] = array( array( 'link' => Route::_('index.php?option=com_content&task=article.add'), - 'image' => 'fa fa-pencil-square', + 'image' => 'fa fa-pen-square', 'text' => Text::_('MOD_QUICKICON_ADD_NEW_ARTICLE'), 'access' => array('core.manage', 'com_content', 'core.create', 'com_content'), 'group' => 'MOD_QUICKICON_CONTENT', diff --git a/administrator/modules/mod_status/tmpl/default.php b/administrator/modules/mod_status/tmpl/default.php index 0f198485e3f5e..0fe80c5e1e6c7 100644 --- a/administrator/modules/mod_status/tmpl/default.php +++ b/administrator/modules/mod_status/tmpl/default.php @@ -39,14 +39,14 @@
  • - +
  • title=""> - + getSession()->get('messages.unread'); ?> 0) : ?> @@ -58,7 +58,7 @@ authorise('core.manage', 'com_postinstall')) : ?>
  • title=""> - + 0) : ?> @@ -88,13 +88,13 @@
  • title=""> - +
    - + name; ?>
    diff --git a/administrator/templates/atum/component.php b/administrator/templates/atum/component.php index c29cce885f821..9adbb3d2fe80a 100644 --- a/administrator/templates/atum/component.php +++ b/administrator/templates/atum/component.php @@ -21,7 +21,7 @@ // Load template CSS file HTMLHelper::_('stylesheet', 'bootstrap.css', ['version' => 'auto', 'relative' => true]); -HTMLHelper::_('stylesheet', 'font-awesome.css', ['version' => 'auto', 'relative' => true]); +HTMLHelper::_('stylesheet', 'fontawesome.css', ['version' => 'auto', 'relative' => true]); HTMLHelper::_('stylesheet', 'template' . ($this->direction === 'rtl' ? '-rtl' : '') . '.css', ['version' => 'auto', 'relative' => true]); // Load custom CSS file diff --git a/administrator/templates/atum/error_full.php b/administrator/templates/atum/error_full.php index 16ae27bc7e98c..8593920d38c2f 100644 --- a/administrator/templates/atum/error_full.php +++ b/administrator/templates/atum/error_full.php @@ -37,7 +37,7 @@ // Load template CSS file HTMLHelper::_('stylesheet', 'bootstrap.css', ['version' => 'auto', 'relative' => true]); -HTMLHelper::_('stylesheet', 'font-awesome.css', ['version' => 'auto', 'relative' => true]); +HTMLHelper::_('stylesheet', 'fontawesome.css', ['version' => 'auto', 'relative' => true]); HTMLHelper::_('stylesheet', 'template' . ($this->direction === 'rtl' ? '-rtl' : '') . '.css', ['version' => 'auto', 'relative' => true]); // Load custom CSS file diff --git a/administrator/templates/atum/error_login.php b/administrator/templates/atum/error_login.php index ea60c2d8ccd36..5be4ccf71b7f9 100644 --- a/administrator/templates/atum/error_login.php +++ b/administrator/templates/atum/error_login.php @@ -25,7 +25,7 @@ // Load template CSS file HTMLHelper::_('stylesheet', 'bootstrap.min.css', ['version' => 'auto', 'relative' => true]); -HTMLHelper::_('stylesheet', 'font-awesome.min.css', ['version' => 'auto', 'relative' => true]); +HTMLHelper::_('stylesheet', 'fontawesome.min.css', ['version' => 'auto', 'relative' => true]); HTMLHelper::_('stylesheet', 'template' . ($this->direction === 'rtl' ? '-rtl' : '') . '.min.css', ['version' => 'auto', 'relative' => true]); // Load custom CSS file @@ -108,7 +108,7 @@
    - +
    diff --git a/administrator/templates/atum/joomla.asset.json b/administrator/templates/atum/joomla.asset.json index 9aecacd835081..6fd7faad82bf4 100644 --- a/administrator/templates/atum/joomla.asset.json +++ b/administrator/templates/atum/joomla.asset.json @@ -8,7 +8,7 @@ "name": "template.atum.base", "dependencies": [ "core", - "font-awesome", + "fontawesome", "bootstrap.css", "css-vars-ponyfill" ], @@ -36,10 +36,10 @@ "bootstrap.min.css" ] }, - "font-awesome": { - "name": "font-awesome", + "fontawesome": { + "name": "fontawesome", "css": [ - "font-awesome.min.css" + "fontawesome.min.css" ] } } diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php index 78ef27bd3db64..8c5e6bb6d8e93 100644 --- a/administrator/templates/atum/login.php +++ b/administrator/templates/atum/login.php @@ -25,7 +25,7 @@ // Load template CSS file HTMLHelper::_('stylesheet', 'bootstrap.css', ['version' => 'auto', 'relative' => true]); -HTMLHelper::_('stylesheet', 'font-awesome.css', ['version' => 'auto', 'relative' => true]); +HTMLHelper::_('stylesheet', 'fontawesome.css', ['version' => 'auto', 'relative' => true]); HTMLHelper::_('stylesheet', 'template' . ($this->direction === 'rtl' ? '-rtl' : '') . '.css', ['version' => 'auto', 'relative' => true]); // Load custom CSS file @@ -98,7 +98,7 @@
     ©
    diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss index 1d6cc533df6cc..76c517c3acf4f 100644 --- a/administrator/templates/atum/scss/_variables.scss +++ b/administrator/templates/atum/scss/_variables.scss @@ -91,7 +91,7 @@ $h5-font-size: .9286rem; $h6-font-size: .8571rem; $font-size-sm: .8rem; $fa-css-prefix: fa; -$fa-font-path: "../../../../media/vendor/font-awesome/fonts"; +$fa-font-path: "../../../../media/vendor/fontawesome-free/webfonts"; // Font weights $thin-weight: 100; diff --git a/administrator/templates/atum/scss/font-awesome.scss b/administrator/templates/atum/scss/fontawesome.scss similarity index 53% rename from administrator/templates/atum/scss/font-awesome.scss rename to administrator/templates/atum/scss/fontawesome.scss index 9e9a25cb3ea05..045c5fc325d42 100644 --- a/administrator/templates/atum/scss/font-awesome.scss +++ b/administrator/templates/atum/scss/fontawesome.scss @@ -1,9 +1,10 @@ // Variables @import "variables"; -// FontAwesome -@import "../../../../media/vendor/font-awesome/scss/font-awesome"; +// Font Awesome 5 Free +@import "../../../../media/vendor/fontawesome-free/scss/fontawesome"; +@import "../../../../media/vendor/fontawesome-free/scss/solid"; // B/C for Icomoon @import "../../../../build/media_source/system/scss/icomoon"; diff --git a/build/build-modules-js/compilecss.es6.js b/build/build-modules-js/compilecss.es6.js index 76c4097283cf1..737ea6e6f292b 100644 --- a/build/build-modules-js/compilecss.es6.js +++ b/build/build-modules-js/compilecss.es6.js @@ -44,7 +44,7 @@ module.exports.compile = (options, path) => { `${RootPath}/templates/cassiopeia/scss/template.scss`, `${RootPath}/templates/cassiopeia/scss/template-rtl.scss`, `${RootPath}/administrator/templates/atum/scss/bootstrap.scss`, - `${RootPath}/administrator/templates/atum/scss/font-awesome.scss`, + `${RootPath}/administrator/templates/atum/scss/fontawesome.scss`, `${RootPath}/administrator/templates/atum/scss/template.scss`, `${RootPath}/administrator/templates/atum/scss/template-rtl.scss`, `${RootPath}/installation/template/scss/template.scss`, diff --git a/build/build-modules-js/settings.json b/build/build-modules-js/settings.json index d52b1534f3b8f..a5a6e8e8e0e26 100644 --- a/build/build-modules-js/settings.json +++ b/build/build-modules-js/settings.json @@ -169,25 +169,24 @@ "dependencies": [], "licenseFilename": "LICENSE.md" }, - "font-awesome": { - "name": "font-awesome", + "@fortawesome/fontawesome-free": { + "name": "fontawesome-free", "css": { - "css/font-awesome.css": "css/font-awesome.css", - "css/font-awesome.min.css": "css/font-awesome.min.css" + "css/fontawesome.css": "css/fontawesome.css", + "css/fontawesome.min.css": "css/fontawesome.min.css" }, "filesExtra": { - "css/font-awesome.css.map": "css/font-awesome.css.map", "scss": "scss", - "fonts": "fonts" + "webfonts": "webfonts" }, "provideAssets": [ { "name": null, - "css": ["font-awesome.min.css"] + "css": ["fontawesome.min.css"] } ], "dependencies": [], - "licenseFilename": "" + "licenseFilename": "LICENSE.txt" }, "jquery": { "name": "jquery", diff --git a/build/media_source/plg_system_debug/widgets/languageStrings/widget.css b/build/media_source/plg_system_debug/widgets/languageStrings/widget.css index d2440843bd298..928782ab263cf 100644 --- a/build/media_source/plg_system_debug/widgets/languageStrings/widget.css +++ b/build/media_source/plg_system_debug/widgets/languageStrings/widget.css @@ -44,7 +44,7 @@ table.phpdebugbar-widgets-languageStrings span.phpdebugbar-widgets-eye-dash { table.phpdebugbar-widgets-languageStrings span.phpdebugbar-widgets-eye:before, table.phpdebugbar-widgets-languageStrings span.phpdebugbar-widgets-eye-dash:before { - font-family: FontAwesome; + font-family:"Font Awesome 5 Free"; margin-right: 4px; /*font-size: 12px;*/ } diff --git a/build/media_source/plg_system_debug/widgets/sqlqueries/widget.css b/build/media_source/plg_system_debug/widgets/sqlqueries/widget.css index eccde8b39fefb..3cb6951935143 100644 --- a/build/media_source/plg_system_debug/widgets/sqlqueries/widget.css +++ b/build/media_source/plg_system_debug/widgets/sqlqueries/widget.css @@ -49,7 +49,7 @@ div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-eye:before, div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-eye-dash:before, div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-stmt-id:before, div.phpdebugbar-widgets-sqlqueries a.phpdebugbar-widgets-editor-link:before { - font-family: FontAwesome; + font-family:"Font Awesome 5 Free"; margin-right: 4px; font-size: 12px; } diff --git a/build/media_source/system/scss/_icomoon.scss b/build/media_source/system/scss/_icomoon.scss index 68c3c3821a89e..54ec88c225c6a 100644 --- a/build/media_source/system/scss/_icomoon.scss +++ b/build/media_source/system/scss/_icomoon.scss @@ -10,7 +10,7 @@ } [class^="icon-"]:before, [class*=" icon-"]:before { - font-family: 'FontAwesome'; + font-family: "Font Awesome 5 Free"; font-style: normal; speak: none; } @@ -20,7 +20,7 @@ } .icon-generic:before { - @extend .#{$fa-css-prefix}-dot-circle-o:before; + @extend .#{$fa-css-prefix}-dot-circle:before; } .icon-joomla:before { @@ -52,19 +52,19 @@ } .icon-arrow-up-2:before { - @extend .#{$fa-css-prefix}-arrow-circle-o-up:before; + @extend .#{$fa-css-prefix}-arrow-alt-circle-up:before; } .icon-arrow-right-2:before { - @extend .#{$fa-css-prefix}-arrow-circle-o-right:before; + @extend .#{$fa-css-prefix}-arrow-alt-circle-right:before; } .icon-arrow-down-2:before { - @extend .#{$fa-css-prefix}-arrow-circle-o-down:before; + @extend .#{$fa-css-prefix}-arrow-alt-circle-down:before; } .icon-arrow-left-2:before { - @extend .#{$fa-css-prefix}-arrow-circle-o-left:before; + @extend .#{$fa-css-prefix}-arrow-alt-circle-left:before; } .icon-arrow-up-3:before { @@ -112,15 +112,15 @@ } .icon-forward-2:before { - @extend .#{$fa-css-prefix}-arrow-circle-o-right:before; + @extend .#{$fa-css-prefix}-arrow-alt-circle-right:before; } .icon-backward-2:before, .icon-reply:before { - @extend .#{$fa-css-prefix}-arrow-circle-o-left:before; + @extend .#{$fa-css-prefix}-arrow-alt-circle-left:before; } .icon-unblock:before, .icon-refresh:before, .icon-redo-2:before { - @extend .#{$fa-css-prefix}-refresh:before; + @extend .#{$fa-css-prefix}-sync:before; } .icon-undo-2:before { @@ -128,7 +128,7 @@ } .icon-move:before { - @extend .#{$fa-css-prefix}-arrows:before; + @extend .#{$fa-css-prefix}-arrows-alt:before; } .icon-expand:before { @@ -140,7 +140,7 @@ } .icon-expand-2:before { - @extend .#{$fa-css-prefix}-arrows-alt:before; + @extend .#{$fa-css-prefix}-expand-arrows-alt:before; } .icon-contract-2:before { @@ -148,7 +148,7 @@ } .icon-play:before { - @extend .#{$fa-css-prefix}-arrows-alt:before; + @extend .#{$fa-css-prefix}-expand-arrows-alt:before; } .icon-pause:before { @@ -176,15 +176,15 @@ } .icon-play-circle:before { - @extend .#{$fa-css-prefix}-play-circle-o:before; + @extend .#{$fa-css-prefix}-play-circle:before; } .icon-pause-circle:before { - @extend .#{$fa-css-prefix}-pause-circle-o:before; + @extend .#{$fa-css-prefix}-pause-circle:before; } .icon-stop-circle:before { - @extend .#{$fa-css-prefix}-stop-circle-o:before; + @extend .#{$fa-css-prefix}-stop-circle:before; } .icon-backward-circle:before { @@ -196,7 +196,7 @@ } .icon-loop:before { - @extend .#{$fa-css-prefix}-refresh:before; + @extend .#{$fa-css-prefix}-sync:before; } .icon-shuffle:before { @@ -216,11 +216,11 @@ } .icon-apply:before, .icon-edit:before, .icon-pencil:before { - @extend .#{$fa-css-prefix}-pencil-square-o:before; + @extend .#{$fa-css-prefix}-edit:before; } .icon-pencil-2:before { - @extend .#{$fa-css-prefix}-pencil:before; + @extend .#{$fa-css-prefix}-pencil-alt:before; } .icon-brush:before { @@ -268,11 +268,11 @@ } .icon-checkmark-2:before { - @extend .#{$fa-css-prefix}-check-circle-o:before; + @extend .#{$fa-css-prefix}-check-circle:before; } .icon-checkmark-circle:before { - @extend .#{$fa-css-prefix}-check-circle-o:before; + @extend .#{$fa-css-prefix}-check-circle:before; } .icon-info:before { @@ -304,15 +304,15 @@ } .icon-warning-2:before, .icon-warning-circle:before { - @extend .#{$fa-css-prefix}-warning:before; + @extend .#{$fa-css-prefix}-exclamation-triangle:before; } .icon-checkbox-unchecked:before { - @extend .#{$fa-css-prefix}-square-o:before; + @extend .#{$fa-css-prefix}-square:before; } .icon-checkin:before, .icon-checkbox:before, .icon-checkbox-checked:before { - @extend .#{$fa-css-prefix}-check-square-o:before; + @extend .#{$fa-css-prefix}-check-square:before; } .icon-checkbox-partial:before { @@ -320,15 +320,15 @@ } .icon-square:before { - @extend .#{$fa-css-prefix}-square-o:before; + @extend .#{$fa-css-prefix}-square:before; } .icon-radio-unchecked:before { - @extend .#{$fa-css-prefix}-circle-o:before; + @extend .#{$fa-css-prefix}-circle:before; } .icon-radio-checked:before { - @extend .#{$fa-css-prefix}-check-circle-o:before; + @extend .#{$fa-css-prefix}-check-circle:before; } .icon-circle:before { @@ -336,7 +336,7 @@ } .icon-signup:before { - @extend .#{$fa-css-prefix}-sign-in:before; + @extend .#{$fa-css-prefix}-sign-in-alt:before; } .icon-grid:before, .icon-grid-view:before { @@ -396,7 +396,7 @@ } .icon-file-2:before { - @extend .#{$fa-css-prefix}-file-o:before; + @extend .#{$fa-css-prefix}-file:before; } .icon-file-add:before, .icon-file-plus:before { @@ -416,15 +416,15 @@ } .icon-save-copy:before, .icon-copy:before { - @extend .#{$fa-css-prefix}-files-o:before; + @extend .#{$fa-css-prefix}-copy:before; } .icon-stack:before { - @extend .#{$fa-css-prefix}-files-o:before; + @extend .#{$fa-css-prefix}-copy:before; } .icon-tree:before { - @extend .#{$fa-css-prefix}-code-fork:before; + @extend .#{$fa-css-prefix}-code-branch:before; } .icon-tree-2:before { @@ -484,11 +484,11 @@ } .icon-out-2:before, .icon-new-tab:before { - @extend .#{$fa-css-prefix}-external-link:before; + @extend .#{$fa-css-prefix}-external-link-alt:before; } .icon-out-3:before, .icon-new-tab-2:before { - @extend .#{$fa-css-prefix}-external-link-square:before; + @extend .#{$fa-css-prefix}-external-link-square-alt:before; } .icon-link:before { @@ -496,11 +496,11 @@ } .icon-picture:before, .icon-image:before { - @extend .#{$fa-css-prefix}-picture-o:before; + @extend .#{$fa-css-prefix}-image:before; } .icon-pictures:before, .icon-images:before { - @extend .#{$fa-css-prefix}-picture-o:before; + @extend .#{$fa-css-prefix}-image:before; } .icon-palette:before, .icon-color-palette:before { @extend .#{$fa-css-prefix}-paint-brush:before; @@ -510,7 +510,7 @@ } .icon-camera-2:before, .icon-video:before { - @extend .#{$fa-css-prefix}-video-camera:before; + @extend .#{$fa-css-prefix}-video:before; } .icon-play-2:before, .icon-video-2:before, .icon-youtube:before { @@ -530,22 +530,22 @@ } .icon-vcard:before { - @extend .#{$fa-css-prefix}-file-text-o:before; + @extend .#{$fa-css-prefix}-file-alt:before; } .icon-address:before { - @extend .#{$fa-css-prefix}-file-text:before; + @extend .#{$fa-css-prefix}-file-alt:before; } .icon-share-alt:before, .icon-out:before { @extend .#{$fa-css-prefix}-share:before; } .icon-enter:before { - @extend .#{$fa-css-prefix}-sign-in:before; + @extend .#{$fa-css-prefix}-sign-in-alt:before; } .icon-exit:before { - @extend .#{$fa-css-prefix}-sign-out:before; + @extend .#{$fa-css-prefix}-sign-out-alt:before; } .icon-comment:before, .icon-comments:before { @@ -553,7 +553,7 @@ } .icon-comments-2:before { - @extend .#{$fa-css-prefix}-comments-o:before; + @extend .#{$fa-css-prefix}-comments:before; } .icon-quote:before, .icon-quotes-left:before { @@ -581,7 +581,7 @@ } .icon-envelope-opened:before, .icon-mail-2:before { - @extend .#{$fa-css-prefix}-envelope-o:before; + @extend .#{$fa-css-prefix}-envelope:before; } .icon-unarchive:before, .icon-drawer:before { @@ -629,11 +629,11 @@ } .icon-equalizer:before { - @extend .#{$fa-css-prefix}-sliders:before; + @extend .#{$fa-css-prefix}-sliders-h:before; } .icon-dashboard:before { - @extend .#{$fa-css-prefix}-tachometer:before; + @extend .#{$fa-css-prefix}-tachometer-alt:before; } .icon-switch:before { @@ -669,7 +669,7 @@ } .icon-scissors:before { - @extend .#{$fa-css-prefix}-scissors:before; + @extend .#{$fa-css-prefix}-cut:before; } .icon-health:before { @@ -689,7 +689,7 @@ } .icon-clock:before { - @extend .#{$fa-css-prefix}-clock-o:before; + @extend .#{$fa-css-prefix}-clock:before; } .icon-compass:before { @@ -721,23 +721,23 @@ } .icon-calendar-2:before { - @extend .#{$fa-css-prefix}-calendar-check-o:before; + @extend .#{$fa-css-prefix}-calendar-check:before; } .icon-calendar-3:before { - @extend .#{$fa-css-prefix}-calendar-o:before; + @extend .#{$fa-css-prefix}-calendar:before; } .icon-pie:before { - @extend .#{$fa-css-prefix}-pie-chart:before; + @extend .#{$fa-css-prefix}-chart-pie:before; } .icon-bars:before { - @extend .#{$fa-css-prefix}-bar-chart:before; + @extend .#{$fa-css-prefix}-chart-bar:before; } .icon-chart:before { - @extend .#{$fa-css-prefix}-area-chart:before; + @extend .#{$fa-css-prefix}-chart-area:before; } .icon-power-cord:before { @@ -757,19 +757,19 @@ } .icon-lamp:before { - @extend .#{$fa-css-prefix}-lightbulb-o:before; + @extend .#{$fa-css-prefix}-lightbulb:before; } .icon-pin:before, .icon-pushpin:before { - @extend .#{$fa-css-prefix}-thumb-tack:before; + @extend .#{$fa-css-prefix}-thumbtack:before; } .icon-location:before { - @extend .#{$fa-css-prefix}-map-marker:before; + @extend .#{$fa-css-prefix}-map-marker-alt:before; } .icon-shield:before { - @extend .#{$fa-css-prefix}-shield:before; + @extend .#{$fa-css-prefix}-shield-alt:before; } .icon-flag:before { @@ -777,7 +777,7 @@ } .icon-flag-3:before { - @extend .#{$fa-css-prefix}-flag-o:before; + @extend .#{$fa-css-prefix}-flag:before; } .icon-bookmark:before { @@ -785,7 +785,7 @@ } .icon-bookmark-2:before { - @extend .#{$fa-css-prefix}-bookmark-o:before; + @extend .#{$fa-css-prefix}-bookmark:before; } .icon-heart:before { @@ -793,7 +793,7 @@ } .icon-heart-2:before { - @extend .#{$fa-css-prefix}-heart-o:before; + @extend .#{$fa-css-prefix}-heart:before; } .icon-thumbs-up:before { @@ -805,11 +805,11 @@ } .icon-unfeatured:before, .icon-asterisk:before, .icon-star-empty:before { - @extend .#{$fa-css-prefix}-star-o:before; + @extend .#{$fa-css-prefix}-star:before; } .icon-star-2:before { - @extend .#{$fa-css-prefix}-star-half-o:before; + @extend .#{$fa-css-prefix}-star-half:before; } .icon-featured:before, .icon-default:before, .icon-star:before { @@ -817,27 +817,27 @@ } .icon-smiley:before, .icon-smiley-happy:before { - @extend .#{$fa-css-prefix}-smile-o:before; + @extend .#{$fa-css-prefix}-smile:before; } .icon-smiley-2:before, .icon-smiley-happy-2:before { - @extend .#{$fa-css-prefix}-smile-o:before; + @extend .#{$fa-css-prefix}-smile:before; } .icon-smiley-sad:before { - @extend .#{$fa-css-prefix}-frown-o:before; + @extend .#{$fa-css-prefix}-frown:before; } .icon-smiley-sad-2:before { - @extend .#{$fa-css-prefix}-frown-o:before; + @extend .#{$fa-css-prefix}-frown:before; } .icon-smiley-neutral:before { - @extend .#{$fa-css-prefix}-smile-o:before; + @extend .#{$fa-css-prefix}-smile:before; } .icon-smiley-neutral-2:before { - @extend .#{$fa-css-prefix}-smile-o:before; + @extend .#{$fa-css-prefix}-smile:before; } .icon-cart:before { @@ -853,7 +853,7 @@ } .icon-credit-2:before { - @extend .#{$fa-css-prefix}-credit-card-alt:before; + @extend .#{$fa-css-prefix}-credit-card:before; } .icon-expired:before { diff --git a/installation/template/error.php b/installation/template/error.php index ca1122ff587ff..5e11154b4a227 100644 --- a/installation/template/error.php +++ b/installation/template/error.php @@ -45,7 +45,7 @@
    - +
    diff --git a/installation/template/index.php b/installation/template/index.php index 10982fdf4f200..e1a26fd613864 100644 --- a/installation/template/index.php +++ b/installation/template/index.php @@ -60,7 +60,7 @@
    - +
    diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss index 1a3696bfb4093..e0a9f3a9b31c2 100644 --- a/installation/template/scss/template.scss +++ b/installation/template/scss/template.scss @@ -1,12 +1,12 @@ // Variables @import "../../../administrator/templates/atum/scss/variables"; -$fa-font-path: "../../../media/vendor/font-awesome/fonts"; +$fa-font-path: "../../../media/vendor/fontawesome-free/webfonts"; // Bootstrap @import "../../../media/vendor/bootstrap/scss/bootstrap"; -// FontAwesome -@import "../../../media/vendor/font-awesome/scss/font-awesome"; +// "Font Awesome 5 Free" +@import "../../../media/vendor/fontawesome-free/scss/fontawesome"; body { background-color: #1c3d5c; @@ -280,13 +280,13 @@ caption { } .fa-eye:before, .icon-eye-open:before, .icon-eye:before { - font-family: FontAwesome; + font-family:"Font Awesome 5 Free"; cursor: pointer; content: "\f06e"; } .fa-eye-slash:before, .icon-eye-close:before, .icon-eye-blocked:before, .icon-eye-2:before { - font-family: FontAwesome; + font-family:"Font Awesome 5 Free"; cursor: pointer; content: "\f070"; } diff --git a/package-lock.json b/package-lock.json index 0242c5f695443..5ab5176372f8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -980,6 +980,12 @@ "jquery": ">= 1.7.x" } }, + "@fortawesome/fontawesome-free": { + "version": "5.8.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.8.1.tgz", + "integrity": "sha512-GJtx6e55qLEOy2gPOsok2lohjpdWNGrYGtQx0FFT/++K4SYx+Z8LlPHdQBaFzKEwH5IbBB4fNgb//uyZjgYXoA==", + "dev": true + }, "@gfx/zopfli": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/@gfx/zopfli/-/zopfli-1.0.11.tgz", @@ -1283,7 +1289,7 @@ } }, "awesomplete": { - "version": "github:LeaVerou/awesomplete#f8bee8dabbb2be47e3fcef9dafabbdaaff9b20aa", + "version": "github:LeaVerou/awesomplete#d6df8a5bef1f6384544927fe1885acb9f8401ec4", "from": "github:LeaVerou/awesomplete" }, "aws-sign2": { @@ -3440,11 +3446,6 @@ } } }, - "font-awesome": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz", - "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=" - }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -5169,11 +5170,6 @@ "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", "dev": true }, - "is-wsl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=" - }, "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", diff --git a/package.json b/package.json index 4a01bb8e4163f..51bbee4ac0b2e 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,6 @@ "diff": "3.4.0", "dragula": "3.7.2", "focus-visible": "^4.1.4", - "font-awesome": "4.7.0", "joomla-ui-custom-elements": "0.0.30", "jquery": "3.3.1", "jquery-migrate": "^3.0.1", @@ -50,6 +49,7 @@ "@babel/core": "^7.4.0", "@babel/plugin-transform-classes": "^7.4.0", "@babel/preset-env": "^7.4.2", + "@fortawesome/fontawesome-free": "^5.8.1", "@gfx/zopfli": "^1.0.11", "autoprefixer": "^9.5.0", "babel-plugin-add-header-comment": "^1.0.3", diff --git a/plugins/quickicon/extensionupdate/extensionupdate.php b/plugins/quickicon/extensionupdate/extensionupdate.php index 8ee768f1f4490..567654ba2492b 100644 --- a/plugins/quickicon/extensionupdate/extensionupdate.php +++ b/plugins/quickicon/extensionupdate/extensionupdate.php @@ -83,7 +83,7 @@ public function onGetIcons($context) return array( array( 'link' => 'index.php?option=com_installer&view=update&task=update.find&' . $token, - 'image' => 'fa fa-star-o', + 'image' => 'fa fa-star', 'icon' => '', 'text' => Text::_('PLG_QUICKICON_EXTENSIONUPDATE_CHECKING'), 'id' => 'plg_quickicon_extensionupdate', diff --git a/plugins/quickicon/overridecheck/overridecheck.php b/plugins/quickicon/overridecheck/overridecheck.php index 3479f5f502c0f..7dba473df2c1d 100644 --- a/plugins/quickicon/overridecheck/overridecheck.php +++ b/plugins/quickicon/overridecheck/overridecheck.php @@ -87,7 +87,7 @@ public function onGetIcons($context) return array( array( 'link' => 'index.php?option=com_templates&view=templates', - 'image' => 'fa fa-file-o', + 'image' => 'fa fa-file', 'icon' => '', 'text' => Text::_('PLG_QUICKICON_OVERRIDECHECK_CHECKING'), 'id' => 'plg_quickicon_overridecheck', diff --git a/plugins/system/debug/debug.php b/plugins/system/debug/debug.php index c3f2b437053b4..c1fb714174f54 100644 --- a/plugins/system/debug/debug.php +++ b/plugins/system/debug/debug.php @@ -198,10 +198,10 @@ public function onAfterDispatch() // Only if debugging or language debug is enabled. if ((JDEBUG || $this->debugLang) && $this->isAuthorisedDisplayDebug() && strtolower($this->app->getDocument()->getType()) === 'html') { - // Use our own jQuery and font-awesome instead of the debug bar shipped version + // Use our own jQuery and fontawesome instead of the debug bar shipped version $assetManager = $this->app->getDocument()->getWebAssetManager(); $assetManager->enableAsset('jquery-noconflict'); - $assetManager->enableAsset('font-awesome'); + $assetManager->enableAsset('fontawesome'); HTMLHelper::_('stylesheet', 'plg_system_debug/debug.css', array('version' => 'auto', 'relative' => true)); HTMLHelper::_('script', 'plg_system_debug/debug.min.js', array('version' => 'auto', 'relative' => true)); diff --git a/templates/cassiopeia/joomla.asset.json b/templates/cassiopeia/joomla.asset.json index 02833c5927458..b158cd9007c1b 100644 --- a/templates/cassiopeia/joomla.asset.json +++ b/templates/cassiopeia/joomla.asset.json @@ -9,7 +9,7 @@ "dependencies": [ "core", "jquery-noconflict", - "font-awesome", + "fontawesome", "bootstrap.js.bundle" ], "js": [ diff --git a/templates/cassiopeia/scss/_variables.scss b/templates/cassiopeia/scss/_variables.scss index b259f4927b9df..5475e48f9e587 100644 --- a/templates/cassiopeia/scss/_variables.scss +++ b/templates/cassiopeia/scss/_variables.scss @@ -87,7 +87,7 @@ $h4-font-size: 1rem; $h5-font-size: .9286rem; $h6-font-size: .8571rem; $font-size-sm: .8rem; -$fa-font-path: "../../../media/vendor/font-awesome/fonts"; +$fa-font-path: "../../../media/vendor/fontawesome-free/webfonts"; // Border Radius $border-radius: .25rem !default; diff --git a/templates/cassiopeia/scss/template.scss b/templates/cassiopeia/scss/template.scss index 11868c212aa8d..c39f8f0c3e6bc 100644 --- a/templates/cassiopeia/scss/template.scss +++ b/templates/cassiopeia/scss/template.scss @@ -9,8 +9,8 @@ @import "../../../media/vendor/bootstrap/scss/variables"; @import "../../../media/vendor/bootstrap/scss/bootstrap"; -// FontAwesome -@import "../../../media/vendor/font-awesome/scss/font-awesome"; +// "Font Awesome 5 Free" +@import "../../../media/vendor/fontawesome-free/scss/fontawesome"; // B/C for Icomoon @import "../../../build/media_source/system/scss/icomoon"; diff --git a/templates/cassiopeia/scss/vendor/bootstrap/_dropdown.scss b/templates/cassiopeia/scss/vendor/bootstrap/_dropdown.scss index 7455b2566f360..4d280251c5da9 100644 --- a/templates/cassiopeia/scss/vendor/bootstrap/_dropdown.scss +++ b/templates/cassiopeia/scss/vendor/bootstrap/_dropdown.scss @@ -10,7 +10,7 @@ position: absolute; top: -1.5rem; left: .9rem; - font-family: FontAwesome; + font-family:"Font Awesome 5 Free"; font-size: 1.6rem; color: $white-offset; text-shadow: 0 -1px 0 rgba(0,0,0,.2); From 63b833c9fc946c17d1c430da22573b69acdfdb6a Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Sat, 20 Apr 2019 16:08:44 +0100 Subject: [PATCH 2/5] fix front end --- templates/cassiopeia/joomla.asset.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/cassiopeia/joomla.asset.json b/templates/cassiopeia/joomla.asset.json index b158cd9007c1b..31d5c69b909ee 100644 --- a/templates/cassiopeia/joomla.asset.json +++ b/templates/cassiopeia/joomla.asset.json @@ -9,7 +9,7 @@ "dependencies": [ "core", "jquery-noconflict", - "fontawesome", + "fontawesome-free", "bootstrap.js.bundle" ], "js": [ From ca3ecf64925bd467c8fe7120abbcdfd71ed0c087 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Sat, 20 Apr 2019 16:14:31 +0100 Subject: [PATCH 3/5] debug and front end fix --- administrator/templates/atum/scss/fontawesome.scss | 1 + plugins/system/debug/debug.php | 2 +- templates/cassiopeia/scss/template.scss | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/administrator/templates/atum/scss/fontawesome.scss b/administrator/templates/atum/scss/fontawesome.scss index 045c5fc325d42..82425d973fd9f 100644 --- a/administrator/templates/atum/scss/fontawesome.scss +++ b/administrator/templates/atum/scss/fontawesome.scss @@ -5,6 +5,7 @@ @import "../../../../media/vendor/fontawesome-free/scss/fontawesome"; @import "../../../../media/vendor/fontawesome-free/scss/solid"; + // B/C for Icomoon @import "../../../../build/media_source/system/scss/icomoon"; diff --git a/plugins/system/debug/debug.php b/plugins/system/debug/debug.php index c1fb714174f54..327fd25a262c2 100644 --- a/plugins/system/debug/debug.php +++ b/plugins/system/debug/debug.php @@ -201,7 +201,7 @@ public function onAfterDispatch() // Use our own jQuery and fontawesome instead of the debug bar shipped version $assetManager = $this->app->getDocument()->getWebAssetManager(); $assetManager->enableAsset('jquery-noconflict'); - $assetManager->enableAsset('fontawesome'); + $assetManager->enableAsset('fontawesome-free'); HTMLHelper::_('stylesheet', 'plg_system_debug/debug.css', array('version' => 'auto', 'relative' => true)); HTMLHelper::_('script', 'plg_system_debug/debug.min.js', array('version' => 'auto', 'relative' => true)); diff --git a/templates/cassiopeia/scss/template.scss b/templates/cassiopeia/scss/template.scss index c39f8f0c3e6bc..4ea160bfe757d 100644 --- a/templates/cassiopeia/scss/template.scss +++ b/templates/cassiopeia/scss/template.scss @@ -12,6 +12,8 @@ // "Font Awesome 5 Free" @import "../../../media/vendor/fontawesome-free/scss/fontawesome"; +@import "../../../media/vendor/fontawesome-free/scss/solid"; + // B/C for Icomoon @import "../../../build/media_source/system/scss/icomoon"; From 4e158934c7c5d91aec5bb953db371a61a3d881de Mon Sep 17 00:00:00 2001 From: Quy Date: Sat, 20 Apr 2019 22:44:02 +0100 Subject: [PATCH 4/5] Update administrator/components/com_media/resources/scripts/components/tree/item.vue Co-Authored-By: brianteeman --- .../com_media/resources/scripts/components/tree/item.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_media/resources/scripts/components/tree/item.vue b/administrator/components/com_media/resources/scripts/components/tree/item.vue index 7799cd18e5012..af608fcd18e6b 100644 --- a/administrator/components/com_media/resources/scripts/components/tree/item.vue +++ b/administrator/components/com_media/resources/scripts/components/tree/item.vue @@ -34,7 +34,7 @@ return { fa: true, 'fa-folder': !this.isOpen, - 'fa-folderpen-o': this.isOpen, + 'fa-folder-open': this.isOpen, } } }, From 95729ddcc21a50dc5f346756ab7107d4cbc3fb95 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Sun, 21 Apr 2019 11:02:03 +0100 Subject: [PATCH 5/5] add brands, update markup --- administrator/templates/atum/error_login.php | 2 +- administrator/templates/atum/scss/blocks/_quickicons.scss | 3 ++- administrator/templates/atum/scss/fontawesome.scss | 2 +- installation/tmpl/remove/default.php | 2 +- plugins/quickicon/joomlaupdate/joomlaupdate.php | 2 +- templates/cassiopeia/scss/template.scss | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/administrator/templates/atum/error_login.php b/administrator/templates/atum/error_login.php index 5be4ccf71b7f9..2aff9839c58d6 100644 --- a/administrator/templates/atum/error_login.php +++ b/administrator/templates/atum/error_login.php @@ -112,7 +112,7 @@
    - +
    diff --git a/administrator/templates/atum/scss/blocks/_quickicons.scss b/administrator/templates/atum/scss/blocks/_quickicons.scss index 059884467ceb1..fbd966ea27fdf 100644 --- a/administrator/templates/atum/scss/blocks/_quickicons.scss +++ b/administrator/templates/atum/scss/blocks/_quickicons.scss @@ -42,7 +42,8 @@ line-height: 1.1; } - .fa { + .fa, + .fab { margin: 5px auto 0; font-size: 2.5rem; } diff --git a/administrator/templates/atum/scss/fontawesome.scss b/administrator/templates/atum/scss/fontawesome.scss index 82425d973fd9f..3819fe847538e 100644 --- a/administrator/templates/atum/scss/fontawesome.scss +++ b/administrator/templates/atum/scss/fontawesome.scss @@ -3,8 +3,8 @@ // Font Awesome 5 Free @import "../../../../media/vendor/fontawesome-free/scss/fontawesome"; - @import "../../../../media/vendor/fontawesome-free/scss/solid"; +@import "../../../../media/vendor/fontawesome-free/scss/brands"; // B/C for Icomoon @import "../../../../build/media_source/system/scss/icomoon"; diff --git a/installation/tmpl/remove/default.php b/installation/tmpl/remove/default.php index a7bcfcdbbfdcf..5c557cba75d78 100644 --- a/installation/tmpl/remove/default.php +++ b/installation/tmpl/remove/default.php @@ -210,7 +210,7 @@ class="btn btn-primary"
    - +

    diff --git a/plugins/quickicon/joomlaupdate/joomlaupdate.php b/plugins/quickicon/joomlaupdate/joomlaupdate.php index cf1529daa87b5..929b301c91b2a 100644 --- a/plugins/quickicon/joomlaupdate/joomlaupdate.php +++ b/plugins/quickicon/joomlaupdate/joomlaupdate.php @@ -105,7 +105,7 @@ public function getCoreUpdateNotification(QuickIconsEvent $event) $result[] = [ [ 'link' => 'index.php?option=com_joomlaupdate', - 'image' => 'fa fa-joomla', + 'image' => 'fab fa-joomla', 'icon' => '', 'text' => Text::_('PLG_QUICKICON_JOOMLAUPDATE_CHECKING'), 'id' => 'plg_quickicon_joomlaupdate', diff --git a/templates/cassiopeia/scss/template.scss b/templates/cassiopeia/scss/template.scss index 4ea160bfe757d..bba6a0b5d8cae 100644 --- a/templates/cassiopeia/scss/template.scss +++ b/templates/cassiopeia/scss/template.scss @@ -11,8 +11,8 @@ // "Font Awesome 5 Free" @import "../../../media/vendor/fontawesome-free/scss/fontawesome"; - @import "../../../media/vendor/fontawesome-free/scss/solid"; +@import "../../../media/vendor/fontawesome-free/scss/brands"; // B/C for Icomoon @import "../../../build/media_source/system/scss/icomoon";