Commit 55eb17f2 authored by Nikita Hovratov's avatar Nikita Hovratov Committed by Andreas Fernandez
Browse files

[TASK] Remove legacy font formats

eot, otf and ttf font formats were used to support very old browsers
like <= IE8. Since TYPO3 v10 does only support modern browsers, these
formats can be safely removed.

Used commands:
>yarn remove npm-font-source-sans-pro
>yarn add source-sans-pro
>grunt build

Resolves: #90904
Releases: master, 10.4
Change-Id: I0676bcdb2bc70454f73027e8e216bb889c419a57
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/64551


Tested-by: default avatarTYPO3com <noreply@typo3.com>
Tested-by: Andreas Fernandez's avatarAndreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Andreas Fernandez's avatarAndreas Fernandez <a.fernandez@scripting-base.de>
parent 70a88b75
......@@ -424,8 +424,8 @@ module.exports = function (grunt) {
files: [
{
expand: true,
cwd: '<%= paths.node_modules %>npm-font-source-sans-pro/fonts',
src: ['**/*'],
cwd: '<%= paths.node_modules %>source-sans-pro',
src: ['WOFF/OTF/**', 'WOFF2/TTF/**'],
dest: '<%= paths.sysext %>backend/Resources/Public/Fonts/SourceSansPro'
},
{
......
......@@ -11,7 +11,7 @@
font-weight: 200;
font-style: normal;
font-stretch: normal;
src: url('#{$sourcesanspro-font-path}/EOT/SourceSansPro-ExtraLight.eot') format('embedded-opentype'), url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-ExtraLight.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-ExtraLight.otf.woff') format('woff'), url('#{$sourcesanspro-font-path}/OTF/SourceSansPro-ExtraLight.otf') format('opentype'), url('#{$sourcesanspro-font-path}/TTF/SourceSansPro-ExtraLight.ttf') format('truetype');
src: url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-ExtraLight.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-ExtraLight.otf.woff') format('woff');
}
@font-face {
......@@ -19,7 +19,7 @@
font-weight: 200;
font-style: italic;
font-stretch: normal;
src: url('#{$sourcesanspro-font-path}/EOT/SourceSansPro-ExtraLightIt.eot') format('embedded-opentype'), url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-ExtraLightIt.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-ExtraLightIt.otf.woff') format('woff'), url('#{$sourcesanspro-font-path}/OTF/SourceSansPro-ExtraLightIt.otf') format('opentype'), url('#{$sourcesanspro-font-path}/TTF/SourceSansPro-ExtraLightIt.ttf') format('truetype');
src: url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-ExtraLightIt.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-ExtraLightIt.otf.woff') format('woff');
}
@font-face {
......@@ -27,7 +27,7 @@
font-weight: 300;
font-style: normal;
font-stretch: normal;
src: url('#{$sourcesanspro-font-path}/EOT/SourceSansPro-Light.eot') format('embedded-opentype'), url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-Light.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-Light.otf.woff') format('woff'), url('#{$sourcesanspro-font-path}/OTF/SourceSansPro-Light.otf') format('opentype'), url('#{$sourcesanspro-font-path}/TTF/SourceSansPro-Light.ttf') format('truetype');
src: url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-Light.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-Light.otf.woff') format('woff');
}
@font-face {
......@@ -35,7 +35,7 @@
font-weight: 300;
font-style: italic;
font-stretch: normal;
src: url('#{$sourcesanspro-font-path}/EOT/SourceSansPro-LightIt.eot') format('embedded-opentype'), url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-LightIt.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-LightIt.otf.woff') format('woff'), url('#{$sourcesanspro-font-path}/OTF/SourceSansPro-LightIt.otf') format('opentype'), url('#{$sourcesanspro-font-path}/TTF/SourceSansPro-LightIt.ttf') format('truetype');
src: url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-LightIt.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-LightIt.otf.woff') format('woff');
}
@font-face {
......@@ -43,7 +43,7 @@
font-weight: 400;
font-style: normal;
font-stretch: normal;
src: url('#{$sourcesanspro-font-path}/EOT/SourceSansPro-Regular.eot') format('embedded-opentype'), url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-Regular.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-Regular.otf.woff') format('woff'), url('#{$sourcesanspro-font-path}/OTF/SourceSansPro-Regular.otf') format('opentype'), url('#{$sourcesanspro-font-path}/TTF/SourceSansPro-Regular.ttf') format('truetype');
src: url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-Regular.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-Regular.otf.woff') format('woff');
}
@font-face {
......@@ -51,7 +51,7 @@
font-weight: 400;
font-style: italic;
font-stretch: normal;
src: url('#{$sourcesanspro-font-path}/EOT/SourceSansPro-It.eot') format('embedded-opentype'), url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-It.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-It.otf.woff') format('woff'), url('#{$sourcesanspro-font-path}/OTF/SourceSansPro-It.otf') format('opentype'), url('#{$sourcesanspro-font-path}/TTF/SourceSansPro-It.ttf') format('truetype');
src: url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-It.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-It.otf.woff') format('woff');
}
@font-face {
......@@ -59,7 +59,7 @@
font-weight: 600;
font-style: normal;
font-stretch: normal;
src: url('#{$sourcesanspro-font-path}/EOT/SourceSansPro-Semibold.eot') format('embedded-opentype'), url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-Semibold.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-Semibold.otf.woff') format('woff'), url('#{$sourcesanspro-font-path}/OTF/SourceSansPro-Semibold.otf') format('opentype'), url('#{$sourcesanspro-font-path}/TTF/SourceSansPro-Semibold.ttf') format('truetype');
src: url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-Semibold.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-Semibold.otf.woff') format('woff');
}
@font-face {
......@@ -67,7 +67,7 @@
font-weight: 600;
font-style: italic;
font-stretch: normal;
src: url('#{$sourcesanspro-font-path}/EOT/SourceSansPro-SemiboldIt.eot') format('embedded-opentype'), url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-SemiboldIt.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-SemiboldIt.otf.woff') format('woff'), url('#{$sourcesanspro-font-path}/OTF/SourceSansPro-SemiboldIt.otf') format('opentype'), url('#{$sourcesanspro-font-path}/TTF/SourceSansPro-SemiboldIt.ttf') format('truetype');
src: url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-SemiboldIt.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-SemiboldIt.otf.woff') format('woff');
}
@font-face {
......@@ -75,7 +75,7 @@
font-weight: 700;
font-style: normal;
font-stretch: normal;
src: url('#{$sourcesanspro-font-path}/EOT/SourceSansPro-Bold.eot') format('embedded-opentype'), url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-Bold.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-Bold.otf.woff') format('woff'), url('#{$sourcesanspro-font-path}/OTF/SourceSansPro-Bold.otf') format('opentype'), url('#{$sourcesanspro-font-path}/TTF/SourceSansPro-Bold.ttf') format('truetype');
src: url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-Bold.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-Bold.otf.woff') format('woff');
}
@font-face {
......@@ -83,7 +83,7 @@
font-weight: 700;
font-style: italic;
font-stretch: normal;
src: url('#{$sourcesanspro-font-path}/EOT/SourceSansPro-BoldIt.eot') format('embedded-opentype'), url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-BoldIt.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-BoldIt.otf.woff') format('woff'), url('#{$sourcesanspro-font-path}/OTF/SourceSansPro-BoldIt.otf') format('opentype'), url('#{$sourcesanspro-font-path}/TTF/SourceSansPro-BoldIt.ttf') format('truetype');
src: url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-BoldIt.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-BoldIt.otf.woff') format('woff');
}
@font-face {
......@@ -91,7 +91,7 @@
font-weight: 900;
font-style: normal;
font-stretch: normal;
src: url('#{$sourcesanspro-font-path}/EOT/SourceSansPro-Black.eot') format('embedded-opentype'), url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-Black.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-Black.otf.woff') format('woff'), url('#{$sourcesanspro-font-path}/OTF/SourceSansPro-Black.otf') format('opentype'), url('#{$sourcesanspro-font-path}/TTF/SourceSansPro-Black.ttf') format('truetype');
src: url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-Black.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-Black.otf.woff') format('woff');
}
@font-face {
......@@ -99,5 +99,5 @@
font-weight: 900;
font-style: italic;
font-stretch: normal;
src: url('#{$sourcesanspro-font-path}/EOT/SourceSansPro-BlackIt.eot') format('embedded-opentype'), url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-BlackIt.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-BlackIt.otf.woff') format('woff'), url('#{$sourcesanspro-font-path}/OTF/SourceSansPro-BlackIt.otf') format('opentype'), url('#{$sourcesanspro-font-path}/TTF/SourceSansPro-BlackIt.ttf') format('truetype');
src: url('#{$sourcesanspro-font-path}/WOFF2/TTF/SourceSansPro-BlackIt.ttf.woff2') format('woff2'), url('#{$sourcesanspro-font-path}/WOFF/OTF/SourceSansPro-BlackIt.otf.woff') format('woff');
}
......@@ -90,10 +90,10 @@
"moment": "^2.24.0",
"moment-timezone": "^0.5.27",
"muuri": "^0.8.0",
"npm-font-source-sans-pro": "^1.0.2",
"nprogress": "^0.2.0",
"requirejs": "^2.3.3",
"sortablejs": "^1.10.1",
"source-sans-pro": "^3.6.0",
"tablesort": "^5.2.0",
"taboverride": "^4.0.3",
"tagsort": "1.4.0"
......
......@@ -5823,11 +5823,6 @@ npm-conf@^1.1.0:
config-chain "^1.1.11"
pify "^3.0.0"
npm-font-source-sans-pro@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/npm-font-source-sans-pro/-/npm-font-source-sans-pro-1.0.2.tgz#c55c8ae368eebdbcaca65425a0d7e1f9a192a03e"
integrity sha1-xVyK42juvbysplQloNfh+aGSoD4=
npm-install-checks@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-3.0.2.tgz#ab2e32ad27baa46720706908e5b14c1852de44d9"
......@@ -7696,6 +7691,11 @@ source-map@~0.2.0:
dependencies:
amdefine ">=0.0.4"
source-sans-pro@^3.6.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/source-sans-pro/-/source-sans-pro-3.6.0.tgz#f4167065ebf096136b1b4f141dbd48886dda1486"
integrity sha512-C1RFUGu+YASuqpgDRInTM7Y6OwqeWNOuKn7v0P/4Kh66epTI4PYWwPWP5kdA4l/VqzBAWiqoz5dk0trof73R7w==
spdx-correct@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment