Skip to content

Commit

Permalink
[4.0] rename Joomla core classNames fas fa- back to icon- (and still …
Browse files Browse the repository at this point in the history
…use Font Awesome) (#30707)

* ♻️ replace fas fa- by icon- and change scss variable fa-css-prefix from fa to icon

* replace fa- by icon-

* replace icon by #{$fa-css-prefix}

* move font-family from pseudo to element itself

* obsolete due to the iconPrefix

* remove case when equal to icon

* apply JLayout joomla.icon.iconclass for icon in Toolbar

* sanitize icon-icon- to icon-

* replace fas fa into icon in sql file

* replace fas fa into icon in vue files

* replace fas fa into icon in js files

* codestyle

* replace fa icon-search by icon-search

* replace fa- into icon-

* add missing prefix

* change order of namespace

* solution for fab = iconb-

* fix spacing next to icon when class does not start with icon-

* replace fas fa- by icon- after merge with most recent 4.0 changes

* prevent > 4 indents

* change order scss

* use double quotes in scss

* Update administrator/templates/atum/scss/blocks/_quickicons.scss

Co-authored-by: Richard Fath <[email protected]>

* Update build/media_source/system/scss/_icomoon.scss

Co-authored-by: Richard Fath <[email protected]>

* fix icons in installation

* replace fa- by icon-

* add styling for installation icons

* add pseudo element to icon eye

* replace fa- by icon-

* remove now obsolete strreplace

* extend to work with 'fas fa-' icons too. Introduction of $jicon-css-prefix next to $fa-css-prefix

* swap line 11 & 12 from the iconclass JLayout

* fixing Joomla logo icon

* add missing language icon

* revert earlier change. Add font awesome declaration in installation scss

* add missing trophy icon

Adds missing trophy icon

* combine icons from atum/scss/blocks/icons to build/media_source/system/scss/icomoon

and changed icons to onliners | sorted |uniq

* add missing Trophy icon

* add missing space

* fixes missing icons issue due to compiler quirk.

* Revert "fixes missing icons issue due to compiler quirk."

This reverts commit 53828dd

* fixes missing icons issue due to compiler quirk."

* duplicate code

* more missing icons

* lots more missing icons

* bs functions called in root template.scss no need for duplicate

* removing duplicated definitions from iconclass.php

* removed unsupplied regular fontset

* Revert "removed unsupplied regular fontset"

This reverts commit b2f3874

* declare prefix's globally

* declare prefix's as default

* put :before back

* moving from iconclass.php to _icomoon.scss

* changed to icon-info-circle to match rest of icon-info usages

* all moved from iconclass.php except for unknowns

* put lost icons back.

* @Quy fix

* removing obsolete classNames

* add missing icons

* added missing icons mentioned by @Quy in #30707 (comment)

* Update administrator/modules/mod_menu/tmpl/default_submenu.php

Co-authored-by: Quy <[email protected]>

* added icons and sorted icons

* remove duplicate line

* beginning of mixin conversion

* oops, extra blank line

* u's

* t

* r-s

* wrong icons

* q

* Update build/media_source/system/scss/_icomoon.scss

Co-authored-by: Quy <[email protected]>

* Update build/media_source/system/scss/_icomoon.scss

Co-authored-by: Quy <[email protected]>

* Update build/media_source/system/scss/_icomoon.scss

Co-authored-by: Quy <[email protected]>

* Update build/media_source/system/scss/_icomoon.scss

Co-authored-by: Quy <[email protected]>

* Update build/media_source/system/scss/_icomoon.scss

Co-authored-by: Quy <[email protected]>

* add missing icons

* apply DRY and convert a lot of duplicate code to simple foreach loop in scss

* pre-backup

* p's

* m-o

* l

* g-k

* reformat per drone

* reformat per drone

* change the each loop

* rewrite to use array(s)

* include icon-fw

* definition cleanup

* missing icons

* added imports to fix extends

* added missing spin function

* added special icons mapping

* better looking calendars

* fixes fa-spin(s)

* spinner => spin

* rewrite title of icomoon

* extend .list special types

* 🎨 code style fixes

* removal map-merge

* revert icon- to fas fa-

* revert icon- to fas fa-

* add icon text-width

* add icon-fax

added Icon-fax per request

* Update _icomoon.scss add spacinf

* remove duplicate declaration of icons

[class^="icon-"] and [class*=" icon-"] are taking care of it

* remove duplicate semi column

* remove joomla from icon list. Already declared in branded icon

* already set in icomoon

* removal obsolete icon

* Update administrator/templates/atum/scss/vendor/fontawesome-free/fontawesome.scss

Co-authored-by: Quy <[email protected]>

* reapply icon

* Update build/media_source/system/scss/_icomoon.scss

Co-authored-by: Quy <[email protected]>

* fas fa- => icon-

* far eqv iconr

* Update build/media_source/system/scss/_icomoon.scss

Co-authored-by: Quy <[email protected]>

* add icons

icon-align-justify
icon-clipboard
icon-caret-down
icon-caret-up

* reapply icons

* reapply icons after solving merge conflicts

* replace fas fa- => icon-

* repalce fas fa- by icon-

* remove non-used style declaration

* change fas fa- into icon-

* reapply icons

* remove font-size, fixing size of icon in header

* fix loading icon-joomla

* change order loading font

Co-authored-by: Richard Fath <[email protected]>
Co-authored-by: Bear <[email protected]>
Co-authored-by: Quy <[email protected]>
  • Loading branch information
4 people authored Oct 28, 2020
1 parent d1d0091 commit 282fd17
Show file tree
Hide file tree
Showing 292 changed files with 1,394 additions and 1,955 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ protected function getInput()
);

