You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2019/11/03 19:52:02 UTC
[camel-website] branch CAMEL-14128 created (now de76d2e)
This is an automated email from the ASF dual-hosted git repository.
janbednar pushed a change to branch CAMEL-14128
in repository https://gitbox.apache.org/repos/asf/camel-website.git.
at de76d2e CAMEL-14128: Include latin-ext typeface
This branch includes the following new commits:
new de76d2e CAMEL-14128: Include latin-ext typeface
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[camel-website] 01/01: CAMEL-14128: Include latin-ext typeface
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janbednar pushed a commit to branch CAMEL-14128
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit de76d2efb83624d8cc3a348fe1fc6f5ac32bac6b
Author: Jan Bednář <ma...@janbednar.eu>
AuthorDate: Sun Nov 3 19:32:32 2019 +0100
CAMEL-14128: Include latin-ext typeface
---
antora-ui-camel/gulp.d/tasks/build.js | 2 +-
antora-ui-camel/package.json | 2 +-
antora-ui-camel/src/css/typeface-open-sans.css | 67 +++++++++++++++++---------
antora-ui-camel/yarn.lock | 10 ++--
4 files changed, 51 insertions(+), 30 deletions(-)
diff --git a/antora-ui-camel/gulp.d/tasks/build.js b/antora-ui-camel/gulp.d/tasks/build.js
index 5ef90c8..8909a87 100644
--- a/antora-ui-camel/gulp.d/tasks/build.js
+++ b/antora-ui-camel/gulp.d/tasks/build.js
@@ -30,7 +30,7 @@ module.exports = (src, dest, preview) => () => {
postcssImport,
postcssUrl([
{
- filter: '**/~typeface-*/files/*',
+ filter: '**/*.@(woff|woff2)',
url: (asset) => {
const relpath = asset.pathname.substr(1)
const abspath = require.resolve(relpath)
diff --git a/antora-ui-camel/package.json b/antora-ui-camel/package.json
index 68ac20f..27a923e 100644
--- a/antora-ui-camel/package.json
+++ b/antora-ui-camel/package.json
@@ -60,7 +60,7 @@
"svg4everybody": "^2.1.9",
"through2": "~3.0",
"typeface-droid-sans-mono": "^0.0.44",
- "typeface-open-sans": "^0.0.54",
+ "@openfonts/open-sans_latin-ext": "^1.44.0",
"undertaker": "~1.2",
"vinyl-buffer": "~1.0",
"vinyl-fs": "~3.0"
diff --git a/antora-ui-camel/src/css/typeface-open-sans.css b/antora-ui-camel/src/css/typeface-open-sans.css
index d9ec92c..ffc0b66 100644
--- a/antora-ui-camel/src/css/typeface-open-sans.css
+++ b/antora-ui-camel/src/css/typeface-open-sans.css
@@ -1,51 +1,72 @@
-/* open-sans-300normal - latin */
+/* open-sans-300normal - latin-ext */
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-display: swap;
font-weight: 300;
src:
- local('Open Sans Light '),
- local('Open Sans-Light'),
- url('~typeface-open-sans/files/open-sans-latin-300.woff2') format('woff2'),
- url('~typeface-open-sans/files/open-sans-latin-300.woff') format('woff');
+ local('Open Sans Light'),
+ local('OpenSans-Light'),
+ url('~@openfonts/open-sans_latin-ext/files/open-sans-latin-ext-300.woff2') format('woff2'),
+ url('~@openfonts/open-sans_latin-ext/files/open-sans-latin-ext-300.woff') format('woff');
}
-
-/* open-sans-300italic - latin */
+/* open-sans-300italic - latin-ext */
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-display: swap;
font-weight: 300;
src:
- local('Open Sans Light italic'),
- local('Open Sans-Lightitalic'),
- url('~typeface-open-sans/files/open-sans-latin-300italic.woff2') format('woff2'),
- url('~typeface-open-sans/files/open-sans-latin-300italic.woff') format('woff');
+ local('Open Sans Light Italic'),
+ local('OpenSans-LightItalic'),
+ url('~@openfonts/open-sans_latin-ext/files/open-sans-latin-ext-300-italic.woff2') format('woff2'),
+ url('~@openfonts/open-sans_latin-ext/files/open-sans-latin-ext-300-italic.woff') format('woff');
}
-
-/* open-sans-700normal - latin */
+/* open-sans-700normal - latin-ext */
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-display: swap;
font-weight: 700;
src:
- local('Open Sans ExtraBold '),
- local('Open Sans-ExtraBold'),
- url('~typeface-open-sans/files/open-sans-latin-700.woff2') format('woff2'),
- url('~typeface-open-sans/files/open-sans-latin-700.woff') format('woff');
+ local('Open Sans Bold'),
+ local('OpenSans-Bold'),
+ url('~@openfonts/open-sans_latin-ext/files/open-sans-latin-ext-700.woff2') format('woff2'),
+ url('~@openfonts/open-sans_latin-ext/files/open-sans-latin-ext-700.woff') format('woff');
}
-
-/* open-sans-700italic - latin */
+/* open-sans-700italic - latin-ext */
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-display: swap;
font-weight: 700;
src:
- local('Open Sans ExtraBold italic'),
- local('Open Sans-ExtraBolditalic'),
- url('~typeface-open-sans/files/open-sans-latin-700italic.woff2') format('woff2'),
- url('~typeface-open-sans/files/open-sans-latin-700italic.woff') format('woff');
+ local('Open Sans Bold Italic'),
+ local('OpenSans-BoldItalic'),
+ url('~@openfonts/open-sans_latin-ext/files/open-sans-latin-ext-700-italic.woff2') format('woff2'),
+ url('~@openfonts/open-sans_latin-ext/files/open-sans-latin-ext-700-italic.woff') format('woff');
+}
+/* open-sans-800normal - latin-ext */
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-display: swap;
+ font-weight: 800;
+ src:
+ local('Open Sans ExtraBold'),
+ local('OpenSans-ExtraBold'),
+ url('~@openfonts/open-sans_latin-ext/files/open-sans-latin-ext-800.woff2') format('woff2'),
+ url('~@openfonts/open-sans_latin-ext/files/open-sans-latin-ext-800.woff') format('woff');
+}
+/* open-sans-800italic - latin-ext */
+@font-face {
+ font-family: 'Open Sans';
+ font-style: italic;
+ font-display: swap;
+ font-weight: 800;
+ src:
+ local('Open Sans ExtraBold Italic'),
+ local('OpenSans-ExtraBoldItalic'),
+ url('~@openfonts/open-sans_latin-ext/files/open-sans-latin-ext-800-italic.woff2') format('woff2'),
+ url('~@openfonts/open-sans_latin-ext/files/open-sans-latin-ext-800-italic.woff') format('woff');
}
diff --git a/antora-ui-camel/yarn.lock b/antora-ui-camel/yarn.lock
index bb82215..9bfcc31 100644
--- a/antora-ui-camel/yarn.lock
+++ b/antora-ui-camel/yarn.lock
@@ -153,6 +153,11 @@
resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
+"@openfonts/open-sans_latin-ext@^1.44.0":
+ version "1.44.0"
+ resolved "https://registry.yarnpkg.com/@openfonts/open-sans_latin-ext/-/open-sans_latin-ext-1.44.0.tgz#27c0aaa932d1170cac285db1f9fe7aeb552dfcda"
+ integrity sha512-oMeVF6+MaXyec20zPaRru0YMuS8he7eqgvCHh6F3+jD/2d/NlmHPi/6tR9Yxm5xPWpOCu+abigEuWPDXVdUH8A==
+
"@sindresorhus/is@^0.7.0":
version "0.7.0"
resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
@@ -7888,11 +7893,6 @@ typeface-droid-sans-mono@^0.0.44:
resolved "https://registry.yarnpkg.com/typeface-droid-sans-mono/-/typeface-droid-sans-mono-0.0.44.tgz#186d544e3d59c55efc6e66979e5e2d22ee54e414"
integrity sha512-Mx5mDCSKlgL3SzTCVcqk0w3C4g53hmpONbwSqtwfa/U2QLFUw/bPGUgFXCnsFCBQm5OMbaKyvwXWZ0E0gQ5Gdg==
-typeface-open-sans@^0.0.54:
- version "0.0.54"
- resolved "https://registry.yarnpkg.com/typeface-open-sans/-/typeface-open-sans-0.0.54.tgz#20f5b5ea5c7f95d89dc1f8b2d2b1457680129cee"
- integrity sha512-w6wOd6EicZdZKf0jSU/K3EzEi3zFgvWQSN7NOpRIQI5KeMWmC5Pg/lqtBVJHB0pRChYRmLdhf4h8ROur0A3JZQ==
-
typescript@^3.2.1:
version "3.5.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"