Skip to content

GitLab

Commit a5aff368 authored by Benjamin Kott's avatar Benjamin Kott Committed by Benni Mack
Browse files

[TASK] Update @typo3/icons to v2.4.1 

Executed commands:

  cd Build
  yarn add "@typo3/icons@^2.4.1"
  grunt build

Resolves: #95210
Releases: master
Change-Id: Ia4bc675cd8dafa9ce76c837e329ea76cea90588c
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/71228

Tested-by: core-ci's avatarcore-ci <typo3@b13.com>
Tested-by: Andreas Fernandez's avatarAndreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: Benni Mack's avatarBenni Mack <benni@typo3.org>
Reviewed-by: Andreas Fernandez's avatarAndreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Benni Mack's avatarBenni Mack <benni@typo3.org>
parent 9c9c4f3b
Expand all Hide whitespace changes
Inline Side-by-side
Build/package.json
View file @ a5aff368
......@@ -82,7 +82,7 @@
"@claviska/jquery-minicolors": "^2.3.5",
"@lit/reactive-element": "^1.0.0",
"@popperjs/core": "^2.9.1",
"@typo3/icons": "^2.3.0",
"@typo3/icons": "^2.4.1",
"autosize": "^4.0.2",
"bootstrap": "^5.1.0",
"broadcastchannel-polyfill": "^1.0.0",
......
Build/yarn.lock
View file @ a5aff368
......@@ -878,10 +878,10 @@
"@typescript-eslint/types" "4.2.0"
eslint-visitor-keys "^2.0.0"
"@typo3/icons@^2.3.0":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@typo3/icons/-/icons-2.3.0.tgz#cd1ce9b4810d5aba106481054695ba2bf239e3a7"
integrity sha512-3OQEX+U3PKBZhTCDRi9DvSflHzSnyB2eqp1TqqIIQPyXF4/21+pZ1gOEriBwpED8FDKtsbss2B8kH+HjCdTdRg==
"@typo3/icons@^2.4.1":
version "2.4.1"
resolved "https://registry.yarnpkg.com/@typo3/icons/-/icons-2.4.1.tgz#2cfbd4206cf481acc23c393857af0343c8393004"
integrity sha512-zCN2pq9B9TdRUpqchuhTQrI1mCBd8SodYdKEN/43AiwD17CaWdQ4M03vHYLA+7WehMorVdRtnmreToehR6hR+Q==
dependencies:
npm "^7.12.1"
......
typo3/sysext/backend/Classes/Template/Components/Buttons/Action/ShortcutButton.php
View file @ a5aff368
......@@ -403,7 +403,7 @@ class ShortcutButton implements ButtonInterface, PositionInterface
return '
<button type="button" class="btn btn-default btn-sm" id="dropdownShortcutMenu" data-bs-toggle="dropdown" aria-expanded="false" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.share')) . '">' .
$iconFactory->getIcon('share-alt', Icon::SIZE_SMALL)->render() .
$iconFactory->getIcon('actions-share-alt', Icon::SIZE_SMALL)->render() .
'</button>' .
'<ul class="dropdown-menu" aria-labelledby="dropdownShortcutMenu">' .
implode(LF, $menuItems) .
......
typo3/sysext/backend/Tests/Functional/Template/Fixtures/RecordListCopyToClipboard.html
View file @ a5aff368
......@@ -4,12 +4,10 @@
data-bs-toggle="dropdown"
aria-expanded="false"
title="Share">
<span class="t3js-icon icon icon-size-small icon-state-default icon-share-alt" data-identifier="share-alt">
<span class="icon-markup">
<span class="icon-unify">
<i class="fa fa-share-alt"></i>
</span>
</span>
<span class="t3js-icon icon icon-size-small icon-state-default icon-actions-share-alt" data-identifier="actions-share-alt">
<span class="icon-markup">
<svg class="icon-color"><use xlink:href="typo3/sysext/core/Resources/Public/Icons/T3Icons/sprites/actions.svg#actions-share-alt" /></svg>
</span>
</span>
</button>
<ul class="dropdown-menu" aria-labelledby="dropdownShortcutMenu">
......
typo3/sysext/backend/Tests/Functional/Template/Fixtures/RecordListSingleTableCopyToClipboard.html
View file @ a5aff368
......@@ -4,12 +4,10 @@
data-bs-toggle="dropdown"
aria-expanded="false"
title="Share">
<span class="t3js-icon icon icon-size-small icon-state-default icon-share-alt" data-identifier="share-alt">
<span class="icon-markup">
<span class="icon-unify">
<i class="fa fa-share-alt"></i>
</span>
</span>
<span class="t3js-icon icon icon-size-small icon-state-default icon-actions-share-alt" data-identifier="actions-share-alt">
<span class="icon-markup">
<svg class="icon-color"><use xlink:href="typo3/sysext/core/Resources/Public/Icons/T3Icons/sprites/actions.svg#actions-share-alt" /></svg>
</span>
</span>
</button>
<ul class="dropdown-menu" aria-labelledby="dropdownShortcutMenu">
......
typo3/sysext/backend/Tests/Functional/Template/Fixtures/SpecialRouteIdentifierWithArgumentsCopyToClipboard.html
View file @ a5aff368
......@@ -4,12 +4,10 @@
data-bs-toggle="dropdown"
aria-expanded="false"
title="Share">
<span class="t3js-icon icon icon-size-small icon-state-default icon-share-alt" data-identifier="share-alt">
<span class="icon-markup">
<span class="icon-unify">
<i class="fa fa-share-alt"></i>
</span>
</span>
<span class="t3js-icon icon icon-size-small icon-state-default icon-actions-share-alt" data-identifier="actions-share-alt">
<span class="icon-markup">
<svg class="icon-color"><use xlink:href="typo3/sysext/core/Resources/Public/Icons/T3Icons/sprites/actions.svg#actions-share-alt" /></svg>
</span>
</span>
</button>
<ul class="dropdown-menu" aria-labelledby="dropdownShortcutMenu">
......
typo3/sysext/core/Classes/Imaging/IconRegistry.php
View file @ a5aff368
......@@ -20,7 +20,6 @@ use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Exception;
use TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider;
use TYPO3\CMS\Core\Imaging\IconProvider\FontawesomeIconProvider;
use TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider;
use TYPO3\CMS\Core\Imaging\IconProvider\SvgSpriteIconProvider;
use TYPO3\CMS\Core\Information\Typo3Version;
......@@ -94,204 +93,6 @@ class IconRegistry implements SingletonInterface
* Icons are maintained in an external repository, if new icons are needed
* please request them at: https://github.com/typo3/typo3.icons/issues
*/
// Apps
'apps-pagetree-category-toggle-hide-checked' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'check-square',
],
],
// Status
'status-dialog-information' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'exclamation-circle',
],
],
'status-dialog-ok' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'check-circle',
],
],
'status-dialog-notification' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'exclamation-circle',
],
],
'status-dialog-warning' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'exclamation-triangle',
],
],
'status-dialog-error' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'exclamation-circle',
],
],
'status-status-checked' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'check',
],
],
'status-status-current' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'caret-right',
],
],
'status-status-sorting-asc' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'caret-up',
],
],
'status-status-sorting-desc' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'caret-down',
],
],
'status-status-sorting-light-asc' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'caret-up',
],
],
'status-status-sorting-light-desc' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'caret-down',
],
],
'status-status-permission-granted' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'check',
],
],
'status-status-permission-denied' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'times',
],
],
// Empty
'empty-empty' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'empty-empty',
],
],
// System Information
'information-php-version' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'code',
],
],
'information-debugger' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'bug',
],
],
'information-database' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'database',
],
],
'information-application-context' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'tasks',
],
],
'information-composer-mode' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'music',
],
],
'information-git' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'git',
],
],
'information-webserver' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'server',
],
],
'information-os-linux' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'linux',
],
],
'information-os-apple' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'apple',
],
],
'information-os-windows' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'windows',
],
],
// Sysnote
'sysnote-type-0' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'sticky-note-o',
],
],
'sysnote-type-1' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'cog',
],
],
'sysnote-type-2' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'code',
],
],
'sysnote-type-3' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'thumb-tack',
],
],
'sysnote-type-4' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'check-square',
],
],
// Share
'share-alt' => [
'provider' => FontawesomeIconProvider::class,
'options' => [
'name' => 'share-alt',
],
],
];
/**
......
typo3/sysext/core/Resources/Public/Icons/T3Icons/icons.json
View file @ a5aff368
......@@ -156,6 +156,12 @@
"svg": "svgs/actions/actions-bolt.svg",
"sprite": "sprites/actions.svg#actions-bolt"
},
"actions-brand-apple": {
"identifier": "actions-brand-apple",
"category": "actions",
"svg": "svgs/actions/actions-brand-apple.svg",
"sprite": "sprites/actions.svg#actions-brand-apple"
},
"actions-brand-discord": {
"identifier": "actions-brand-discord",
"category": "actions",
......@@ -168,12 +174,30 @@
"svg": "svgs/actions/actions-brand-facebook.svg",
"sprite": "sprites/actions.svg#actions-brand-facebook"
},
"actions-brand-git": {
"identifier": "actions-brand-git",
"category": "actions",
"svg": "svgs/actions/actions-brand-git.svg",
"sprite": "sprites/actions.svg#actions-brand-git"
},
"actions-brand-linkedin": {
"identifier": "actions-brand-linkedin",
"category": "actions",
"svg": "svgs/actions/actions-brand-linkedin.svg",
"sprite": "sprites/actions.svg#actions-brand-linkedin"
},
"actions-brand-linux": {
"identifier": "actions-brand-linux",
"category": "actions",
"svg": "svgs/actions/actions-brand-linux.svg",
"sprite": "sprites/actions.svg#actions-brand-linux"
},
"actions-brand-php": {
"identifier": "actions-brand-php",
"category": "actions",
"svg": "svgs/actions/actions-brand-php.svg",
"sprite": "sprites/actions.svg#actions-brand-php"
},
"actions-brand-slack": {
"identifier": "actions-brand-slack",
"category": "actions",
......@@ -192,6 +216,18 @@
"svg": "svgs/actions/actions-brand-typo3.svg",
"sprite": "sprites/actions.svg#actions-brand-typo3"
},
"actions-brand-windows": {
"identifier": "actions-brand-windows",
"category": "actions",
"svg": "svgs/actions/actions-brand-windows.svg",
"sprite": "sprites/actions.svg#actions-brand-windows"
},
"actions-brand-xing": {
"identifier": "actions-brand-xing",
"category": "actions",
"svg": "svgs/actions/actions-brand-xing.svg",
"sprite": "sprites/actions.svg#actions-brand-xing"
},
"actions-brand-youtube": {
"identifier": "actions-brand-youtube",
"category": "actions",
......@@ -468,6 +504,18 @@
"svg": "svgs/actions/actions-cloud.svg",
"sprite": "sprites/actions.svg#actions-cloud"
},
"actions-code-commit": {
"identifier": "actions-code-commit",
"category": "actions",
"svg": "svgs/actions/actions-code-commit.svg",
"sprite": "sprites/actions.svg#actions-code-commit"
},
"actions-code-compare": {
"identifier": "actions-code-compare",
"category": "actions",
"svg": "svgs/actions/actions-code-compare.svg",
"sprite": "sprites/actions.svg#actions-code-compare"
},
"actions-code-fork": {
"identifier": "actions-code-fork",
"category": "actions",
......@@ -486,6 +534,24 @@
"svg": "svgs/actions/actions-code-merge.svg",
"sprite": "sprites/actions.svg#actions-code-merge"
},
"actions-code-pull-request-close": {
"identifier": "actions-code-pull-request-close",
"category": "actions",
"svg": "svgs/actions/actions-code-pull-request-close.svg",
"sprite": "sprites/actions.svg#actions-code-pull-request-close"
},
"actions-code-pull-request-draft": {
"identifier": "actions-code-pull-request-draft",
"category": "actions",
"svg": "svgs/actions/actions-code-pull-request-draft.svg",
"sprite": "sprites/actions.svg#actions-code-pull-request-draft"
},
"actions-code-pull-request": {
"identifier": "actions-code-pull-request",
"category": "actions",
"svg": "svgs/actions/actions-code-pull-request.svg",
"sprite": "sprites/actions.svg#actions-code-pull-request"
},
"actions-code": {
"identifier": "actions-code",
"category": "actions",
......@@ -522,6 +588,12 @@
"svg": "svgs/actions/actions-cookie.svg",
"sprite": "sprites/actions.svg#actions-cookie"
},
"actions-cpu": {
"identifier": "actions-cpu",
"category": "actions",
"svg": "svgs/actions/actions-cpu.svg",
"sprite": "sprites/actions.svg#actions-cpu"
},
"actions-credit-card": {
"identifier": "actions-credit-card",
"category": "actions",
......@@ -1164,6 +1236,12 @@
"svg": "svgs/actions/actions-message-add.svg",
"sprite": "sprites/actions.svg#actions-message-add"
},
"actions-message-dots": {
"identifier": "actions-message-dots",
"category": "actions",
"svg": "svgs/actions/actions-message-dots.svg",
"sprite": "sprites/actions.svg#actions-message-dots"
},
"actions-message-localize": {
"identifier": "actions-message-localize",
"category": "actions",
......@@ -1182,6 +1260,12 @@
"svg": "svgs/actions/actions-message.svg",
"sprite": "sprites/actions.svg#actions-message"
},
"actions-microchip": {
"identifier": "actions-microchip",
"category": "actions",
"svg": "svgs/actions/actions-microchip.svg",
"sprite": "sprites/actions.svg#actions-microchip"
},
"actions-move": {
"identifier": "actions-move",
"category": "actions",
......@@ -1206,6 +1290,12 @@
"svg": "svgs/actions/actions-newspaper.svg",
"sprite": "sprites/actions.svg#actions-newspaper"
},
"actions-note": {
"identifier": "actions-note",
"category": "actions",
"svg": "svgs/actions/actions-note.svg",
"sprite": "sprites/actions.svg#actions-note"
},
"actions-notebook-typoscript": {
"identifier": "actions-notebook-typoscript",
"category": "actions",
......@@ -1230,6 +1320,12 @@
"svg": "svgs/actions/actions-options.svg",
"sprite": "sprites/actions.svg#actions-options"
},
"actions-package": {
"identifier": "actions-package",
"category": "actions",
"svg": "svgs/actions/actions-package.svg",
"sprite": "sprites/actions.svg#actions-package"
},
"actions-pagetree-mount": {
"identifier": "actions-pagetree-mount",
"category": "actions",
......@@ -1434,6 +1530,18 @@
"svg": "svgs/actions/actions-server.svg",
"sprite": "sprites/actions.svg#actions-server"
},
"actions-share-alt": {
"identifier": "actions-share-alt",
"category": "actions",
"svg": "svgs/actions/actions-share-alt.svg",
"sprite": "sprites/actions.svg#actions-share-alt"
},
"actions-share": {
"identifier": "actions-share",
"category": "actions",
"svg": "svgs/actions/actions-share.svg",
"sprite": "sprites/actions.svg#actions-share"
},
"actions-shield-star": {
"identifier": "actions-shield-star",
"category": "actions",
......@@ -1524,6 +1632,12 @@
"svg": "svgs/actions/actions-terminal.svg",
"sprite": "sprites/actions.svg#actions-terminal"
},
"actions-thumbtack": {
"identifier": "actions-thumbtack",
"category": "actions",
"svg": "svgs/actions/actions-thumbtack.svg",
"sprite": "sprites/actions.svg#actions-thumbtack"
},
"actions-ticket": {
"identifier": "actions-ticket",
"category": "actions",
......@@ -1656,6 +1770,12 @@
"svg": "svgs/actions/actions-wallet.svg",
"sprite": "sprites/actions.svg#actions-wallet"
},
"actions-window-cog": {
"identifier": "actions-window-cog",
"category": "actions",
"svg": "svgs/actions/actions-window-cog.svg",
"sprite": "sprites/actions.svg#actions-window-cog"
},
"actions-window-open": {
"identifier": "actions-window-open",
"category": "actions",
......@@ -2280,6 +2400,12 @@
"svg": "svgs/content/content-briefcase.svg",
"sprite": "sprites/content.svg#content-briefcase"
},
"content-building": {
"identifier": "content-building",
"category": "content",
"svg": "svgs/content/content-building.svg",
"sprite": "sprites/content.svg#content-building"
},
"content-bullets": {
"identifier": "content-bullets",
"category": "content",
......@@ -2382,6 +2508,12 @@
"svg": "svgs/content/content-container-columns-4.svg",
"sprite": "sprites/content.svg#content-container-columns-4"
},
"content-cpu": {
"identifier": "content-cpu",
"category": "content",
"svg": "svgs/content/content-cpu.svg",
"sprite": "sprites/content.svg#content-cpu"
},
"content-csv": {
"identifier": "content-csv",
"category": "content",
......@@ -2400,6 +2532,24 @@
"svg": "svgs/content/content-dashboard.svg",
"sprite": "sprites/content.svg#content-dashboard"
},
"content-device-desktop": {
"identifier": "content-device-desktop",
"category": "content",
"svg": "svgs/content/content-device-desktop.svg",
"sprite": "sprites/content.svg#content-device-desktop"
},
"content-device-mobile": {
"identifier": "content-device-mobile",
"category": "content",
"svg": "svgs/content/content-device-mobile.svg",
"sprite": "sprites/content.svg#content-device-mobile"
},
"content-device-tablet": {
"identifier": "content-device-tablet",
"category": "content",
"svg": "svgs/content/content-device-tablet.svg",
"sprite": "sprites/content.svg#content-device-tablet"
},
"content-elements-login": {
"identifier": "content-elements-login",
"category": "content",
......@@ -2418,6 +2568,12 @@
"svg": "svgs/content/content-elements-searchform.svg",
"sprite": "sprites/content.svg#content-elements-searchform"
},
"content-extension": {
"identifier": "content-extension",
"category": "content",
"svg": "svgs/content/content-extension.svg",
"sprite": "sprites/content.svg#content-extension"
},
"content-form": {
"identifier": "content-form",
"category": "content",
......@@ -2550,12 +2706,48 @@
"svg": "svgs/content/content-menu-thumbnail.svg",
"sprite": "sprites/content.svg#content-menu-thumbnail"
},
"content-message-dots": {
"identifier": "content-message-dots",
"category": "content",
"svg": "svgs/content/content-message-dots.svg",
"sprite": "sprites/content.svg#content-message-dots"
},
"content-message": {
"identifier": "content-message",
"category": "content",
"svg": "svgs/content/content-message.svg",
"sprite": "sprites/content.svg#content-message"
},
"content-messages": {