return '<div class="alert alert-info">'
. '<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only">'
. '<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only">'
. Text::_('INFO')
. '</span>'
. Text::sprintf('PLG_SYSTEM_ACTIONLOGS_JOOMLA_ACTIONLOG_DISABLED_REDIRECT', $link)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public function display($tpl = null)
*/
protected function addToolbar()
{
ToolbarHelper::title(Text::_('COM_ACTIONLOGS_MANAGER_USERLOGS'), 'fas fa-list-ul');
ToolbarHelper::title(Text::_('COM_ACTIONLOGS_MANAGER_USERLOGS'), 'icon-list-ul');

ToolbarHelper::custom('actionlogs.exportSelectedLogs', 'download', '', 'COM_ACTIONLOGS_EXPORT_CSV', true);
ToolbarHelper::custom('actionlogs.exportLogs', 'download', '', 'COM_ACTIONLOGS_EXPORT_ALL_CSV', false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
<?php if (empty($this->items)) : ?>
<div class="alert alert-info">
<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<?php else : ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/tmpl/help/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="row mt-sm-3">
<div id="sidebar" class="col-md-3">
<button class="btn btn-sm btn-secondary my-2 options-menu d-md-none" type="button" data-toggle="collapse" data-target=".sidebar-nav" aria-controls="sidebar-nav" aria-expanded="false">
<span class="fas fa-align-justify" aria-hidden="true"></span>
<span class="icon-align-justify" aria-hidden="true"></span>
<?php echo Text::_('JTOGGLE_SIDEBAR_MENU'); ?>
</button>
<div class="sidebar-nav" id="help-index">
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_admin/tmpl/profile/edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ class="form-validate"
<?php echo Text::_('COM_ADMIN_PROFILE_OTEPS'); ?>
</legend>
<div class="alert alert-info">
<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_('COM_ADMIN_PROFILE_OTEPS_DESC'); ?>
</div>
<?php if (empty($this->otpConfig->otep)) : ?>
<div class="alert alert-warning">
<span class="fas fa-exclamation-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
<span class="icon-exclamation-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
<?php echo Text::_('COM_ADMIN_PROFILE_OTEPS_WAIT_DESC'); ?>
</div>
<?php else : ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ protected function getInput()
. ' data-select="' . Text::_('COM_ASSOCIATIONS_SELECT_TARGET') . '"'
. ' data-change="' . Text::_('COM_ASSOCIATIONS_CHANGE_TARGET') . '"'
. ' data-target="#associationSelect' . $this->id . 'Modal">'
. '<span class="fas fa-file" aria-hidden="true"></span> '
. '<span class="icon-file" aria-hidden="true"></span> '
. '<span id="select-change-text"></span>'
. '</button>';

Expand All @@ -80,7 +80,7 @@ protected function getInput()
. ' class="btn btn-secondary' . ($value ? '' : ' hidden') . '"'
. ' onclick="return Joomla.submitbutton(\'undo-association\');"'
. ' id="remove-assoc">'
. '<span class="fas fa-times" aria-hidden="true"></span> ' . Text::_('JCLEAR')
. '<span class="icon-times" aria-hidden="true"></span> ' . Text::_('JCLEAR')
. '</button>';

$html[] = '<input type="hidden" id="' . $this->id . '_id" name="' . $this->name . '" value="' . $value . '">';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -370,13 +370,13 @@ protected function addToolbar(): void

$bar->appendButton(
'Custom', '<joomla-toolbar-button><button onclick="Joomla.submitbutton(\'reference\')" '
. 'class="btn btn-success"><span class="fas fa-save" aria-hidden="true"></span>'
. 'class="btn btn-success"><span class="icon-save" aria-hidden="true"></span>'
. Text::_('COM_ASSOCIATIONS_SAVE_REFERENCE') . '</button></joomla-toolbar-button>', 'reference'
);

$bar->appendButton(
'Custom', '<joomla-toolbar-button><button onclick="Joomla.submitbutton(\'target\')" '
. 'class="btn btn-success"><span class="fas fa-save" aria-hidden="true"></span>'
. 'class="btn btn-success"><span class="icon-save" aria-hidden="true"></span>'
. Text::_('COM_ASSOCIATIONS_SAVE_TARGET') . '</button></joomla-toolbar-button>', 'target'
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
$canManageCheckin = Factory::getUser()->authorise('core.manage', 'com_checkin');

$iconStates = array(
-2 => 'fas fa-trash',
0 => 'fas fa-times',
1 => 'fas fa-check',
2 => 'fas fa-folder',
-2 => 'icon-trash',
0 => 'icon-times',
1 => 'icon-check',
2 => 'icon-folder',
);

Text::script('COM_ASSOCIATIONS_PURGE_CONFIRM_PROMPT', true);
Expand All @@ -43,12 +43,12 @@
<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
<?php if ($this->state->get('itemtype') == '' || $this->state->get('language') == '') : ?>
<div class="alert alert-info">
<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_('COM_ASSOCIATIONS_NOTICE_NO_SELECTORS'); ?>
</div>
<?php elseif (empty($this->items)) : ?>
<div class="alert alert-info">
<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<?php else : ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
$canManageCheckin = Factory::getUser()->authorise('core.manage', 'com_checkin');

$iconStates = array(
-2 => 'fas fa-trash',
0 => 'fas fa-times',
1 => 'fas fa-check',
2 => 'fas fa-folder',
-2 => 'icon-trash',
0 => 'icon-times',
1 => 'icon-check',
2 => 'icon-folder',
);

$this->document->addScriptOptions('associations-modal', ['func' => $function]);
Expand All @@ -51,7 +51,7 @@
<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
<?php if (empty($this->items)) : ?>
<div class="alert alert-info">
<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<?php else : ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ protected function getInput()
return '<div class="input-group"><input class="form-control" type="text" name="' . $this->name . '" id="' . $this->id . '" value="'
. htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" readonly="readonly">'
. '<span class="input-group-append"><button type="button" class="btn btn-secondary" ' . $onclick . '>'
. '<span class="fas fa-sync" aria-hidden="true"></span> ' . Text::_('COM_BANNERS_RESET_CLICKS') . '</button></span></div>';
. '<span class="icon-sync" aria-hidden="true"></span> ' . Text::_('COM_BANNERS_RESET_CLICKS') . '</button></span></div>';
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ protected function getInput()
return '<div class="input-group"><input class="form-control" type="text" name="' . $this->name . '" id="' . $this->id . '" value="'
. htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" readonly="readonly">'
. '<span class="input-group-append"><button type="button" class="btn btn-secondary" ' . $onclick . '>'
. '<span class="fas fa-sync" aria-hidden="true"></span> ' . Text::_('COM_BANNERS_RESET_IMPMADE') . '</button></span></div>';
. '<span class="icon-sync" aria-hidden="true"></span> ' . Text::_('COM_BANNERS_RESET_IMPMADE') . '</button></span></div>';
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ protected function addToolbar(): void
$dropdown = $toolbar->dropdownButton('status-group')
->text('JTOOLBAR_CHANGE_STATUS')
->toggleSplit(false)
->icon('fas fa-ellipsis-h')
->icon('icon-ellipsis-h')
->buttonClass('btn btn-action')
->listCheck(true);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ protected function addToolbar(): void
$dropdown = $toolbar->dropdownButton('status-group')
->text('JTOOLBAR_CHANGE_STATUS')
->toggleSplit(false)
->icon('fas fa-ellipsis-h')
->icon('icon-ellipsis-h')
->buttonClass('btn btn-action')
->listCheck(true);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ protected function addToolbar(): void
$dHtml = $layout->render(
[
'selector' => 'downloadModal',
'icon' => 'fas fa-download',
'icon' => 'icon-download',
'text' => Text::_('JTOOLBAR_EXPORT'),
'doTask' => Route::_('index.php?option=com_banners&view=download&tmpl=component'),
]
Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_banners/tmpl/banners/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
?>
<?php if (empty($this->items)) : ?>
<div class="alert alert-info">
<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<?php else : ?>
Expand All @@ -59,7 +59,7 @@
<?php echo HTMLHelper::_('grid.checkall'); ?>
</td>
<th scope="col" class="w-1 text-center d-none d-md-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'fas fa-sort'); ?>
<?php echo HTMLHelper::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-sort'); ?>
</th>
<th scope="col" class="w-1 text-center">
<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
Expand Down Expand Up @@ -116,7 +116,7 @@
}
?>
<span class="sortable-handler <?php echo $iconClass ?>">
<span class="fas fa-ellipsis-v" aria-hidden="true"></span>
<span class="icon-ellipsis-v" aria-hidden="true"></span>
</span>
<?php if ($canChange && $saveOrder) : ?>
<input type="text" name="order[]" size="5"
Expand Down
10 changes: 5 additions & 5 deletions administrator/components/com_banners/tmpl/clients/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
?>
<?php if (empty($this->items)) : ?>
<div class="alert alert-info">
<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<?php else : ?>
Expand All @@ -69,19 +69,19 @@
<?php echo HTMLHelper::_('searchtools.sort', 'COM_BANNERS_HEADING_CONTACT', 'a.contact', $listDirn, $listOrder); ?>
</th>
<th scope="col" class="w-3 text-center d-none d-md-table-cell">
<span class="fas fa-check" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?>"></span>
<span class="icon-check" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?>"></span>
<span class="sr-only"><?php echo Text::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?></span>
</th>
<th scope="col" class="w-3 text-center d-none d-md-table-cell">
<span class="fas fa-times" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?>"></span>
<span class="icon-times" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?>"></span>
<span class="sr-only"><?php echo Text::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?></span>
</th>
<th scope="col" class="w-3 text-center d-none d-md-table-cell">
<span class="fas fa-folder" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?>"></span>
<span class="icon-folder icon-fw" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?>"></span>
<span class="sr-only"><?php echo Text::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?></span>
</th>
<th scope="col" class="w-3 text-center d-none d-md-table-cell">
<span class="fas fa-trash" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?>"></span>
<span class="icon-trash" aria-hidden="true" title="<?php echo Text::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?>"></span>
<span class="sr-only"><?php echo Text::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?></span>
</th>
<th scope="col" class="w-10 d-none d-md-table-cell">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<?php echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]); ?>
<?php if (empty($this->items)) : ?>
<div class="alert alert-info">
<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<?php else : ?>
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_cache/tmpl/cache/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
<div class="col-md-12">
<div id="j-main-container" class="j-main-container">
<div class="alert alert-info">
<span class="fas fa-info-circle" aria-hidden="true"></span>
<span class="icon-info-circle" aria-hidden="true"></span>
<span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_('COM_CACHE_PURGE_INSTRUCTIONS'); ?>
</div>
<?php echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]); ?>
<?php if (!$this->data) : ?>
<div class="alert alert-info">
<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<span class="icon-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<?php else : ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ protected function getInput()
. ' data-toggle="modal"'
. ' type="button"'
. ' data-target="#ModalSelect' . $modalId . '">'
. '<span class="fas fa-file" aria-hidden="true"></span> ' . Text::_('JSELECT')
. '<span class="icon-file" aria-hidden="true"></span> ' . Text::_('JSELECT')
. '</button>';
}

