From e0b53b95e82acac84093c376927d077dda2173b9 Mon Sep 17 00:00:00 2001 From: Benni Mack <benni@typo3.org> Date: Fri, 15 Apr 2016 22:40:44 +0200 Subject: [PATCH] [TASK] Move backend-related assets from t3skin to EXT:backend Resolves: #75725 Releases: master Change-Id: Ic0f6ebed789a3c0517f15226c2b8cc9f88c2eb90 Reviewed-on: https://review.typo3.org/47725 Reviewed-by: Christoph Kratz <ckr@rtp.ch> Tested-by: Christoph Kratz <ckr@rtp.ch> Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl> Tested-by: Wouter Wolters <typo3@wouterwolters.nl> --- Build/Gruntfile.js | 9 ++--- .../Public/Less/TYPO3/_element_pagetree.less | 18 ++++----- Build/Resources/Public/Less/_variables.less | 6 +-- Build/Resources/Public/Less/adminpanel.less | 14 +++---- Build/Resources/Public/Less/errorpage.less | 6 +-- .../Resources/Public/Css/backend.css | 38 +++++++++--------- .../Fonts/FontAwesome/fontawesome-webfont.eot | Bin .../Fonts/FontAwesome/fontawesome-webfont.svg | 0 .../Fonts/FontAwesome/fontawesome-webfont.ttf | Bin .../FontAwesome/fontawesome-webfont.woff | Bin .../FontAwesome/fontawesome-webfont.woff2 | Bin .../Public/Fonts/Share/generator_config.txt | 0 .../Public/Fonts/Share/share-bold-webfont.eot | Bin .../Public/Fonts/Share/share-bold-webfont.svg | 0 .../Public/Fonts/Share/share-bold-webfont.ttf | Bin .../Fonts/Share/share-bold-webfont.woff | Bin .../Fonts/Share/share-bolditalic-webfont.eot | Bin .../Fonts/Share/share-bolditalic-webfont.svg | 0 .../Fonts/Share/share-bolditalic-webfont.ttf | Bin .../Fonts/Share/share-bolditalic-webfont.woff | Bin .../Fonts/Share/share-italic-webfont.eot | Bin .../Fonts/Share/share-italic-webfont.svg | 0 .../Fonts/Share/share-italic-webfont.ttf | Bin .../Fonts/Share/share-italic-webfont.woff | Bin .../Fonts/Share/share-regular-webfont.eot | Bin .../Fonts/Share/share-regular-webfont.svg | 0 .../Fonts/Share/share-regular-webfont.ttf | Bin .../Fonts/Share/share-regular-webfont.woff | Bin .../Public/Images/cropper-background.png | Bin .../Public/Images/filetree-folder-default.png | Bin .../Public/Images/filetree-folder-opened.png | Bin .../Images/pagetree-drag-copy-above.png | Bin .../Images/pagetree-drag-copy-below.png | Bin .../Images/pagetree-drag-move-above.png | Bin .../Images/pagetree-drag-move-below.png | Bin .../Images/pagetree-drag-move-between.png | Bin .../Public/Images/pagetree-drag-move-into.png | Bin .../Images/pagetree-drag-new-between.png | Bin .../Images/pagetree-drag-new-inside.png | Bin .../Images/pagetree-drag-place-denied.png | Bin typo3/sysext/backend/ext_tables.php | 8 ++++ .../core/Resources/Public/Css/errorpage.css | 6 +-- .../Resources/Public/Css/adminpanel.css | 6 +-- .../install/Resources/Public/Css/install.css | 20 ++++----- typo3/sysext/t3skin/ext_tables.php | 9 ----- 45 files changed, 69 insertions(+), 71 deletions(-) rename typo3/sysext/{t3skin => backend}/Resources/Public/Css/backend.css (98%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.svg (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.ttf (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff2 (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/Share/generator_config.txt (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/Share/share-bold-webfont.eot (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/Share/share-bold-webfont.svg (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/Share/share-bold-webfont.ttf (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/Share/share-bold-webfont.woff (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/Share/share-bolditalic-webfont.eot (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/Share/share-bolditalic-webfont.svg (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/Share/share-bolditalic-webfont.ttf (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/Share/share-bolditalic-webfont.woff (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/Share/share-italic-webfont.eot (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/Share/share-italic-webfont.svg (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/Share/share-italic-webfont.ttf (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/Share/share-italic-webfont.woff (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/Share/share-regular-webfont.eot (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/Share/share-regular-webfont.svg (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/Share/share-regular-webfont.ttf (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Fonts/Share/share-regular-webfont.woff (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Images/cropper-background.png (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Images/filetree-folder-default.png (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Images/filetree-folder-opened.png (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Images/pagetree-drag-copy-above.png (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Images/pagetree-drag-copy-below.png (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Images/pagetree-drag-move-above.png (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Images/pagetree-drag-move-below.png (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Images/pagetree-drag-move-between.png (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Images/pagetree-drag-move-into.png (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Images/pagetree-drag-new-between.png (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Images/pagetree-drag-new-inside.png (100%) rename typo3/sysext/{t3skin => backend}/Resources/Public/Images/pagetree-drag-place-denied.png (100%) diff --git a/Build/Gruntfile.js b/Build/Gruntfile.js index 1dcf43a8b87f..f3959cf95332 100644 --- a/Build/Gruntfile.js +++ b/Build/Gruntfile.js @@ -33,7 +33,6 @@ module.exports = function(grunt) { less : '<%= paths.resources %>Public/Less/', root : '../', sysext : '<%= paths.root %>typo3/sysext/', - t3skin : '<%= paths.sysext %>t3skin/Resources/', form : '<%= paths.sysext %>form/Resources/', frontend : '<%= paths.sysext %>frontend/Resources/', install : '<%= paths.sysext %>install/Resources/', @@ -49,9 +48,9 @@ module.exports = function(grunt) { banner: '<%= banner %>', outputSourceFiles: true }, - t3skin: { + backend: { files: { - "<%= paths.t3skin %>Public/Css/backend.css": "<%= paths.less %>backend.less" + "<%= paths.backend %>Public/Css/backend.css": "<%= paths.less %>backend.less" } }, core: { @@ -98,8 +97,8 @@ module.exports = function(grunt) { }) ] }, - t3skin: { - src: '<%= paths.t3skin %>Public/Css/*.css' + backend: { + src: '<%= paths.backend %>Public/Css/*.css' }, core: { src: '<%= paths.core %>Public/Css/*.css' diff --git a/Build/Resources/Public/Less/TYPO3/_element_pagetree.less b/Build/Resources/Public/Less/TYPO3/_element_pagetree.less index c89651cff3b7..59c472b05e39 100644 --- a/Build/Resources/Public/Less/TYPO3/_element_pagetree.less +++ b/Build/Resources/Public/Less/TYPO3/_element_pagetree.less @@ -159,39 +159,39 @@ } .x-dd-drop-nodrop .x-dd-drop-icon { - background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-place-denied.png); + background-image: url(../../../../backend/Resources/Public/Images/pagetree-drag-place-denied.png); } .x-tree-drop-ok-append.typo3-pagetree-copy .x-dd-drop-icon { - background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-new-inside.png); + background-image: url(../../../../backend/Resources/Public/Images/pagetree-drag-new-inside.png); } .x-tree-drop-ok-below.typo3-pagetree-copy .x-dd-drop-icon { - background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-copy-below.png); + background-image: url(../../../../backend/Resources/Public/Images/pagetree-drag-copy-below.png); } .x-tree-drop-ok-above.typo3-pagetree-copy .x-dd-drop-icon { - background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-copy-above.png); + background-image: url(../../../../backend/Resources/Public/Images/pagetree-drag-copy-above.png); } .x-tree-drop-ok-between.typo3-pagetree-copy .x-dd-drop-icon { - background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-new-between.png); + background-image: url(../../../../backend/Resources/Public/Images/pagetree-drag-new-between.png); } .x-tree-drop-ok-append .x-dd-drop-icon { - background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-move-into.png); + background-image: url(../../../../backend/Resources/Public/Images/pagetree-drag-move-into.png); } .x-tree-drop-ok-between .x-dd-drop-icon { - background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-move-between.png); + background-image: url(../../../../backend/Resources/Public/Images/pagetree-drag-move-between.png); } .x-tree-drop-ok-below .x-dd-drop-icon { - background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-move-below.png); + background-image: url(../../../../backend/Resources/Public/Images/pagetree-drag-move-below.png); } .x-tree-drop-ok-above .x-dd-drop-icon { - background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-move-above.png); + background-image: url(../../../../backend/Resources/Public/Images/pagetree-drag-move-above.png); } #typo3-pagetree .x-tree-node .x-tree-drag-insert-below, diff --git a/Build/Resources/Public/Less/_variables.less b/Build/Resources/Public/Less/_variables.less index 4e4411191f76..709322c5a6a9 100644 --- a/Build/Resources/Public/Less/_variables.less +++ b/Build/Resources/Public/Less/_variables.less @@ -20,14 +20,14 @@ // Share Font // ========== // -@share-font-path: "@{path-sysext}/t3skin/Resources/Public/Fonts/Share"; +@share-font-path: "@{path-sysext}/backend/Resources/Public/Fonts/Share"; // // FontAwesome // =========== // -@fa-font-path: "@{path-sysext}/t3skin/Resources/Public/Fonts/FontAwesome"; +@fa-font-path: "@{path-sysext}/backend/Resources/Public/Fonts/FontAwesome"; // @@ -199,4 +199,4 @@ @hr-border: #7a7a7a; // Modal -@zindex-modal: 5000; \ No newline at end of file +@zindex-modal: 5000; diff --git a/Build/Resources/Public/Less/adminpanel.less b/Build/Resources/Public/Less/adminpanel.less index 543cb7bdf439..1efc5cb75a9b 100644 --- a/Build/Resources/Public/Less/adminpanel.less +++ b/Build/Resources/Public/Less/adminpanel.less @@ -1,17 +1,17 @@ /*! - * Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome + * Font Awesome 4.6.1 by @davegandy - http://fontawesome.io - @fontawesome * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) */ /* FONT PATH * -------------------------- */ @font-face { font-family: 'TYPO3FontAwesome'; - src: url('../../../../t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?v=4.3.0'); - src: url('../../../../t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?#iefix&v=4.3.0') format('embedded-opentype'), - url('../../../../t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff2?v=4.3.0') format('woff2'), - url('../../../../t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff?v=4.3.0') format('woff'), - url('../../../../t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.ttf?v=4.3.0') format('truetype'), - url('../../../../t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.svg?v=4.3.0#fontawesomeregular') format('svg'); + src: url('../../../../backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?v=4.6.1'); + src: url('../../../../backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?#iefix&v=4.6.1') format('embedded-opentype'), + url('../../../../backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff2?v=4.6.1') format('woff2'), + url('../../../../backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff?v=4.6.1') format('woff'), + url('../../../../backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.ttf?v=4.6.1') format('truetype'), + url('../../../../backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.svg?v=4.6.1#fontawesomeregular') format('svg'); font-weight: normal; font-style: normal; } diff --git a/Build/Resources/Public/Less/errorpage.less b/Build/Resources/Public/Less/errorpage.less index 4af680c255ea..844ad552a0cd 100644 --- a/Build/Resources/Public/Less/errorpage.less +++ b/Build/Resources/Public/Less/errorpage.less @@ -1,13 +1,13 @@ /*! - * Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome + * Font Awesome 4.6.1 by @davegandy - http://fontawesome.io - @fontawesome * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) */ /* FONT PATH * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?v=4.4.0'); - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff2?v=4.4.0') format('woff2'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff?v=4.4.0') format('woff'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.ttf?v=4.4.0') format('truetype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular') format('svg'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?v=4.6.1'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?#iefix&v=4.6.1') format('embedded-opentype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff2?v=4.6.1') format('woff2'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff?v=4.6.1') format('woff'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.ttf?v=4.6.1') format('truetype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.svg?v=4.6.1#fontawesomeregular') format('svg'); font-weight: normal; font-style: normal; } diff --git a/typo3/sysext/t3skin/Resources/Public/Css/backend.css b/typo3/sysext/backend/Resources/Public/Css/backend.css similarity index 98% rename from typo3/sysext/t3skin/Resources/Public/Css/backend.css rename to typo3/sysext/backend/Resources/Public/Css/backend.css index bd5af74d9784..5477f3ff6515 100644 --- a/typo3/sysext/t3skin/Resources/Public/Css/backend.css +++ b/typo3/sysext/backend/Resources/Public/Css/backend.css @@ -196,8 +196,8 @@ th { * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?v=4.6.1'); - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?#iefix&v=4.6.1') format('embedded-opentype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff2?v=4.6.1') format('woff2'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff?v=4.6.1') format('woff'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.ttf?v=4.6.1') format('truetype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.svg?v=4.6.1#fontawesomeregular') format('svg'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?v=4.6.1'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?#iefix&v=4.6.1') format('embedded-opentype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff2?v=4.6.1') format('woff2'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff?v=4.6.1') format('woff'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.ttf?v=4.6.1') format('truetype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.svg?v=4.6.1#fontawesomeregular') format('svg'); font-weight: normal; font-style: normal; } @@ -2375,29 +2375,29 @@ th { } @font-face { font-family: 'Share'; - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bold-webfont.eot'); - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bold-webfont.eot?#iefix') format('embedded-opentype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bold-webfont.woff') format('woff'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bold-webfont.ttf') format('truetype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bold-webfont.svg#Share-BoldRegular') format('svg'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-bold-webfont.eot'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-bold-webfont.eot?#iefix') format('embedded-opentype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-bold-webfont.woff') format('woff'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-bold-webfont.ttf') format('truetype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-bold-webfont.svg#Share-BoldRegular') format('svg'); font-weight: bold; font-style: normal; } @font-face { font-family: 'Share'; - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-italic-webfont.eot'); - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-italic-webfont.eot?#iefix') format('embedded-opentype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-italic-webfont.woff') format('woff'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-italic-webfont.ttf') format('truetype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-italic-webfont.svg#Share-ItalicRegular') format('svg'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-italic-webfont.eot'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-italic-webfont.eot?#iefix') format('embedded-opentype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-italic-webfont.woff') format('woff'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-italic-webfont.ttf') format('truetype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-italic-webfont.svg#Share-ItalicRegular') format('svg'); font-weight: normal; font-style: italic; } @font-face { font-family: 'Share'; - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-regular-webfont.eot'); - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-regular-webfont.eot?#iefix') format('embedded-opentype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-regular-webfont.woff') format('woff'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-regular-webfont.ttf') format('truetype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-regular-webfont.svg#Share-Regular') format('svg'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-regular-webfont.eot'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-regular-webfont.eot?#iefix') format('embedded-opentype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-regular-webfont.woff') format('woff'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-regular-webfont.ttf') format('truetype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-regular-webfont.svg#Share-Regular') format('svg'); font-weight: normal; font-style: normal; } @font-face { font-family: 'Share'; - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bolditalic-webfont.eot'); - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bolditalic-webfont.eot?#iefix') format('embedded-opentype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bolditalic-webfont.woff') format('woff'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bolditalic-webfont.ttf') format('truetype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bolditalic-webfont.svg#Share-BoldItalicRegular') format('svg'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-bolditalic-webfont.eot'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-bolditalic-webfont.eot?#iefix') format('embedded-opentype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-bolditalic-webfont.woff') format('woff'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-bolditalic-webfont.ttf') format('truetype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-bolditalic-webfont.svg#Share-BoldItalicRegular') format('svg'); font-weight: bold; font-style: italic; } @@ -9548,31 +9548,31 @@ div#contentMenu1 { border: 1px solid #9eb2c5; } .x-dd-drop-nodrop .x-dd-drop-icon { - background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-place-denied.png); + background-image: url(../../../../backend/Resources/Public/Images/pagetree-drag-place-denied.png); } .x-tree-drop-ok-append.typo3-pagetree-copy .x-dd-drop-icon { - background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-new-inside.png); + background-image: url(../../../../backend/Resources/Public/Images/pagetree-drag-new-inside.png); } .x-tree-drop-ok-below.typo3-pagetree-copy .x-dd-drop-icon { - background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-copy-below.png); + background-image: url(../../../../backend/Resources/Public/Images/pagetree-drag-copy-below.png); } .x-tree-drop-ok-above.typo3-pagetree-copy .x-dd-drop-icon { - background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-copy-above.png); + background-image: url(../../../../backend/Resources/Public/Images/pagetree-drag-copy-above.png); } .x-tree-drop-ok-between.typo3-pagetree-copy .x-dd-drop-icon { - background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-new-between.png); + background-image: url(../../../../backend/Resources/Public/Images/pagetree-drag-new-between.png); } .x-tree-drop-ok-append .x-dd-drop-icon { - background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-move-into.png); + background-image: url(../../../../backend/Resources/Public/Images/pagetree-drag-move-into.png); } .x-tree-drop-ok-between .x-dd-drop-icon { - background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-move-between.png); + background-image: url(../../../../backend/Resources/Public/Images/pagetree-drag-move-between.png); } .x-tree-drop-ok-below .x-dd-drop-icon { - background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-move-below.png); + background-image: url(../../../../backend/Resources/Public/Images/pagetree-drag-move-below.png); } .x-tree-drop-ok-above .x-dd-drop-icon { - background-image: url(../../../../t3skin/Resources/Public/Images/pagetree-drag-move-above.png); + background-image: url(../../../../backend/Resources/Public/Images/pagetree-drag-move-above.png); } #typo3-pagetree .x-tree-node .x-tree-drag-insert-below, .x-tree-node div.x-tree-drag-insert-below, diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot b/typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot rename to typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.svg b/typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.svg similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.svg rename to typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.svg diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.ttf b/typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.ttf similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.ttf rename to typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.ttf diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff b/typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff rename to typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff2 b/typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff2 similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff2 rename to typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff2 diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/Share/generator_config.txt b/typo3/sysext/backend/Resources/Public/Fonts/Share/generator_config.txt similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/Share/generator_config.txt rename to typo3/sysext/backend/Resources/Public/Fonts/Share/generator_config.txt diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bold-webfont.eot b/typo3/sysext/backend/Resources/Public/Fonts/Share/share-bold-webfont.eot similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bold-webfont.eot rename to typo3/sysext/backend/Resources/Public/Fonts/Share/share-bold-webfont.eot diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bold-webfont.svg b/typo3/sysext/backend/Resources/Public/Fonts/Share/share-bold-webfont.svg similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bold-webfont.svg rename to typo3/sysext/backend/Resources/Public/Fonts/Share/share-bold-webfont.svg diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bold-webfont.ttf b/typo3/sysext/backend/Resources/Public/Fonts/Share/share-bold-webfont.ttf similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bold-webfont.ttf rename to typo3/sysext/backend/Resources/Public/Fonts/Share/share-bold-webfont.ttf diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bold-webfont.woff b/typo3/sysext/backend/Resources/Public/Fonts/Share/share-bold-webfont.woff similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bold-webfont.woff rename to typo3/sysext/backend/Resources/Public/Fonts/Share/share-bold-webfont.woff diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bolditalic-webfont.eot b/typo3/sysext/backend/Resources/Public/Fonts/Share/share-bolditalic-webfont.eot similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bolditalic-webfont.eot rename to typo3/sysext/backend/Resources/Public/Fonts/Share/share-bolditalic-webfont.eot diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bolditalic-webfont.svg b/typo3/sysext/backend/Resources/Public/Fonts/Share/share-bolditalic-webfont.svg similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bolditalic-webfont.svg rename to typo3/sysext/backend/Resources/Public/Fonts/Share/share-bolditalic-webfont.svg diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bolditalic-webfont.ttf b/typo3/sysext/backend/Resources/Public/Fonts/Share/share-bolditalic-webfont.ttf similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bolditalic-webfont.ttf rename to typo3/sysext/backend/Resources/Public/Fonts/Share/share-bolditalic-webfont.ttf diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bolditalic-webfont.woff b/typo3/sysext/backend/Resources/Public/Fonts/Share/share-bolditalic-webfont.woff similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bolditalic-webfont.woff rename to typo3/sysext/backend/Resources/Public/Fonts/Share/share-bolditalic-webfont.woff diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-italic-webfont.eot b/typo3/sysext/backend/Resources/Public/Fonts/Share/share-italic-webfont.eot similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-italic-webfont.eot rename to typo3/sysext/backend/Resources/Public/Fonts/Share/share-italic-webfont.eot diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-italic-webfont.svg b/typo3/sysext/backend/Resources/Public/Fonts/Share/share-italic-webfont.svg similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-italic-webfont.svg rename to typo3/sysext/backend/Resources/Public/Fonts/Share/share-italic-webfont.svg diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-italic-webfont.ttf b/typo3/sysext/backend/Resources/Public/Fonts/Share/share-italic-webfont.ttf similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-italic-webfont.ttf rename to typo3/sysext/backend/Resources/Public/Fonts/Share/share-italic-webfont.ttf diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-italic-webfont.woff b/typo3/sysext/backend/Resources/Public/Fonts/Share/share-italic-webfont.woff similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-italic-webfont.woff rename to typo3/sysext/backend/Resources/Public/Fonts/Share/share-italic-webfont.woff diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-regular-webfont.eot b/typo3/sysext/backend/Resources/Public/Fonts/Share/share-regular-webfont.eot similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-regular-webfont.eot rename to typo3/sysext/backend/Resources/Public/Fonts/Share/share-regular-webfont.eot diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-regular-webfont.svg b/typo3/sysext/backend/Resources/Public/Fonts/Share/share-regular-webfont.svg similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-regular-webfont.svg rename to typo3/sysext/backend/Resources/Public/Fonts/Share/share-regular-webfont.svg diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-regular-webfont.ttf b/typo3/sysext/backend/Resources/Public/Fonts/Share/share-regular-webfont.ttf similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-regular-webfont.ttf rename to typo3/sysext/backend/Resources/Public/Fonts/Share/share-regular-webfont.ttf diff --git a/typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-regular-webfont.woff b/typo3/sysext/backend/Resources/Public/Fonts/Share/share-regular-webfont.woff similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-regular-webfont.woff rename to typo3/sysext/backend/Resources/Public/Fonts/Share/share-regular-webfont.woff diff --git a/typo3/sysext/t3skin/Resources/Public/Images/cropper-background.png b/typo3/sysext/backend/Resources/Public/Images/cropper-background.png similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Images/cropper-background.png rename to typo3/sysext/backend/Resources/Public/Images/cropper-background.png diff --git a/typo3/sysext/t3skin/Resources/Public/Images/filetree-folder-default.png b/typo3/sysext/backend/Resources/Public/Images/filetree-folder-default.png similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Images/filetree-folder-default.png rename to typo3/sysext/backend/Resources/Public/Images/filetree-folder-default.png diff --git a/typo3/sysext/t3skin/Resources/Public/Images/filetree-folder-opened.png b/typo3/sysext/backend/Resources/Public/Images/filetree-folder-opened.png similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Images/filetree-folder-opened.png rename to typo3/sysext/backend/Resources/Public/Images/filetree-folder-opened.png diff --git a/typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-copy-above.png b/typo3/sysext/backend/Resources/Public/Images/pagetree-drag-copy-above.png similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-copy-above.png rename to typo3/sysext/backend/Resources/Public/Images/pagetree-drag-copy-above.png diff --git a/typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-copy-below.png b/typo3/sysext/backend/Resources/Public/Images/pagetree-drag-copy-below.png similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-copy-below.png rename to typo3/sysext/backend/Resources/Public/Images/pagetree-drag-copy-below.png diff --git a/typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-move-above.png b/typo3/sysext/backend/Resources/Public/Images/pagetree-drag-move-above.png similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-move-above.png rename to typo3/sysext/backend/Resources/Public/Images/pagetree-drag-move-above.png diff --git a/typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-move-below.png b/typo3/sysext/backend/Resources/Public/Images/pagetree-drag-move-below.png similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-move-below.png rename to typo3/sysext/backend/Resources/Public/Images/pagetree-drag-move-below.png diff --git a/typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-move-between.png b/typo3/sysext/backend/Resources/Public/Images/pagetree-drag-move-between.png similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-move-between.png rename to typo3/sysext/backend/Resources/Public/Images/pagetree-drag-move-between.png diff --git a/typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-move-into.png b/typo3/sysext/backend/Resources/Public/Images/pagetree-drag-move-into.png similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-move-into.png rename to typo3/sysext/backend/Resources/Public/Images/pagetree-drag-move-into.png diff --git a/typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-new-between.png b/typo3/sysext/backend/Resources/Public/Images/pagetree-drag-new-between.png similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-new-between.png rename to typo3/sysext/backend/Resources/Public/Images/pagetree-drag-new-between.png diff --git a/typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-new-inside.png b/typo3/sysext/backend/Resources/Public/Images/pagetree-drag-new-inside.png similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-new-inside.png rename to typo3/sysext/backend/Resources/Public/Images/pagetree-drag-new-inside.png diff --git a/typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-place-denied.png b/typo3/sysext/backend/Resources/Public/Images/pagetree-drag-place-denied.png similarity index 100% rename from typo3/sysext/t3skin/Resources/Public/Images/pagetree-drag-place-denied.png rename to typo3/sysext/backend/Resources/Public/Images/pagetree-drag-place-denied.png diff --git a/typo3/sysext/backend/ext_tables.php b/typo3/sysext/backend/ext_tables.php index e5d39f7f65a1..cc5af74da030 100644 --- a/typo3/sysext/backend/ext_tables.php +++ b/typo3/sysext/backend/ext_tables.php @@ -1,6 +1,14 @@ <?php defined('TYPO3_MODE') or die(); +// Register as a skin +$GLOBALS['TBE_STYLES']['skins']['backend'] = array( + 'name' => 'backend', + 'stylesheetDirectories' => array( + 'css' => 'EXT:backend/Resources/Public/Css/' + ) +); + if (TYPO3_MODE === 'BE') { \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule( 'web', diff --git a/typo3/sysext/core/Resources/Public/Css/errorpage.css b/typo3/sysext/core/Resources/Public/Css/errorpage.css index 1a3ab5463399..ae8ef3709ace 100644 --- a/typo3/sysext/core/Resources/Public/Css/errorpage.css +++ b/typo3/sysext/core/Resources/Public/Css/errorpage.css @@ -11,15 +11,15 @@ * The TYPO3 project - inspiring people to share! */ /*! - * Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome + * Font Awesome 4.6.1 by @davegandy - http://fontawesome.io - @fontawesome * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) */ /* FONT PATH * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?v=4.4.0'); - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff2?v=4.4.0') format('woff2'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff?v=4.4.0') format('woff'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.ttf?v=4.4.0') format('truetype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular') format('svg'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?v=4.6.1'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?#iefix&v=4.6.1') format('embedded-opentype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff2?v=4.6.1') format('woff2'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff?v=4.6.1') format('woff'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.ttf?v=4.6.1') format('truetype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.svg?v=4.6.1#fontawesomeregular') format('svg'); font-weight: normal; font-style: normal; } diff --git a/typo3/sysext/frontend/Resources/Public/Css/adminpanel.css b/typo3/sysext/frontend/Resources/Public/Css/adminpanel.css index a12b3dc3f1fc..8b6fe2f10546 100644 --- a/typo3/sysext/frontend/Resources/Public/Css/adminpanel.css +++ b/typo3/sysext/frontend/Resources/Public/Css/adminpanel.css @@ -11,15 +11,15 @@ * The TYPO3 project - inspiring people to share! */ /*! - * Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome + * Font Awesome 4.6.1 by @davegandy - http://fontawesome.io - @fontawesome * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) */ /* FONT PATH * -------------------------- */ @font-face { font-family: 'TYPO3FontAwesome'; - src: url('../../../../t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?v=4.3.0'); - src: url('../../../../t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?#iefix&v=4.3.0') format('embedded-opentype'), url('../../../../t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff2?v=4.3.0') format('woff2'), url('../../../../t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff?v=4.3.0') format('woff'), url('../../../../t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.ttf?v=4.3.0') format('truetype'), url('../../../../t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.svg?v=4.3.0#fontawesomeregular') format('svg'); + src: url('../../../../backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?v=4.6.1'); + src: url('../../../../backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?#iefix&v=4.6.1') format('embedded-opentype'), url('../../../../backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff2?v=4.6.1') format('woff2'), url('../../../../backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff?v=4.6.1') format('woff'), url('../../../../backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.ttf?v=4.6.1') format('truetype'), url('../../../../backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.svg?v=4.6.1#fontawesomeregular') format('svg'); font-weight: normal; font-style: normal; } diff --git a/typo3/sysext/install/Resources/Public/Css/install.css b/typo3/sysext/install/Resources/Public/Css/install.css index fe37ffecfd25..fba91e36c11d 100644 --- a/typo3/sysext/install/Resources/Public/Css/install.css +++ b/typo3/sysext/install/Resources/Public/Css/install.css @@ -196,8 +196,8 @@ th { * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?v=4.6.1'); - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?#iefix&v=4.6.1') format('embedded-opentype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff2?v=4.6.1') format('woff2'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff?v=4.6.1') format('woff'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.ttf?v=4.6.1') format('truetype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.svg?v=4.6.1#fontawesomeregular') format('svg'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?v=4.6.1'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?#iefix&v=4.6.1') format('embedded-opentype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff2?v=4.6.1') format('woff2'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff?v=4.6.1') format('woff'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.ttf?v=4.6.1') format('truetype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.svg?v=4.6.1#fontawesomeregular') format('svg'); font-weight: normal; font-style: normal; } @@ -2373,29 +2373,29 @@ th { } @font-face { font-family: 'Share'; - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bold-webfont.eot'); - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bold-webfont.eot?#iefix') format('embedded-opentype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bold-webfont.woff') format('woff'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bold-webfont.ttf') format('truetype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bold-webfont.svg#Share-BoldRegular') format('svg'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-bold-webfont.eot'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-bold-webfont.eot?#iefix') format('embedded-opentype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-bold-webfont.woff') format('woff'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-bold-webfont.ttf') format('truetype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-bold-webfont.svg#Share-BoldRegular') format('svg'); font-weight: bold; font-style: normal; } @font-face { font-family: 'Share'; - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-italic-webfont.eot'); - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-italic-webfont.eot?#iefix') format('embedded-opentype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-italic-webfont.woff') format('woff'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-italic-webfont.ttf') format('truetype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-italic-webfont.svg#Share-ItalicRegular') format('svg'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-italic-webfont.eot'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-italic-webfont.eot?#iefix') format('embedded-opentype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-italic-webfont.woff') format('woff'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-italic-webfont.ttf') format('truetype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-italic-webfont.svg#Share-ItalicRegular') format('svg'); font-weight: normal; font-style: italic; } @font-face { font-family: 'Share'; - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-regular-webfont.eot'); - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-regular-webfont.eot?#iefix') format('embedded-opentype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-regular-webfont.woff') format('woff'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-regular-webfont.ttf') format('truetype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-regular-webfont.svg#Share-Regular') format('svg'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-regular-webfont.eot'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-regular-webfont.eot?#iefix') format('embedded-opentype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-regular-webfont.woff') format('woff'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-regular-webfont.ttf') format('truetype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-regular-webfont.svg#Share-Regular') format('svg'); font-weight: normal; font-style: normal; } @font-face { font-family: 'Share'; - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bolditalic-webfont.eot'); - src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bolditalic-webfont.eot?#iefix') format('embedded-opentype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bolditalic-webfont.woff') format('woff'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bolditalic-webfont.ttf') format('truetype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/Share/share-bolditalic-webfont.svg#Share-BoldItalicRegular') format('svg'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-bolditalic-webfont.eot'); + src: url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-bolditalic-webfont.eot?#iefix') format('embedded-opentype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-bolditalic-webfont.woff') format('woff'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-bolditalic-webfont.ttf') format('truetype'), url('../../../../../../typo3/sysext/backend/Resources/Public/Fonts/Share/share-bolditalic-webfont.svg#Share-BoldItalicRegular') format('svg'); font-weight: bold; font-style: italic; } diff --git a/typo3/sysext/t3skin/ext_tables.php b/typo3/sysext/t3skin/ext_tables.php index 9ee66a7c61bf..6af0272361aa 100644 --- a/typo3/sysext/t3skin/ext_tables.php +++ b/typo3/sysext/t3skin/ext_tables.php @@ -2,15 +2,6 @@ defined('TYPO3_MODE') or die(); if (TYPO3_MODE === 'BE' || TYPO3_MODE === 'FE' && isset($GLOBALS['BE_USER'])) { - - // Register as a skin - $GLOBALS['TBE_STYLES']['skins']['t3skin'] = array( - 'name' => 't3skin', - 'stylesheetDirectories' => array( - 'css' => 'EXT:t3skin/Resources/Public/Css/' - ) - ); - // extJS theme $GLOBALS['TBE_STYLES']['extJS']['theme'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('t3skin') . 'extjs/xtheme-t3skin.css'; } -- GitLab