From 07cf906cb581c369406475e7b3c3366c56814fbb Mon Sep 17 00:00:00 2001 From: Benjamin Kott <benjamin.kott@outlook.com> Date: Sat, 12 Sep 2015 15:39:39 +0200 Subject: [PATCH] [TASK] Replace icon with SVG: overlay-read-only Resolves: #69733 Releases: master Change-Id: Ibca023c68f548d55a04bbebc4c4fcc7f7108cf7e Reviewed-on: http://review.typo3.org/43242 Reviewed-by: Michael Oehlhof <typo3@oehlhof.de> Tested-by: Michael Oehlhof <typo3@oehlhof.de> Reviewed-by: Jan Helke <typo3@helke.de> Tested-by: Jan Helke <typo3@helke.de> Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch> Tested-by: Christian Kuhn <lolli@schwarzbu.ch> --- Build/Gruntfile.js | 6 ++++++ .../Private/Icons/Overlay/overlay-read-only.svg | 12 ++++++++++++ Build/Resources/Public/Less/Component/icon.less | 1 - .../Public/Icons/Overlay/overlay-read-only.svg | 1 + typo3/sysext/core/Classes/Imaging/IconRegistry.php | 6 +++--- typo3/sysext/t3skin/Resources/Public/Css/backend.css | 1 - 6 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 Build/Resources/Private/Icons/Overlay/overlay-read-only.svg create mode 100644 typo3/sysext/backend/Resources/Public/Icons/Overlay/overlay-read-only.svg diff --git a/Build/Gruntfile.js b/Build/Gruntfile.js index 4500779cc23e..e3c8db960659 100644 --- a/Build/Gruntfile.js +++ b/Build/Gruntfile.js @@ -205,6 +205,12 @@ module.exports = function(grunt) { '<%= paths.sysext %>backend/Resources/Public/Icons/Spinner/spinner-circle-dark.svg': '<%= paths.icons %>Spinner/spinner-circle-dark.svg', '<%= paths.sysext %>backend/Resources/Public/Icons/Spinner/spinner-circle-light.svg': '<%= paths.icons %>Spinner/spinner-circle-light.svg' } + }, + // Overlay Icons + icons_overlay: { + files: { + '<%= paths.backend %>Public/Icons/Overlay/overlay-read-only.svg': '<%= paths.icons %>Overlay/overlay-read-only.svg' + } } } }); diff --git a/Build/Resources/Private/Icons/Overlay/overlay-read-only.svg b/Build/Resources/Private/Icons/Overlay/overlay-read-only.svg new file mode 100644 index 000000000000..d4245a1e0f36 --- /dev/null +++ b/Build/Resources/Private/Icons/Overlay/overlay-read-only.svg @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve"> +<g id="overlay-read-only"> + <circle display="inline" fill="#C83C3C" cx="8" cy="8" r="7"/> + <path display="inline" fill="#FFFFFF" d="M11.54,5.88l-5.66,5.66c-0.2,0.2-0.51,0.2-0.71,0l-0.71-0.71c-0.2-0.2-0.2-0.51,0-0.71 + l5.66-5.66c0.2-0.2,0.51-0.2,0.71,0l0.71,0.71C11.73,5.37,11.73,5.68,11.54,5.88z"/> + <path display="inline" fill="#FFFFFF" d="M10.12,11.54L4.46,5.88c-0.2-0.2-0.2-0.51,0-0.71l0.71-0.71c0.2-0.2,0.51-0.2,0.71,0 + l5.66,5.66c0.2,0.2,0.2,0.51,0,0.71l-0.71,0.71C10.63,11.73,10.32,11.73,10.12,11.54z"/> +</g> +</svg> diff --git a/Build/Resources/Public/Less/Component/icon.less b/Build/Resources/Public/Less/Component/icon.less index bc28872eb123..72806f907dd6 100644 --- a/Build/Resources/Public/Less/Component/icon.less +++ b/Build/Resources/Public/Less/Component/icon.less @@ -133,7 +133,6 @@ .icon-default-not-found, .icon-actions-edit-copy-release, .icon-actions-edit-cut-release, -.icon-overlay-read-only, .icon-status-status-current, .icon-status-dialog-error, .icon-status-status-permission-denied { diff --git a/typo3/sysext/backend/Resources/Public/Icons/Overlay/overlay-read-only.svg b/typo3/sysext/backend/Resources/Public/Icons/Overlay/overlay-read-only.svg new file mode 100644 index 000000000000..82ef5fecc14e --- /dev/null +++ b/typo3/sysext/backend/Resources/Public/Icons/Overlay/overlay-read-only.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><circle fill="#C83C3C" cx="8" cy="8" r="7"/><path fill="#FFF" d="M11.54 5.88l-5.66 5.66c-.2.2-.51.2-.71 0l-.71-.71c-.2-.2-.2-.51 0-.71l5.66-5.66c.2-.2.51-.2.71 0l.71.71c.19.2.19.51 0 .71z"/><path fill="#FFF" d="M10.12 11.54L4.46 5.88c-.2-.2-.2-.51 0-.71l.71-.71c.2-.2.51-.2.71 0l5.66 5.66c.2.2.2.51 0 .71l-.71.71c-.2.19-.51.19-.71 0z"/></svg> \ No newline at end of file diff --git a/typo3/sysext/core/Classes/Imaging/IconRegistry.php b/typo3/sysext/core/Classes/Imaging/IconRegistry.php index bf9ac0adf1f0..6b286173d55c 100644 --- a/typo3/sysext/core/Classes/Imaging/IconRegistry.php +++ b/typo3/sysext/core/Classes/Imaging/IconRegistry.php @@ -843,11 +843,11 @@ class IconRegistry implements \TYPO3\CMS\Core\SingletonInterface { // Overlays 'overlay-read-only' => array( - 'provider' => FontawesomeIconProvider::class, + 'provider' => SvgIconProvider::class, 'options' => array( - 'name' => 'times-circle', + 'source' => 'EXT:backend/Resources/Public/Icons/Overlay/overlay-read-only.svg', ) - ), + ) ); /** diff --git a/typo3/sysext/t3skin/Resources/Public/Css/backend.css b/typo3/sysext/t3skin/Resources/Public/Css/backend.css index 178130d0d48e..2105725aed0c 100644 --- a/typo3/sysext/t3skin/Resources/Public/Css/backend.css +++ b/typo3/sysext/t3skin/Resources/Public/Css/backend.css @@ -7855,7 +7855,6 @@ button.close { .icon-default-not-found, .icon-actions-edit-copy-release, .icon-actions-edit-cut-release, -.icon-overlay-read-only, .icon-status-status-current, .icon-status-dialog-error, .icon-status-status-permission-denied { -- GitLab