Expand All @@ -178,7 +178,7 @@ protected function getInput()
. ' data-toggle="modal"'
. ' type="button"'
. ' data-target="#ModalNew' . $modalId . '">'
. '<span class="fas fa-plus" aria-hidden="true"></span> ' . Text::_('JACTION_CREATE')
. '<span class="icon-plus" aria-hidden="true"></span> ' . Text::_('JACTION_CREATE')
. '</button>';
}

Expand All @@ -191,7 +191,7 @@ protected function getInput()
. ' data-toggle="modal"'
. ' type="button"'
. ' data-target="#ModalEdit' . $modalId . '">'
. '<span class="fas fa-pen-square" aria-hidden="true"></span> ' . Text::_('JACTION_EDIT')
. '<span class="icon-pen-square" aria-hidden="true"></span> ' . Text::_('JACTION_EDIT')
. '</button>';
}

Expand All @@ -203,7 +203,7 @@ protected function getInput()
. ' id="' . $this->id . '_clear"'
. ' type="button"'
. ' onclick="window.processModalParent(\'' . $this->id . '\'); return false;">'
. '<span class="fas fa-times" aria-hidden="true"></span> ' . Text::_('JCLEAR')
. '<span class="icon-times" aria-hidden="true"></span> ' . Text::_('JCLEAR')
. '</button>';
}

Expand All @@ -220,7 +220,7 @@ protected function getInput()
. ' id="' . $this->id . '_propagate"'
. ' title="' . Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_TIP') . '"'
. ' onclick="Joomla.propagateAssociation(\'' . $this->id . '\', \'' . $callbackFunctionStem . '\');">'
. '<span class="fas fa-sync" aria-hidden="true"></span> ' . Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON')
. '<span class="icon-sync" aria-hidden="true"></span> ' . Text::_('JGLOBAL_ASSOCIATIONS_PROPAGATE_BUTTON')
. '</button>';
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ protected function addToolbar()
$dropdown = $toolbar->dropdownButton('status-group')
->text('JTOOLBAR_CHANGE_STATUS')
->toggleSplit(false)
->icon('fas fa-ellipsis-h')
->icon('icon-ellipsis-h')
->buttonClass('btn btn-action')
->listCheck(true);

Expand Down
Loading

0 comments on commit 282fd17

Please sign in to comment.