Commit dabe04ec authored by Andreas Fernandez's avatar Andreas Fernandez
Browse files

[BUGFIX] Replace deprecated source-sans-pro with source-sans

The package `source-sans-pro` was renamed to `source-sans` in September
2020. npm annotates this deprecation during installation of packages as
well.

As all font files were renamed, the SCSS file and the font directory
were renamed accordingly.

Resolves: #98393
Releases: main
Change-Id: Ic18333e7f8c4b59c3f62c07ceb1c3dc4757b8e32
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/75800


Tested-by: core-ci's avatarcore-ci <typo3@b13.com>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: Benni Mack's avatarBenni Mack <benni@typo3.org>
Tested-by: Andreas Fernandez's avatarAndreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Benni Mack's avatarBenni Mack <benni@typo3.org>
Reviewed-by: Andreas Fernandez's avatarAndreas Fernandez <a.fernandez@scripting-base.de>
parent faa55d2f
......@@ -306,9 +306,9 @@ module.exports = function (grunt) {
files: [
{
expand: true,
cwd: '<%= paths.node_modules %>source-sans-pro',
cwd: '<%= paths.node_modules %>source-sans',
src: ['WOFF/OTF/**', 'WOFF2/TTF/**'],
dest: '<%= paths.sysext %>backend/Resources/Public/Fonts/SourceSansPro'
dest: '<%= paths.sysext %>backend/Resources/Public/Fonts/SourceSans'
}
]
},
......
......@@ -70,9 +70,9 @@
//
// Fonts
//
$sourcesanspro-font-path: "../Fonts/SourceSansPro";
$sourcesans-font-path: "../Fonts/SourceSans";
@import "webfont/sourcesanspro";
@import "webfont/sourcesans";
//
// Scaffold
......
......@@ -17,7 +17,7 @@ $widget-background: #fff;
$widget-shadow: 0 2px 2px 0 rgba(0, 0, 0, .15);
$widget-padding: 20px;
$widget-height: 200px;
$widget-title-font-family: 'Source Sans Pro', sans-serif;
$widget-title-font-family: 'Source Sans', sans-serif;
$widget-title-size: 16px;
$widget-title-line-height: 1.25;
$widget-title-weight: bold;
......
......@@ -290,7 +290,7 @@ $module-body-padding: $module-body-padding-vertical $module-body-padding-horizon
//
:root {
// Header
--typo3-header-font-family: "Source Sans Pro", sans-serif;
--typo3-header-font-family: "Source Sans", sans-serif;
// General
--typo3-spacing: 1rem;
......
//
// Source Sans
// ===============
//
//
// Font declaration
//
@font-face {
font-family: 'Source Sans';
font-weight: 200;
font-style: normal;
font-stretch: normal;
src: url('#{$sourcesans-font-path}/WOFF2/TTF/SourceSans3-ExtraLight.ttf.woff2') format('woff2'), url('#{$sourcesans-font-path}/WOFF/OTF/SourceSans3-ExtraLight.otf.woff') format('woff');
}
@font-face {
font-family: 'Source Sans';
font-weight: 200;
font-style: italic;
font-stretch: normal;
src: url('#{$sourcesans-font-path}/WOFF2/TTF/SourceSans3-ExtraLightIt.ttf.woff2') format('woff2'), url('#{$sourcesans-font-path}/WOFF/OTF/SourceSans3-ExtraLightIt.otf.woff') format('woff');
}
@font-face {
font-family: 'Source Sans';
font-weight: 300;
font-style: normal;
font-stretch: normal;
src: url('#{$sourcesans-font-path}/WOFF2/TTF/SourceSans3-Light.ttf.woff2') format('woff2'), url('#{$sourcesans-font-path}/WOFF/OTF/SourceSans3-Light.otf.woff') format('woff');
}
@font-face {
font-family: 'Source Sans';
font-weight: 300;
font-style: italic;
font-stretch: normal;
src: url('#{$sourcesans-font-path}/WOFF2/TTF/SourceSans3-LightIt.ttf.woff2') format('woff2'), url('#{$sourcesans-font-path}/WOFF/OTF/SourceSans3-LightIt.otf.woff') format('woff');
}
@font-face {
font-family: 'Source Sans';
font-weight: 400;
font-style: normal;
font-stretch: normal;
src: url('#{$sourcesans-font-path}/WOFF2/TTF/SourceSans3-Regular.ttf.woff2') format('woff2'), url('#{$sourcesans-font-path}/WOFF/OTF/SourceSans3-Regular.otf.woff') format('woff');
}
@font-face {
font-family: 'Source Sans';
font-weight: 400;
font-style: italic;
font-stretch: normal;
src: url('#{$sourcesans-font-path}/WOFF2/TTF/SourceSans3-It.ttf.woff2') format('woff2'), url('#{$sourcesans-font-path}/WOFF/OTF/SourceSans3-It.otf.woff') format('woff');
}
@font-face {
font-family: 'Source Sans';
font-weight: 600;
font-style: normal;
font-stretch: normal;
src: url('#{$sourcesans-font-path}/WOFF2/TTF/SourceSans3-Semibold.ttf.woff2') format('woff2'), url('#{$sourcesans-font-path}/WOFF/OTF/SourceSans3-Semibold.otf.woff') format('woff');
}
@font-face {
font-family: 'Source Sans';
font-weight: 600;
font-style: italic;
font-stretch: normal;
src: url('#{$sourcesans-font-path}/WOFF2/TTF/SourceSans3-SemiboldIt.ttf.woff2') format('woff2'), url('#{$sourcesans-font-path}/WOFF/OTF/SourceSans3-SemiboldIt.otf.woff') format('woff');
}
@font-face {
font-family: 'Source Sans';
font-weight: 700;
font-style: normal;
font-stretch: normal;
src: url('#{$sourcesans-font-path}/WOFF2/TTF/SourceSans3-Bold.ttf.woff2') format('woff2'), url('#{$sourcesans-font-path}/WOFF/OTF/SourceSans3-Bold.otf.woff') format('woff');
}
@font-face {
font-family: 'Source Sans';
font-weight: 700;
font-style: italic;
font-stretch: normal;
src: url('#{$sourcesans-font-path}/WOFF2/TTF/SourceSans3-BoldIt.ttf.woff2') format('woff2'), url('#{$sourcesans-font-path}/WOFF/OTF/SourceSans3-BoldIt.otf.woff') format('woff');
}
@font-face {
font-family: 'Source Sans';
font-weight: 900;
font-style: normal;
font-stretch: normal;
src: url('#{$sourcesans-font-path}/WOFF2/TTF/SourceSans3-Black.ttf.woff2') format('woff2'), url('#{$sourcesans-font-path}/WOFF/OTF/SourceSans3-Black.otf.woff') format('woff');
}
@font-face {
font-family: 'Source Sans';
font-weight: 900;
font-style: italic;
font-stretch: normal;
src: url('#{$sourcesans-font-path}/WOFF2/TTF/SourceSans3-BlackIt.ttf.woff2') format('woff2'), url('#{$sourcesans-font-path}/WOFF/OTF/SourceSans3-BlackIt.otf.woff') format('woff');
}
//
// Source Sans Pro
// ===============
//
//
// Font declaration
//
@font-face {
font-family: 'Source Sans Pro';
font-weight: 200;
font-style: normal;
font-stretch: normal;
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 {
font-family: 'Source Sans Pro';
font-weight: 200;
font-style: italic;
font-stretch: normal;
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 {
font-family: 'Source Sans Pro';
font-weight: 300;
font-style: normal;
font-stretch: normal;
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 {
font-family: 'Source Sans Pro';
font-weight: 300;
font-style: italic;
font-stretch: normal;
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 {
font-family: 'Source Sans Pro';
font-weight: 400;
font-style: normal;
font-stretch: normal;
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 {
font-family: 'Source Sans Pro';
font-weight: 400;
font-style: italic;
font-stretch: normal;
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 {
font-family: 'Source Sans Pro';
font-weight: 600;
font-style: normal;
font-stretch: normal;
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 {
font-family: 'Source Sans Pro';
font-weight: 600;
font-style: italic;
font-stretch: normal;
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 {
font-family: 'Source Sans Pro';
font-weight: 700;
font-style: normal;
font-stretch: normal;
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 {
font-family: 'Source Sans Pro';
font-weight: 700;
font-style: italic;
font-stretch: normal;
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 {
font-family: 'Source Sans Pro';
font-weight: 900;
font-style: normal;
font-stretch: normal;
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 {
font-family: 'Source Sans Pro';
font-weight: 900;
font-style: italic;
font-stretch: normal;
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');
}
......@@ -58,7 +58,7 @@
"nprogress": "^0.2.0",
"requirejs": "^2.3.6",
"sortablejs": "^1.12.0",
"source-sans-pro": "^3.6.0",
"source-sans": "^3.46.0",
"tablesort": "^5.2.1",
"taboverride": "^4.0.3",
"tagsort": "^1.4.0",
......@@ -8461,11 +8461,10 @@
"dev": true,
"license": "MIT"
},
"node_modules/source-sans-pro": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/source-sans-pro/-/source-sans-pro-3.6.0.tgz",
"integrity": "sha512-C1RFUGu+YASuqpgDRInTM7Y6OwqeWNOuKn7v0P/4Kh66epTI4PYWwPWP5kdA4l/VqzBAWiqoz5dk0trof73R7w==",
"license": "OFL-1.1"
"node_modules/source-sans": {
"version": "3.46.0",
"resolved": "https://registry.npmjs.org/source-sans/-/source-sans-3.46.0.tgz",
"integrity": "sha512-bVC2YX4VNiv5vMcy77dL0XKsNp794ThfynNsr+FqSAwk8TGG0pZsg7eUQi6yHwaRBMVmZ3Aaf4FY46dxIIGgsg=="
},
"node_modules/sourcemap-codec": {
"version": "1.4.8",
......
......@@ -128,7 +128,7 @@
"nprogress": "^0.2.0",
"requirejs": "^2.3.6",
"sortablejs": "^1.12.0",
"source-sans-pro": "^3.6.0",
"source-sans": "^3.46.0",
"tablesort": "^5.2.1",
"taboverride": "^4.0.3",
"tagsort": "^1.4.0",
......
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