You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by er...@apache.org on 2020/03/05 01:32:21 UTC
[incubator-superset] branch master updated: Introducing Inter UI &
Fira typefaces (#9207)
This is an automated email from the ASF dual-hosted git repository.
erikrit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new 7d572d9 Introducing Inter UI & Fira typefaces (#9207)
7d572d9 is described below
commit 7d572d9e9621e6c469d6db0afe650e41fcf297b1
Author: Erik Ritter <er...@airbnb.com>
AuthorDate: Wed Mar 4 17:32:08 2020 -0800
Introducing Inter UI & Fira typefaces (#9207)
* All the fonts!
* dynamic loading
* folderizing fonts by family
* Shuffling files, getting rid off LESS fanciness
* Fira Mono, consolidating on "specimen" for LESS filenames
* Fira Code
* switch for enabling ligatures
* ligatures off for now
* license
* nixing Fira Mono, using OTF features instead.
---
LICENSE.txt | 6 +-
superset-frontend/src/SqlLab/main.less | 1 +
.../stylesheets/fonts/FiraCode/specimen.less | 59 ++++++
.../fonts/FiraCode/woff/FiraCode-Bold.woff | Bin 0 -> 159636 bytes
.../fonts/FiraCode/woff/FiraCode-Light.woff | Bin 0 -> 144956 bytes
.../fonts/FiraCode/woff/FiraCode-Medium.woff | Bin 0 -> 146332 bytes
.../fonts/FiraCode/woff/FiraCode-Regular.woff | Bin 0 -> 146868 bytes
.../fonts/FiraCode/woff/FiraCode-Retina.woff | Bin 0 -> 145500 bytes
.../fonts/FiraCode/woff/FiraCode-VF.woff | Bin 0 -> 130108 bytes
.../fonts/FiraCode/woff2/FiraCode-Bold.woff2 | Bin 0 -> 122208 bytes
.../fonts/FiraCode/woff2/FiraCode-Light.woff2 | Bin 0 -> 113032 bytes
.../fonts/FiraCode/woff2/FiraCode-Medium.woff2 | Bin 0 -> 113720 bytes
.../fonts/FiraCode/woff2/FiraCode-Regular.woff2 | Bin 0 -> 114456 bytes
.../fonts/FiraCode/woff2/FiraCode-Retina.woff2 | Bin 0 -> 113088 bytes
.../fonts/FiraCode/woff2/FiraCode-VF.woff2 | Bin 0 -> 106584 bytes
.../stylesheets/fonts/InterUI/Inter-Black.woff | Bin 0 -> 140036 bytes
.../stylesheets/fonts/InterUI/Inter-Black.woff2 | Bin 0 -> 104524 bytes
.../fonts/InterUI/Inter-BlackItalic.woff | Bin 0 -> 145924 bytes
.../fonts/InterUI/Inter-BlackItalic.woff2 | Bin 0 -> 109900 bytes
.../stylesheets/fonts/InterUI/Inter-Bold.woff | Bin 0 -> 143708 bytes
.../stylesheets/fonts/InterUI/Inter-Bold.woff2 | Bin 0 -> 107400 bytes
.../fonts/InterUI/Inter-BoldItalic.woff | Bin 0 -> 149420 bytes
.../fonts/InterUI/Inter-BoldItalic.woff2 | Bin 0 -> 112580 bytes
.../stylesheets/fonts/InterUI/Inter-ExtraBold.woff | Bin 0 -> 143552 bytes
.../fonts/InterUI/Inter-ExtraBold.woff2 | Bin 0 -> 107552 bytes
.../fonts/InterUI/Inter-ExtraBoldItalic.woff | Bin 0 -> 149196 bytes
.../fonts/InterUI/Inter-ExtraBoldItalic.woff2 | Bin 0 -> 112876 bytes
.../fonts/InterUI/Inter-ExtraLight.woff | Bin 0 -> 141864 bytes
.../fonts/InterUI/Inter-ExtraLight.woff2 | Bin 0 -> 105960 bytes
.../fonts/InterUI/Inter-ExtraLightItalic.woff | Bin 0 -> 148688 bytes
.../fonts/InterUI/Inter-ExtraLightItalic.woff2 | Bin 0 -> 112056 bytes
.../stylesheets/fonts/InterUI/Inter-Italic.woff | Bin 0 -> 142744 bytes
.../stylesheets/fonts/InterUI/Inter-Italic.woff2 | Bin 0 -> 107508 bytes
.../stylesheets/fonts/InterUI/Inter-Light.woff | Bin 0 -> 141528 bytes
.../stylesheets/fonts/InterUI/Inter-Light.woff2 | Bin 0 -> 105640 bytes
.../fonts/InterUI/Inter-LightItalic.woff | Bin 0 -> 148436 bytes
.../fonts/InterUI/Inter-LightItalic.woff2 | Bin 0 -> 111968 bytes
.../stylesheets/fonts/InterUI/Inter-Medium.woff | Bin 0 -> 142836 bytes
.../stylesheets/fonts/InterUI/Inter-Medium.woff2 | Bin 0 -> 106720 bytes
.../fonts/InterUI/Inter-MediumItalic.woff | Bin 0 -> 149184 bytes
.../fonts/InterUI/Inter-MediumItalic.woff2 | Bin 0 -> 112504 bytes
.../stylesheets/fonts/InterUI/Inter-Regular.woff | Bin 0 -> 134652 bytes
.../stylesheets/fonts/InterUI/Inter-Regular.woff2 | Bin 0 -> 100124 bytes
.../stylesheets/fonts/InterUI/Inter-SemiBold.woff | Bin 0 -> 143248 bytes
.../stylesheets/fonts/InterUI/Inter-SemiBold.woff2 | Bin 0 -> 107232 bytes
.../fonts/InterUI/Inter-SemiBoldItalic.woff | Bin 0 -> 149276 bytes
.../fonts/InterUI/Inter-SemiBoldItalic.woff2 | Bin 0 -> 112552 bytes
.../stylesheets/fonts/InterUI/Inter-Thin.woff | Bin 0 -> 136952 bytes
.../stylesheets/fonts/InterUI/Inter-Thin.woff2 | Bin 0 -> 101408 bytes
.../fonts/InterUI/Inter-ThinItalic.woff | Bin 0 -> 144412 bytes
.../fonts/InterUI/Inter-ThinItalic.woff2 | Bin 0 -> 107496 bytes
.../fonts/InterUI/Inter-italic.var.woff2 | Bin 0 -> 240688 bytes
.../fonts/InterUI/Inter-roman.var.woff2 | Bin 0 -> 226368 bytes
.../stylesheets/fonts/InterUI/Inter.var.woff2 | Bin 0 -> 316604 bytes
.../stylesheets/fonts/InterUI/specimen.less | 210 +++++++++++++++++++++
.../stylesheets/fonts/Roboto-Regular.woff | Bin 89828 -> 0 bytes
.../stylesheets/fonts/Roboto-Regular.woff2 | Bin 64832 -> 0 bytes
.../stylesheets/less/{index.less => fonts.less} | 36 +---
superset-frontend/stylesheets/less/index.less | 1 +
superset-frontend/stylesheets/less/variables.less | 12 +-
superset-frontend/stylesheets/superset.less | 1 +
61 files changed, 295 insertions(+), 31 deletions(-)
diff --git a/LICENSE.txt b/LICENSE.txt
index cdf3a17..bc58fdc 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -208,9 +208,9 @@ limitations under the License.
subcomponents is subject to the terms and conditions of the following
licenses.
-
========================================================================
-Third party Apache 2.0 licenses
+Third party SIL Open Font License v1.1 (OFL-1.1)
========================================================================
-(Apache 2.0 License) The Roboto family of fonts (https://github.com/google/roboto)
+(SIL OPEN FONT LICENSE Version 1.1) The Inter font family (https://github.com/rsms/inter)
+(SIL OPEN FONT LICENSE Version 1.1) The Fira Code font family (https://github.com/tonsky/FiraCode)
\ No newline at end of file
diff --git a/superset-frontend/src/SqlLab/main.less b/superset-frontend/src/SqlLab/main.less
index 1c6d1ec..809e099 100644
--- a/superset-frontend/src/SqlLab/main.less
+++ b/superset-frontend/src/SqlLab/main.less
@@ -368,6 +368,7 @@ div.tablePopover {
.ace_editor,
.ace_editor div {
+ font-feature-settings: @font-feature-settings;
font-family: @font-family-monospace;
}
diff --git a/superset-frontend/stylesheets/fonts/FiraCode/specimen.less b/superset-frontend/stylesheets/fonts/FiraCode/specimen.less
new file mode 100644
index 0000000..03d7b89
--- /dev/null
+++ b/superset-frontend/stylesheets/fonts/FiraCode/specimen.less
@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+@font-face {
+ font-family: 'Fira Code';
+ src: url('woff2/FiraCode-Light.woff2') format('woff2'),
+ url("woff/FiraCode-Light.woff") format("woff");
+ font-weight: 300;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Fira Code';
+ src: url('woff2/FiraCode-Regular.woff2') format('woff2'),
+ url("woff/FiraCode-Regular.woff") format("woff");
+ font-weight: 400;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Fira Code';
+ src: url('woff2/FiraCode-Medium.woff2') format('woff2'),
+ url("woff/FiraCode-Medium.woff") format("woff");
+ font-weight: 500;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Fira Code';
+ src: url('woff2/FiraCode-Bold.woff2') format('woff2'),
+ url("woff/FiraCode-Bold.woff") format("woff");
+ font-weight: 700;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Fira Code VF';
+ src: url('woff2/FiraCode-VF.woff2') format('woff2-variations'),
+ url('woff/FiraCode-VF.woff') format('woff-variations');
+ /* font-weight requires a range: https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide#Using_a_variable_font_font-face_changes */
+ font-weight: 300 700;
+ font-style: normal;
+}
diff --git a/superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-Bold.woff b/superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-Bold.woff
new file mode 100644
index 0000000..9985076
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-Bold.woff differ
diff --git a/superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-Light.woff b/superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-Light.woff
new file mode 100644
index 0000000..5718390
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-Light.woff differ
diff --git a/superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-Medium.woff b/superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-Medium.woff
new file mode 100644
index 0000000..16281b2
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-Medium.woff differ
diff --git a/superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-Regular.woff b/superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-Regular.woff
new file mode 100644
index 0000000..d250d45
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-Regular.woff differ
diff --git a/superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-Retina.woff b/superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-Retina.woff
new file mode 100644
index 0000000..b387e83
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-Retina.woff differ
diff --git a/superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-VF.woff b/superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-VF.woff
new file mode 100644
index 0000000..e67183e
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-VF.woff differ
diff --git a/superset-frontend/stylesheets/fonts/FiraCode/woff2/FiraCode-Bold.woff2 b/superset-frontend/stylesheets/fonts/FiraCode/woff2/FiraCode-Bold.woff2
new file mode 100644
index 0000000..c386d4c
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/FiraCode/woff2/FiraCode-Bold.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/FiraCode/woff2/FiraCode-Light.woff2 b/superset-frontend/stylesheets/fonts/FiraCode/woff2/FiraCode-Light.woff2
new file mode 100644
index 0000000..3f26550
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/FiraCode/woff2/FiraCode-Light.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/FiraCode/woff2/FiraCode-Medium.woff2 b/superset-frontend/stylesheets/fonts/FiraCode/woff2/FiraCode-Medium.woff2
new file mode 100644
index 0000000..2e494fd
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/FiraCode/woff2/FiraCode-Medium.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/FiraCode/woff2/FiraCode-Regular.woff2 b/superset-frontend/stylesheets/fonts/FiraCode/woff2/FiraCode-Regular.woff2
new file mode 100644
index 0000000..d58667c
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/FiraCode/woff2/FiraCode-Regular.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/FiraCode/woff2/FiraCode-Retina.woff2 b/superset-frontend/stylesheets/fonts/FiraCode/woff2/FiraCode-Retina.woff2
new file mode 100644
index 0000000..2db81c2
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/FiraCode/woff2/FiraCode-Retina.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/FiraCode/woff2/FiraCode-VF.woff2 b/superset-frontend/stylesheets/fonts/FiraCode/woff2/FiraCode-VF.woff2
new file mode 100644
index 0000000..6691379
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/FiraCode/woff2/FiraCode-VF.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-Black.woff b/superset-frontend/stylesheets/fonts/InterUI/Inter-Black.woff
new file mode 100644
index 0000000..c7737ed
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-Black.woff differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-Black.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter-Black.woff2
new file mode 100644
index 0000000..b16b995
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-Black.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-BlackItalic.woff b/superset-frontend/stylesheets/fonts/InterUI/Inter-BlackItalic.woff
new file mode 100644
index 0000000..b5f1447
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-BlackItalic.woff differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-BlackItalic.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter-BlackItalic.woff2
new file mode 100644
index 0000000..a3f1b70
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-BlackItalic.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-Bold.woff b/superset-frontend/stylesheets/fonts/InterUI/Inter-Bold.woff
new file mode 100644
index 0000000..e384555
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-Bold.woff differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-Bold.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter-Bold.woff2
new file mode 100644
index 0000000..835dd49
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-Bold.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-BoldItalic.woff b/superset-frontend/stylesheets/fonts/InterUI/Inter-BoldItalic.woff
new file mode 100644
index 0000000..ffac3f5
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-BoldItalic.woff differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-BoldItalic.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter-BoldItalic.woff2
new file mode 100644
index 0000000..1a41a14
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-BoldItalic.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraBold.woff b/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraBold.woff
new file mode 100644
index 0000000..885ac94
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraBold.woff differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraBold.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraBold.woff2
new file mode 100644
index 0000000..ae956b1
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraBold.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraBoldItalic.woff b/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraBoldItalic.woff
new file mode 100644
index 0000000..d6cf862
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraBoldItalic.woff differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraBoldItalic.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraBoldItalic.woff2
new file mode 100644
index 0000000..8657899
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraBoldItalic.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraLight.woff b/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraLight.woff
new file mode 100644
index 0000000..ff76919
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraLight.woff differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraLight.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraLight.woff2
new file mode 100644
index 0000000..694b2df
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraLight.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraLightItalic.woff b/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraLightItalic.woff
new file mode 100644
index 0000000..c6ed13a
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraLightItalic.woff differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraLightItalic.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraLightItalic.woff2
new file mode 100644
index 0000000..9a7bd11
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-ExtraLightItalic.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-Italic.woff b/superset-frontend/stylesheets/fonts/InterUI/Inter-Italic.woff
new file mode 100644
index 0000000..4fdb59d
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-Italic.woff differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-Italic.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter-Italic.woff2
new file mode 100644
index 0000000..deca637
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-Italic.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-Light.woff b/superset-frontend/stylesheets/fonts/InterUI/Inter-Light.woff
new file mode 100644
index 0000000..42850ac
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-Light.woff differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-Light.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter-Light.woff2
new file mode 100644
index 0000000..65a7dad
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-Light.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-LightItalic.woff b/superset-frontend/stylesheets/fonts/InterUI/Inter-LightItalic.woff
new file mode 100644
index 0000000..c4ed9a9
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-LightItalic.woff differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-LightItalic.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter-LightItalic.woff2
new file mode 100644
index 0000000..555fc55
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-LightItalic.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-Medium.woff b/superset-frontend/stylesheets/fonts/InterUI/Inter-Medium.woff
new file mode 100644
index 0000000..495faef
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-Medium.woff differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-Medium.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter-Medium.woff2
new file mode 100644
index 0000000..871ce4c
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-Medium.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-MediumItalic.woff b/superset-frontend/stylesheets/fonts/InterUI/Inter-MediumItalic.woff
new file mode 100644
index 0000000..389c7a2
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-MediumItalic.woff differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-MediumItalic.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter-MediumItalic.woff2
new file mode 100644
index 0000000..aa80579
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-MediumItalic.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-Regular.woff b/superset-frontend/stylesheets/fonts/InterUI/Inter-Regular.woff
new file mode 100644
index 0000000..fa7715d
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-Regular.woff differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-Regular.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter-Regular.woff2
new file mode 100644
index 0000000..b52dd0a
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-Regular.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-SemiBold.woff b/superset-frontend/stylesheets/fonts/InterUI/Inter-SemiBold.woff
new file mode 100644
index 0000000..18d7749
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-SemiBold.woff differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-SemiBold.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter-SemiBold.woff2
new file mode 100644
index 0000000..ece5204
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-SemiBold.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-SemiBoldItalic.woff b/superset-frontend/stylesheets/fonts/InterUI/Inter-SemiBoldItalic.woff
new file mode 100644
index 0000000..8ee6439
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-SemiBoldItalic.woff differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-SemiBoldItalic.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter-SemiBoldItalic.woff2
new file mode 100644
index 0000000..b32c0ba
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-SemiBoldItalic.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-Thin.woff b/superset-frontend/stylesheets/fonts/InterUI/Inter-Thin.woff
new file mode 100644
index 0000000..1a22286
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-Thin.woff differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-Thin.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter-Thin.woff2
new file mode 100644
index 0000000..c56bc7c
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-Thin.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-ThinItalic.woff b/superset-frontend/stylesheets/fonts/InterUI/Inter-ThinItalic.woff
new file mode 100644
index 0000000..d8ec837
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-ThinItalic.woff differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-ThinItalic.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter-ThinItalic.woff2
new file mode 100644
index 0000000..eca5608
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-ThinItalic.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-italic.var.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter-italic.var.woff2
new file mode 100644
index 0000000..1f5d926
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-italic.var.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter-roman.var.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter-roman.var.woff2
new file mode 100644
index 0000000..05621d8
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter-roman.var.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/Inter.var.woff2 b/superset-frontend/stylesheets/fonts/InterUI/Inter.var.woff2
new file mode 100644
index 0000000..46bb515
Binary files /dev/null and b/superset-frontend/stylesheets/fonts/InterUI/Inter.var.woff2 differ
diff --git a/superset-frontend/stylesheets/fonts/InterUI/specimen.less b/superset-frontend/stylesheets/fonts/InterUI/specimen.less
new file mode 100644
index 0000000..4d18941
--- /dev/null
+++ b/superset-frontend/stylesheets/fonts/InterUI/specimen.less
@@ -0,0 +1,210 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+@font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 100;
+ font-display: swap;
+ src: url("./Inter-Thin.woff2?v=3.12") format("woff2"),
+ url("./Inter-Thin.woff?v=3.12") format("woff");
+}
+@font-face {
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 100;
+ font-display: swap;
+ src: url("./Inter-ThinItalic.woff2?v=3.12") format("woff2"),
+ url("./Inter-ThinItalic.woff?v=3.12") format("woff");
+}
+@font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 200;
+ font-display: swap;
+ src: url("./Inter-ExtraLight.woff2?v=3.12") format("woff2"),
+ url("./Inter-ExtraLight.woff?v=3.12") format("woff");
+}
+@font-face {
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 200;
+ font-display: swap;
+ src: url("./Inter-ExtraLightItalic.woff2?v=3.12") format("woff2"),
+ url("./Inter-ExtraLightItalic.woff?v=3.12") format("woff");
+}
+@font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 300;
+ font-display: swap;
+ src: url("./Inter-Light.woff2?v=3.12") format("woff2"),
+ url("./Inter-Light.woff?v=3.12") format("woff");
+}
+@font-face {
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 300;
+ font-display: swap;
+ src: url("./Inter-LightItalic.woff2?v=3.12") format("woff2"),
+ url("./Inter-LightItalic.woff?v=3.12") format("woff");
+}
+@font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 400;
+ font-display: swap;
+ src: url("./Inter-Regular.woff2?v=3.12") format("woff2"),
+ url("./Inter-Regular.woff?v=3.12") format("woff");
+}
+@font-face {
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 400;
+ font-display: swap;
+ src: url("./Inter-Italic.woff2?v=3.12") format("woff2"),
+ url("./Inter-Italic.woff?v=3.12") format("woff");
+}
+@font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 500;
+ font-display: swap;
+ src: url("./Inter-Medium.woff2?v=3.12") format("woff2"),
+ url("./Inter-Medium.woff?v=3.12") format("woff");
+}
+@font-face {
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 500;
+ font-display: swap;
+ src: url("./Inter-MediumItalic.woff2?v=3.12") format("woff2"),
+ url("./Inter-MediumItalic.woff?v=3.12") format("woff");
+}
+@font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 600;
+ font-display: swap;
+ src: url("./Inter-SemiBold.woff2?v=3.12") format("woff2"),
+ url("./Inter-SemiBold.woff?v=3.12") format("woff");
+}
+@font-face {
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 600;
+ font-display: swap;
+ src: url("./Inter-SemiBoldItalic.woff2?v=3.12") format("woff2"),
+ url("./Inter-SemiBoldItalic.woff?v=3.12") format("woff");
+}
+@font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 700;
+ font-display: swap;
+ src: url("./Inter-Bold.woff2?v=3.12") format("woff2"),
+ url("./Inter-Bold.woff?v=3.12") format("woff");
+}
+@font-face {
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 700;
+ font-display: swap;
+ src: url("./Inter-BoldItalic.woff2?v=3.12") format("woff2"),
+ url("./Inter-BoldItalic.woff?v=3.12") format("woff");
+}
+@font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 800;
+ font-display: swap;
+ src: url("./Inter-ExtraBold.woff2?v=3.12") format("woff2"),
+ url("./Inter-ExtraBold.woff?v=3.12") format("woff");
+}
+@font-face {
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 800;
+ font-display: swap;
+ src: url("./Inter-ExtraBoldItalic.woff2?v=3.12") format("woff2"),
+ url("./Inter-ExtraBoldItalic.woff?v=3.12") format("woff");
+}
+@font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 900;
+ font-display: swap;
+ src: url("./Inter-Black.woff2?v=3.12") format("woff2"),
+ url("./Inter-Black.woff?v=3.12") format("woff");
+}
+@font-face {
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 900;
+ font-display: swap;
+ src: url("./Inter-BlackItalic.woff2?v=3.12") format("woff2"),
+ url("./Inter-BlackItalic.woff?v=3.12") format("woff");
+}
+
+/* -------------------------------------------------------
+Variable font.
+Usage:
+
+ html { font-family: 'Inter', sans-serif; }
+ @supports (font-variation-settings: normal) {
+ html { font-family: 'Inter var', sans-serif; }
+ }
+*/
+@font-face {
+ font-family: 'Inter var';
+ font-weight: 100 900;
+ font-display: swap;
+ font-style: normal;
+ font-named-instance: 'Regular';
+ src: url("./Inter-roman.var.woff2?v=3.12") format("woff2");
+}
+@font-face {
+ font-family: 'Inter var';
+ font-weight: 100 900;
+ font-display: swap;
+ font-style: italic;
+ font-named-instance: 'Italic';
+ src: url("./Inter-italic.var.woff2?v=3.12") format("woff2");
+}
+
+/* --------------------------------------------------------------------------
+[EXPERIMENTAL] Multi-axis, single variable font.
+
+Slant axis is not yet widely supported (as of February 2019) and thus this
+multi-axis single variable font is opt-in rather than the default.
+
+When using this, you will probably need to set font-variation-settings
+explicitly, e.g.
+
+ * { font-variation-settings: "slnt" 0deg }
+ .italic { font-variation-settings: "slnt" 10deg }
+
+*/
+@font-face {
+ font-family: 'Inter var experimental';
+ font-weight: 100 900;
+ font-display: swap;
+ font-style: oblique 0deg 10deg;
+ src: url("./Inter.var.woff2?v=3.12") format("woff2");
+}
diff --git a/superset-frontend/stylesheets/fonts/Roboto-Regular.woff b/superset-frontend/stylesheets/fonts/Roboto-Regular.woff
deleted file mode 100644
index e401bcf..0000000
Binary files a/superset-frontend/stylesheets/fonts/Roboto-Regular.woff and /dev/null differ
diff --git a/superset-frontend/stylesheets/fonts/Roboto-Regular.woff2 b/superset-frontend/stylesheets/fonts/Roboto-Regular.woff2
deleted file mode 100644
index 5bd7bd6..0000000
Binary files a/superset-frontend/stylesheets/fonts/Roboto-Regular.woff2 and /dev/null differ
diff --git a/superset-frontend/stylesheets/less/index.less b/superset-frontend/stylesheets/less/fonts.less
similarity index 53%
copy from superset-frontend/stylesheets/less/index.less
copy to superset-frontend/stylesheets/less/fonts.less
index 48f45b0..f073134 100644
--- a/superset-frontend/stylesheets/less/index.less
+++ b/superset-frontend/stylesheets/less/fonts.less
@@ -16,33 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-// Index .less, any imports here will be included in the final css build
-@import '~bootstrap/less/bootstrap.less';
-@import './variables.less';
-@import './cosmo/bootswatch.less';
-html,
-body {
- font-size: @font-size-base;
- line-height: @line-height-base;
-}
+/*************************************************************************/
+/* USAGE NOTES */
+/* Each typeface used in Superset should have local webfont files. */
+/* Maintain separate specimen sheets so it's easier to add/remove fonts. */
+/* NOTE: Add font all licenses to LICENSE.text */
+/*************************************************************************/
-body {
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- display: flex;
- flex-direction: column;
-}
+/******************************* Inter UI ********************************/
+@import '../fonts/InterUI/specimen.less';
-header {
- flex: 0 1 auto;
-}
-
-#app {
- flex: 1 1 auto;
- position: relative;
-}
+/******************************* Fira Code ********************************/
+@import '../fonts/FiraCode/specimen.less';
diff --git a/superset-frontend/stylesheets/less/index.less b/superset-frontend/stylesheets/less/index.less
index 48f45b0..86a8989 100644
--- a/superset-frontend/stylesheets/less/index.less
+++ b/superset-frontend/stylesheets/less/index.less
@@ -19,6 +19,7 @@
// Index .less, any imports here will be included in the final css build
@import '~bootstrap/less/bootstrap.less';
+@import './fonts.less';
@import './variables.less';
@import './cosmo/bootswatch.less';
diff --git a/superset-frontend/stylesheets/less/variables.less b/superset-frontend/stylesheets/less/variables.less
index 34f3c3d..0cfbc17 100644
--- a/superset-frontend/stylesheets/less/variables.less
+++ b/superset-frontend/stylesheets/less/variables.less
@@ -152,10 +152,18 @@
@line-height-normal: @line-height-base;
@line-height-loose: 2;
+// ****************************** Features *******************************
+@use-ligatures: false;
+
+// setting up OTF settings based on @use-ligatures:
+.set-otf-options(@use-ligatures);
+.set-otf-options(true) {@font-feature-settings: "liga" on, "calt" on}
+.set-otf-options(false) {@font-feature-settings: "liga" off, "calt" off}
+
// ****************************** Families ******************************
-@font-family-sans-serif: Helvetica, Arial;
+@font-family-sans-serif: "Inter", Helvetica, Arial;
@font-family-serif: Georgia, 'Times New Roman', Times, serif;
-@font-family-monospace: Menlo, Monaco, Consolas, 'Courier New', monospace;
+@font-family-monospace: 'Fira Code', 'Courier New', monospace;
@font-family-base: @font-family-sans-serif;
/************************************************************************/
diff --git a/superset-frontend/stylesheets/superset.less b/superset-frontend/stylesheets/superset.less
index 8508e6e..20f5cb8 100644
--- a/superset-frontend/stylesheets/superset.less
+++ b/superset-frontend/stylesheets/superset.less
@@ -231,6 +231,7 @@ table.table-no-hover tr:hover {
}
.editable-title.datasource-sql-expression {
+ font-feature-settings: @font-feature-settings;
font-family: @font-family-monospace;
display: inline-block;
min-width: @datasource-sql-expression-width;