You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by fr...@apache.org on 2025/02/17 03:31:13 UTC
(calcite) branch main updated (d7cd6dc096 -> 7d382129ad)
This is an automated email from the ASF dual-hosted git repository.
francischuang pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git
discard d7cd6dc096 [CALCITE-6843] Self-host Lato font on website due to ASF's content security policy
new 7d382129ad [CALCITE-6843] Self-host Lato font on website due to ASF's content security policy
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d7cd6dc096)
\
N -- N -- N refs/heads/main (7d382129ad)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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.
Summary of changes:
LICENSE | 4 ++++
1 file changed, 4 insertions(+)
(calcite) 01/01: [CALCITE-6843] Self-host Lato font on website due to ASF's content security policy
Posted by fr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
francischuang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git
commit 7d382129ad615010310f2097b42494f99f38e8a3
Author: Francis Chuang <fr...@apache.org>
AuthorDate: Mon Feb 17 14:29:00 2025 +1100
[CALCITE-6843] Self-host Lato font on website due to ASF's content security policy
---
LICENSE | 4 ++
site/Gemfile.lock | 30 ++++++----
site/_sass/_lato.scss | 112 +++++++++++++++++++++++++++++++++++
site/css/screen.scss | 1 +
site/fonts/lato-300-ext.woff2 | Bin 0 -> 5624 bytes
site/fonts/lato-300.woff2 | Bin 0 -> 23236 bytes
site/fonts/lato-400-ext.woff2 | Bin 0 -> 5472 bytes
site/fonts/lato-400.woff2 | Bin 0 -> 23580 bytes
site/fonts/lato-700-ext.woff2 | Bin 0 -> 5368 bytes
site/fonts/lato-700.woff2 | Bin 0 -> 23040 bytes
site/fonts/lato-900-ext.woff2 | Bin 0 -> 5412 bytes
site/fonts/lato-900.woff2 | Bin 0 -> 22504 bytes
site/fonts/lato-italic-300-ext.woff2 | Bin 0 -> 4340 bytes
site/fonts/lato-italic-300.woff2 | Bin 0 -> 17728 bytes
site/fonts/lato-italic-400-ext.woff2 | Bin 0 -> 5600 bytes
site/fonts/lato-italic-400.woff2 | Bin 0 -> 24408 bytes
site/fonts/lato-italic-700-ext.woff2 | Bin 0 -> 5616 bytes
site/fonts/lato-italic-700.woff2 | Bin 0 -> 24448 bytes
18 files changed, 134 insertions(+), 13 deletions(-)
diff --git a/LICENSE b/LICENSE
index a87594d500..bdd603ed05 100644
--- a/LICENSE
+++ b/LICENSE
@@ -194,3 +194,7 @@ site/_sass/_mixins.scss
site/_sass/_pygments.scss
* normalize:normalize:3.0.2
site/_sass/_normalize.scss
+
+SIL Open Font License
+* lato-fonts:lato
+site/_sass/_lato.scss
diff --git a/site/Gemfile.lock b/site/Gemfile.lock
index 7211c6b6ca..bf5ad9a59e 100644
--- a/site/Gemfile.lock
+++ b/site/Gemfile.lock
@@ -39,17 +39,20 @@ GEM
http_parser.rb (0.8.0)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
- jekyll (4.3.4)
+ jekyll (4.4.1)
addressable (~> 2.4)
+ base64 (~> 0.2)
colorator (~> 1.0)
+ csv (~> 3.0)
em-websocket (~> 0.5)
i18n (~> 1.0)
jekyll-sass-converter (>= 2.0, < 4.0)
jekyll-watch (~> 2.0)
+ json (~> 2.6)
kramdown (~> 2.3, >= 2.3.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
- mercenary (>= 0.3.6, < 0.5)
+ mercenary (~> 0.3, >= 0.3.6)
pathutil (~> 0.9)
rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.0)
@@ -57,10 +60,11 @@ GEM
webrick (~> 1.7)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
- jekyll-sass-converter (3.0.0)
- sass-embedded (~> 1.54)
+ jekyll-sass-converter (3.1.0)
+ sass-embedded (~> 1.75)
jekyll-watch (2.2.1)
listen (~> 3.0)
+ json (2.10.1)
kramdown (2.5.1)
rexml (>= 3.3.9)
kramdown-parser-gfm (1.1.0)
@@ -94,24 +98,24 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
- rexml (3.4.0)
+ rexml (3.4.1)
rouge (4.5.1)
safe_yaml (1.0.5)
- sass-embedded (1.83.4-aarch64-linux-gnu)
+ sass-embedded (1.85.0-aarch64-linux-gnu)
google-protobuf (~> 4.29)
- sass-embedded (1.83.4-aarch64-linux-musl)
+ sass-embedded (1.85.0-aarch64-linux-musl)
google-protobuf (~> 4.29)
- sass-embedded (1.83.4-arm-linux-gnueabihf)
+ sass-embedded (1.85.0-arm-linux-gnueabihf)
google-protobuf (~> 4.29)
- sass-embedded (1.83.4-arm-linux-musleabihf)
+ sass-embedded (1.85.0-arm-linux-musleabihf)
google-protobuf (~> 4.29)
- sass-embedded (1.83.4-arm64-darwin)
+ sass-embedded (1.85.0-arm64-darwin)
google-protobuf (~> 4.29)
- sass-embedded (1.83.4-x86_64-darwin)
+ sass-embedded (1.85.0-x86_64-darwin)
google-protobuf (~> 4.29)
- sass-embedded (1.83.4-x86_64-linux-gnu)
+ sass-embedded (1.85.0-x86_64-linux-gnu)
google-protobuf (~> 4.29)
- sass-embedded (1.83.4-x86_64-linux-musl)
+ sass-embedded (1.85.0-x86_64-linux-musl)
google-protobuf (~> 4.29)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
diff --git a/site/_sass/_lato.scss b/site/_sass/_lato.scss
new file mode 100644
index 0000000000..0bd70d0ad2
--- /dev/null
+++ b/site/_sass/_lato.scss
@@ -0,0 +1,112 @@
+/* latin-ext */
+@font-face {
+ font-family: 'Lato';
+ font-style: italic;
+ font-weight: 300;
+ src: url('../fonts/lato-italic-300-ext.woff2') format('woff2');
+ unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+ font-family: 'Lato';
+ font-style: italic;
+ font-weight: 300;
+ src: url('../fonts/lato-italic-300.woff2') format('woff2');
+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin-ext */
+@font-face {
+ font-family: 'Lato';
+ font-style: italic;
+ font-weight: 400;
+ src: url('../fonts/lato-italic-400-ext.woff2') format('woff2');
+ unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+ font-family: 'Lato';
+ font-style: italic;
+ font-weight: 400;
+ src: url('../fonts/lato-italic-400.woff2') format('woff2');
+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin-ext */
+@font-face {
+ font-family: 'Lato';
+ font-style: italic;
+ font-weight: 700;
+ src: url('../fonts/lato-italic-700-ext.woff2') format('woff2');
+ unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+ font-family: 'Lato';
+ font-style: italic;
+ font-weight: 700;
+ src: url('../fonts/lato-italic-700.woff2') format('woff2');
+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin-ext */
+@font-face {
+ font-family: 'Lato';
+ font-style: normal;
+ font-weight: 300;
+ src: url('../fonts/lato-300-ext.woff2') format('woff2');
+ unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+ font-family: 'Lato';
+ font-style: normal;
+ font-weight: 300;
+ src: url('../fonts/lato-300.woff2') format('woff2');
+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin-ext */
+@font-face {
+ font-family: 'Lato';
+ font-style: normal;
+ font-weight: 400;
+ src: url('../fonts/lato-400-ext.woff2') format('woff2');
+ unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+ font-family: 'Lato';
+ font-style: normal;
+ font-weight: 400;
+ src: url('../fonts/lato-400.woff2') format('woff2');
+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin-ext */
+@font-face {
+ font-family: 'Lato';
+ font-style: normal;
+ font-weight: 700;
+ src: url('../fonts/lato-700-ext.woff2') format('woff2');
+ unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+ font-family: 'Lato';
+ font-style: normal;
+ font-weight: 700;
+ src: url('../fonts/lato-700.woff2') format('woff2');
+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* latin-ext */
+@font-face {
+ font-family: 'Lato';
+ font-style: normal;
+ font-weight: 900;
+ src: url('../fonts/lato-900-ext.woff2') format('woff2');
+ unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+ font-family: 'Lato';
+ font-style: normal;
+ font-weight: 900;
+ src: url('../fonts/lato-900.woff2') format('woff2');
+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/site/css/screen.scss b/site/css/screen.scss
index 47937f7700..bfabc810d7 100644
--- a/site/css/screen.scss
+++ b/site/css/screen.scss
@@ -6,5 +6,6 @@
@use "gridism";
@use "pygments";
@use "font-awesome";
+@use "lato";
@use "style";
diff --git a/site/fonts/lato-300-ext.woff2 b/site/fonts/lato-300-ext.woff2
new file mode 100644
index 0000000000..486d3ecf0a
Binary files /dev/null and b/site/fonts/lato-300-ext.woff2 differ
diff --git a/site/fonts/lato-300.woff2 b/site/fonts/lato-300.woff2
new file mode 100644
index 0000000000..aad98a3390
Binary files /dev/null and b/site/fonts/lato-300.woff2 differ
diff --git a/site/fonts/lato-400-ext.woff2 b/site/fonts/lato-400-ext.woff2
new file mode 100644
index 0000000000..edb9fa6f49
Binary files /dev/null and b/site/fonts/lato-400-ext.woff2 differ
diff --git a/site/fonts/lato-400.woff2 b/site/fonts/lato-400.woff2
new file mode 100644
index 0000000000..ff60934dd0
Binary files /dev/null and b/site/fonts/lato-400.woff2 differ
diff --git a/site/fonts/lato-700-ext.woff2 b/site/fonts/lato-700-ext.woff2
new file mode 100644
index 0000000000..2c8aaa866e
Binary files /dev/null and b/site/fonts/lato-700-ext.woff2 differ
diff --git a/site/fonts/lato-700.woff2 b/site/fonts/lato-700.woff2
new file mode 100644
index 0000000000..11de83feaf
Binary files /dev/null and b/site/fonts/lato-700.woff2 differ
diff --git a/site/fonts/lato-900-ext.woff2 b/site/fonts/lato-900-ext.woff2
new file mode 100644
index 0000000000..6833c7f3d5
Binary files /dev/null and b/site/fonts/lato-900-ext.woff2 differ
diff --git a/site/fonts/lato-900.woff2 b/site/fonts/lato-900.woff2
new file mode 100644
index 0000000000..72a9bc3041
Binary files /dev/null and b/site/fonts/lato-900.woff2 differ
diff --git a/site/fonts/lato-italic-300-ext.woff2 b/site/fonts/lato-italic-300-ext.woff2
new file mode 100644
index 0000000000..f17999bd2f
Binary files /dev/null and b/site/fonts/lato-italic-300-ext.woff2 differ
diff --git a/site/fonts/lato-italic-300.woff2 b/site/fonts/lato-italic-300.woff2
new file mode 100644
index 0000000000..394b5cf643
Binary files /dev/null and b/site/fonts/lato-italic-300.woff2 differ
diff --git a/site/fonts/lato-italic-400-ext.woff2 b/site/fonts/lato-italic-400-ext.woff2
new file mode 100644
index 0000000000..15be816ab2
Binary files /dev/null and b/site/fonts/lato-italic-400-ext.woff2 differ
diff --git a/site/fonts/lato-italic-400.woff2 b/site/fonts/lato-italic-400.woff2
new file mode 100644
index 0000000000..851630ff85
Binary files /dev/null and b/site/fonts/lato-italic-400.woff2 differ
diff --git a/site/fonts/lato-italic-700-ext.woff2 b/site/fonts/lato-italic-700-ext.woff2
new file mode 100644
index 0000000000..f59e721c38
Binary files /dev/null and b/site/fonts/lato-italic-700-ext.woff2 differ
diff --git a/site/fonts/lato-italic-700.woff2 b/site/fonts/lato-italic-700.woff2
new file mode 100644
index 0000000000..38df58bff4
Binary files /dev/null and b/site/fonts/lato-italic-700.woff2 differ