Skip to content

[4.0] Align content info block icons #30543

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

Merged
Quy merged 8 commits into from
Sep 6, 2020
Merged

[4.0] Align content info block icons #30543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f24b34e
convert if (icon) to switch (icon)
N6REJ Aug 26, 2020
4ce43ad
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into 4…
N6REJ Aug 27, 2020
a674c3a
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into 4…
N6REJ Aug 31, 2020
afa1b0e
revert to using mapped fix.
N6REJ Aug 31, 2020
3244c82
multi-reverts
N6REJ Aug 31, 2020
50e438e
Merge remote-tracking branch 'Joomla/4.0-dev' into 4.0-dev
N6REJ Sep 2, 2020
dda6611
make icons even width
N6REJ Sep 2, 2020
8decde9
reverted improper change.
N6REJ Sep 2, 2020
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
2 changes: 1 addition & 1 deletion layouts/joomla/content/icons.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<div class="btn-group float-right">
<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton-<?php echo $articleId; ?>" aria-label="<?php echo Text::_('JUSER_TOOLS'); ?>"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="fas fa-cog" aria-hidden="true"></span>
<span class="fas fa-cog fa-fw" aria-hidden="true"></span>
</button>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton-<?php echo $articleId; ?>">
<?php echo HTMLHelper::_('icon.edit', $displayData['item'], $displayData['params']); ?>
Expand Down
2 changes: 1 addition & 1 deletion layouts/joomla/content/icons/create.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

?>
<?php if ($params->get('show_icons')) : ?>
<span class="fas fa-plus" aria-hidden="true"></span>
<span class="fas fa-plus fa-fw" aria-hidden="true"></span>
<?php echo Text::_('JNEW'); ?>
<?php else : ?>
<?php echo Text::_('JNEW') . '&#160;'; ?>
Expand Down
2 changes: 1 addition & 1 deletion layouts/joomla/content/icons/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
}

?>
<span class="hasTooltip fas fa-<?php echo $icon; ?>" title="<?php echo HTMLHelper::tooltipText(Text::_('COM_CONTENT_EDIT_ITEM'), $overlib, 0, 0); ?>"></span>
<span class="hasTooltip fas fa-<?php echo $icon; ?> fa-fw" title="<?php echo HTMLHelper::tooltipText(Text::_('COM_CONTENT_EDIT_ITEM'), $overlib, 0, 0); ?>"></span>
<?php echo Text::_('JGLOBAL_EDIT'); ?>
2 changes: 1 addition & 1 deletion layouts/joomla/content/icons/edit_lock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
$tooltip = $displayData['tooltip'];

?>
<span class="hasTooltip fas fa-lock" title="<?php echo HTMLHelper::tooltipText($tooltip . '', 0); ?>"></span>
<span class="hasTooltip fas fa-lock fa-fw" title="<?php echo HTMLHelper::tooltipText($tooltip . '', 0); ?>"></span>
<?php echo Text::_('JLIB_HTML_CHECKED_OUT'); ?>
2 changes: 1 addition & 1 deletion layouts/joomla/content/info_block/associations.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<?php $associations = $displayData['item']->associations; ?>

<dd class="association">
<span class="fas fa-globe" aria-hidden="true"></span>
<span class="fas fa-globe fa-fw" aria-hidden="true"></span>
<?php echo Text::_('JASSOCIATIONS'); ?>
<?php foreach ($associations as $association) : ?>
<?php if ($displayData['item']->params->get('flags', 1) && $association['language']->image) : ?>
Expand Down
2 changes: 1 addition & 1 deletion layouts/joomla/content/info_block/author.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

?>
<dd class="createdby" itemprop="author" itemscope itemtype="https://schema.org/Person">
<span class="fas fa-user" aria-hidden="true"></span>
<span class="fas fa-user fa-fw" aria-hidden="true"></span>
<?php $author = ($displayData['item']->created_by_alias ?: $displayData['item']->author); ?>
<?php $author = '<span itemprop="name">' . $author . '</span>'; ?>
<?php if (!empty($displayData['item']->contact_link ) && $displayData['params']->get('link_author') == true) : ?>
Expand Down
2 changes: 1 addition & 1 deletion layouts/joomla/content/info_block/category.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

?>
<dd class="category-name">
<span class="fas fa-folder-open" aria-hidden="true"></span>
<span class="fas fa-folder-open fa-fw" aria-hidden="true"></span>
<?php $title = $this->escape($displayData['item']->category_title); ?>
<?php if ($displayData['params']->get('link_category') && !empty($displayData['item']->catid)) : ?>
<?php $url = '<a href="' . Route::_(
Expand Down
2 changes: 1 addition & 1 deletion layouts/joomla/content/info_block/create_date.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

?>
<dd class="create">
<span class="fas fa-calendar" aria-hidden="true"></span>
<span class="fas fa-calendar fa-fw" aria-hidden="true"></span>
<time datetime="<?php echo HTMLHelper::_('date', $displayData['item']->created, 'c'); ?>" itemprop="dateCreated">
<?php echo Text::sprintf('COM_CONTENT_CREATED_DATE_ON', HTMLHelper::_('date', $displayData['item']->created, Text::_('DATE_FORMAT_LC3'))); ?>
</time>
Expand Down
2 changes: 1 addition & 1 deletion layouts/joomla/content/info_block/hits.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

?>
<dd class="hits">
<span class="fas fa-eye" aria-hidden="true"></span>
<span class="fas fa-eye fa-fw" aria-hidden="true"></span>
<meta itemprop="interactionCount" content="UserPageVisits:<?php echo $displayData['item']->hits; ?>">
<?php echo Text::sprintf('COM_CONTENT_ARTICLE_HITS', $displayData['item']->hits); ?>
</dd>
2 changes: 1 addition & 1 deletion layouts/joomla/content/info_block/modify_date.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

?>
<dd class="modified">
<span class="fas fa-calendar" aria-hidden="true"></span>
<span class="fas fa-calendar fa-fw" aria-hidden="true"></span>
<time datetime="<?php echo HTMLHelper::_('date', $displayData['item']->modified, 'c'); ?>" itemprop="dateModified">
<?php echo Text::sprintf('COM_CONTENT_LAST_UPDATED', HTMLHelper::_('date', $displayData['item']->modified, Text::_('DATE_FORMAT_LC3'))); ?>
</time>
Expand Down
2 changes: 1 addition & 1 deletion layouts/joomla/content/info_block/publish_date.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

?>
<dd class="published">
<span class="fas fa-calendar" aria-hidden="true"></span>
<span class="fas fa-calendar fa-fw" aria-hidden="true"></span>
<time datetime="<?php echo HTMLHelper::_('date', $displayData['item']->publish_up, 'c'); ?>" itemprop="datePublished">
<?php echo Text::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', HTMLHelper::_('date', $displayData['item']->publish_up, Text::_('DATE_FORMAT_LC3'))); ?>
</time>
Expand Down