You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by vi...@apache.org on 2020/11/17 07:43:26 UTC
[incubator-superset] 01/02: refactor: Load fonts from packages
rather than local binaries (#11718)
This is an automated email from the ASF dual-hosted git repository.
villebro pushed a commit to branch 0.38
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
commit 140be0003a0ba4509f9c563962a7517a8764cd7f
Author: Evan Rusackas <ev...@preset.io>
AuthorDate: Mon Nov 16 17:10:48 2020 -0800
refactor: Load fonts from packages rather than local binaries (#11718)
* removing binaries
* adding npm packages
* nixing unused specimen sheet
* deleting specimen sheets
* using imported css sheets from npm
* package lock
* fixing webpack issue with font loading
* raising specificity on ACE editor fonts
* linting :sparkles:
---
superset-frontend/fonts/FiraCode/specimen.less | 59 ------
.../fonts/FiraCode/woff/FiraCode-Bold.woff | Bin 159636 -> 0 bytes
.../fonts/FiraCode/woff/FiraCode-Light.woff | Bin 144956 -> 0 bytes
.../fonts/FiraCode/woff/FiraCode-Medium.woff | Bin 146332 -> 0 bytes
.../fonts/FiraCode/woff/FiraCode-Regular.woff | Bin 146868 -> 0 bytes
.../fonts/FiraCode/woff/FiraCode-Retina.woff | Bin 145500 -> 0 bytes
.../fonts/FiraCode/woff/FiraCode-VF.woff | Bin 130108 -> 0 bytes
.../fonts/FiraCode/woff2/FiraCode-Bold.woff2 | Bin 122208 -> 0 bytes
.../fonts/FiraCode/woff2/FiraCode-Light.woff2 | Bin 113032 -> 0 bytes
.../fonts/FiraCode/woff2/FiraCode-Medium.woff2 | Bin 113720 -> 0 bytes
.../fonts/FiraCode/woff2/FiraCode-Regular.woff2 | Bin 114456 -> 0 bytes
.../fonts/FiraCode/woff2/FiraCode-Retina.woff2 | Bin 113088 -> 0 bytes
.../fonts/FiraCode/woff2/FiraCode-VF.woff2 | Bin 106584 -> 0 bytes
superset-frontend/fonts/InterUI/Inter-Black.woff | Bin 140036 -> 0 bytes
superset-frontend/fonts/InterUI/Inter-Black.woff2 | Bin 104524 -> 0 bytes
.../fonts/InterUI/Inter-BlackItalic.woff | Bin 145924 -> 0 bytes
.../fonts/InterUI/Inter-BlackItalic.woff2 | Bin 109900 -> 0 bytes
superset-frontend/fonts/InterUI/Inter-Bold.woff | Bin 143708 -> 0 bytes
superset-frontend/fonts/InterUI/Inter-Bold.woff2 | Bin 107400 -> 0 bytes
.../fonts/InterUI/Inter-BoldItalic.woff | Bin 149420 -> 0 bytes
.../fonts/InterUI/Inter-BoldItalic.woff2 | Bin 112580 -> 0 bytes
.../fonts/InterUI/Inter-ExtraBold.woff | Bin 143552 -> 0 bytes
.../fonts/InterUI/Inter-ExtraBold.woff2 | Bin 107552 -> 0 bytes
.../fonts/InterUI/Inter-ExtraBoldItalic.woff | Bin 149196 -> 0 bytes
.../fonts/InterUI/Inter-ExtraBoldItalic.woff2 | Bin 112876 -> 0 bytes
.../fonts/InterUI/Inter-ExtraLight.woff | Bin 141864 -> 0 bytes
.../fonts/InterUI/Inter-ExtraLight.woff2 | Bin 105960 -> 0 bytes
.../fonts/InterUI/Inter-ExtraLightItalic.woff | Bin 148688 -> 0 bytes
.../fonts/InterUI/Inter-ExtraLightItalic.woff2 | Bin 112056 -> 0 bytes
superset-frontend/fonts/InterUI/Inter-Italic.woff | Bin 142744 -> 0 bytes
superset-frontend/fonts/InterUI/Inter-Italic.woff2 | Bin 107508 -> 0 bytes
superset-frontend/fonts/InterUI/Inter-Light.woff | Bin 141528 -> 0 bytes
superset-frontend/fonts/InterUI/Inter-Light.woff2 | Bin 105640 -> 0 bytes
.../fonts/InterUI/Inter-LightItalic.woff | Bin 148436 -> 0 bytes
.../fonts/InterUI/Inter-LightItalic.woff2 | Bin 111968 -> 0 bytes
superset-frontend/fonts/InterUI/Inter-Medium.woff | Bin 142836 -> 0 bytes
superset-frontend/fonts/InterUI/Inter-Medium.woff2 | Bin 106720 -> 0 bytes
.../fonts/InterUI/Inter-MediumItalic.woff | Bin 149184 -> 0 bytes
.../fonts/InterUI/Inter-MediumItalic.woff2 | Bin 112504 -> 0 bytes
superset-frontend/fonts/InterUI/Inter-Regular.woff | Bin 134652 -> 0 bytes
.../fonts/InterUI/Inter-Regular.woff2 | Bin 100124 -> 0 bytes
.../fonts/InterUI/Inter-SemiBold.woff | Bin 143248 -> 0 bytes
.../fonts/InterUI/Inter-SemiBold.woff2 | Bin 107232 -> 0 bytes
.../fonts/InterUI/Inter-SemiBoldItalic.woff | Bin 149276 -> 0 bytes
.../fonts/InterUI/Inter-SemiBoldItalic.woff2 | Bin 112552 -> 0 bytes
superset-frontend/fonts/InterUI/Inter-Thin.woff | Bin 136952 -> 0 bytes
superset-frontend/fonts/InterUI/Inter-Thin.woff2 | Bin 101408 -> 0 bytes
.../fonts/InterUI/Inter-ThinItalic.woff | Bin 144412 -> 0 bytes
.../fonts/InterUI/Inter-ThinItalic.woff2 | Bin 107496 -> 0 bytes
.../fonts/InterUI/Inter-italic.var.woff2 | Bin 240688 -> 0 bytes
.../fonts/InterUI/Inter-roman.var.woff2 | Bin 226368 -> 0 bytes
superset-frontend/fonts/InterUI/Inter.var.woff2 | Bin 316604 -> 0 bytes
superset-frontend/package-lock.json | 124 ++++++------
superset-frontend/package.json | 2 +
superset-frontend/src/SqlLab/main.less | 3 +-
.../stylesheets/less/font_specimens/fira_code.less | 63 ------
.../stylesheets/less/font_specimens/inter_ui.less | 225 ---------------------
superset-frontend/stylesheets/less/fonts.less | 9 +-
superset-frontend/webpack.config.js | 3 +
59 files changed, 77 insertions(+), 411 deletions(-)
diff --git a/superset-frontend/fonts/FiraCode/specimen.less b/superset-frontend/fonts/FiraCode/specimen.less
deleted file mode 100644
index 126496f..0000000
--- a/superset-frontend/fonts/FiraCode/specimen.less
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * 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/fonts/FiraCode/woff/FiraCode-Bold.woff b/superset-frontend/fonts/FiraCode/woff/FiraCode-Bold.woff
deleted file mode 100644
index 9985076..0000000
Binary files a/superset-frontend/fonts/FiraCode/woff/FiraCode-Bold.woff and /dev/null differ
diff --git a/superset-frontend/fonts/FiraCode/woff/FiraCode-Light.woff b/superset-frontend/fonts/FiraCode/woff/FiraCode-Light.woff
deleted file mode 100644
index 5718390..0000000
Binary files a/superset-frontend/fonts/FiraCode/woff/FiraCode-Light.woff and /dev/null differ
diff --git a/superset-frontend/fonts/FiraCode/woff/FiraCode-Medium.woff b/superset-frontend/fonts/FiraCode/woff/FiraCode-Medium.woff
deleted file mode 100644
index 16281b2..0000000
Binary files a/superset-frontend/fonts/FiraCode/woff/FiraCode-Medium.woff and /dev/null differ
diff --git a/superset-frontend/fonts/FiraCode/woff/FiraCode-Regular.woff b/superset-frontend/fonts/FiraCode/woff/FiraCode-Regular.woff
deleted file mode 100644
index d250d45..0000000
Binary files a/superset-frontend/fonts/FiraCode/woff/FiraCode-Regular.woff and /dev/null differ
diff --git a/superset-frontend/fonts/FiraCode/woff/FiraCode-Retina.woff b/superset-frontend/fonts/FiraCode/woff/FiraCode-Retina.woff
deleted file mode 100644
index b387e83..0000000
Binary files a/superset-frontend/fonts/FiraCode/woff/FiraCode-Retina.woff and /dev/null differ
diff --git a/superset-frontend/fonts/FiraCode/woff/FiraCode-VF.woff b/superset-frontend/fonts/FiraCode/woff/FiraCode-VF.woff
deleted file mode 100644
index e67183e..0000000
Binary files a/superset-frontend/fonts/FiraCode/woff/FiraCode-VF.woff and /dev/null differ
diff --git a/superset-frontend/fonts/FiraCode/woff2/FiraCode-Bold.woff2 b/superset-frontend/fonts/FiraCode/woff2/FiraCode-Bold.woff2
deleted file mode 100644
index c386d4c..0000000
Binary files a/superset-frontend/fonts/FiraCode/woff2/FiraCode-Bold.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/FiraCode/woff2/FiraCode-Light.woff2 b/superset-frontend/fonts/FiraCode/woff2/FiraCode-Light.woff2
deleted file mode 100644
index 3f26550..0000000
Binary files a/superset-frontend/fonts/FiraCode/woff2/FiraCode-Light.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/FiraCode/woff2/FiraCode-Medium.woff2 b/superset-frontend/fonts/FiraCode/woff2/FiraCode-Medium.woff2
deleted file mode 100644
index 2e494fd..0000000
Binary files a/superset-frontend/fonts/FiraCode/woff2/FiraCode-Medium.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/FiraCode/woff2/FiraCode-Regular.woff2 b/superset-frontend/fonts/FiraCode/woff2/FiraCode-Regular.woff2
deleted file mode 100644
index d58667c..0000000
Binary files a/superset-frontend/fonts/FiraCode/woff2/FiraCode-Regular.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/FiraCode/woff2/FiraCode-Retina.woff2 b/superset-frontend/fonts/FiraCode/woff2/FiraCode-Retina.woff2
deleted file mode 100644
index 2db81c2..0000000
Binary files a/superset-frontend/fonts/FiraCode/woff2/FiraCode-Retina.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/FiraCode/woff2/FiraCode-VF.woff2 b/superset-frontend/fonts/FiraCode/woff2/FiraCode-VF.woff2
deleted file mode 100644
index 6691379..0000000
Binary files a/superset-frontend/fonts/FiraCode/woff2/FiraCode-VF.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-Black.woff b/superset-frontend/fonts/InterUI/Inter-Black.woff
deleted file mode 100644
index c7737ed..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-Black.woff and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-Black.woff2 b/superset-frontend/fonts/InterUI/Inter-Black.woff2
deleted file mode 100644
index b16b995..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-Black.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-BlackItalic.woff b/superset-frontend/fonts/InterUI/Inter-BlackItalic.woff
deleted file mode 100644
index b5f1447..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-BlackItalic.woff and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-BlackItalic.woff2 b/superset-frontend/fonts/InterUI/Inter-BlackItalic.woff2
deleted file mode 100644
index a3f1b70..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-BlackItalic.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-Bold.woff b/superset-frontend/fonts/InterUI/Inter-Bold.woff
deleted file mode 100644
index e384555..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-Bold.woff and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-Bold.woff2 b/superset-frontend/fonts/InterUI/Inter-Bold.woff2
deleted file mode 100644
index 835dd49..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-Bold.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-BoldItalic.woff b/superset-frontend/fonts/InterUI/Inter-BoldItalic.woff
deleted file mode 100644
index ffac3f5..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-BoldItalic.woff and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-BoldItalic.woff2 b/superset-frontend/fonts/InterUI/Inter-BoldItalic.woff2
deleted file mode 100644
index 1a41a14..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-BoldItalic.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-ExtraBold.woff b/superset-frontend/fonts/InterUI/Inter-ExtraBold.woff
deleted file mode 100644
index 885ac94..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-ExtraBold.woff and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-ExtraBold.woff2 b/superset-frontend/fonts/InterUI/Inter-ExtraBold.woff2
deleted file mode 100644
index ae956b1..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-ExtraBold.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-ExtraBoldItalic.woff b/superset-frontend/fonts/InterUI/Inter-ExtraBoldItalic.woff
deleted file mode 100644
index d6cf862..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-ExtraBoldItalic.woff and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-ExtraBoldItalic.woff2 b/superset-frontend/fonts/InterUI/Inter-ExtraBoldItalic.woff2
deleted file mode 100644
index 8657899..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-ExtraBoldItalic.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-ExtraLight.woff b/superset-frontend/fonts/InterUI/Inter-ExtraLight.woff
deleted file mode 100644
index ff76919..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-ExtraLight.woff and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-ExtraLight.woff2 b/superset-frontend/fonts/InterUI/Inter-ExtraLight.woff2
deleted file mode 100644
index 694b2df..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-ExtraLight.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-ExtraLightItalic.woff b/superset-frontend/fonts/InterUI/Inter-ExtraLightItalic.woff
deleted file mode 100644
index c6ed13a..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-ExtraLightItalic.woff and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-ExtraLightItalic.woff2 b/superset-frontend/fonts/InterUI/Inter-ExtraLightItalic.woff2
deleted file mode 100644
index 9a7bd11..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-ExtraLightItalic.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-Italic.woff b/superset-frontend/fonts/InterUI/Inter-Italic.woff
deleted file mode 100644
index 4fdb59d..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-Italic.woff and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-Italic.woff2 b/superset-frontend/fonts/InterUI/Inter-Italic.woff2
deleted file mode 100644
index deca637..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-Italic.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-Light.woff b/superset-frontend/fonts/InterUI/Inter-Light.woff
deleted file mode 100644
index 42850ac..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-Light.woff and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-Light.woff2 b/superset-frontend/fonts/InterUI/Inter-Light.woff2
deleted file mode 100644
index 65a7dad..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-Light.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-LightItalic.woff b/superset-frontend/fonts/InterUI/Inter-LightItalic.woff
deleted file mode 100644
index c4ed9a9..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-LightItalic.woff and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-LightItalic.woff2 b/superset-frontend/fonts/InterUI/Inter-LightItalic.woff2
deleted file mode 100644
index 555fc55..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-LightItalic.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-Medium.woff b/superset-frontend/fonts/InterUI/Inter-Medium.woff
deleted file mode 100644
index 495faef..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-Medium.woff and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-Medium.woff2 b/superset-frontend/fonts/InterUI/Inter-Medium.woff2
deleted file mode 100644
index 871ce4c..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-Medium.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-MediumItalic.woff b/superset-frontend/fonts/InterUI/Inter-MediumItalic.woff
deleted file mode 100644
index 389c7a2..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-MediumItalic.woff and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-MediumItalic.woff2 b/superset-frontend/fonts/InterUI/Inter-MediumItalic.woff2
deleted file mode 100644
index aa80579..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-MediumItalic.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-Regular.woff b/superset-frontend/fonts/InterUI/Inter-Regular.woff
deleted file mode 100644
index fa7715d..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-Regular.woff and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-Regular.woff2 b/superset-frontend/fonts/InterUI/Inter-Regular.woff2
deleted file mode 100644
index b52dd0a..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-Regular.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-SemiBold.woff b/superset-frontend/fonts/InterUI/Inter-SemiBold.woff
deleted file mode 100644
index 18d7749..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-SemiBold.woff and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-SemiBold.woff2 b/superset-frontend/fonts/InterUI/Inter-SemiBold.woff2
deleted file mode 100644
index ece5204..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-SemiBold.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-SemiBoldItalic.woff b/superset-frontend/fonts/InterUI/Inter-SemiBoldItalic.woff
deleted file mode 100644
index 8ee6439..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-SemiBoldItalic.woff and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-SemiBoldItalic.woff2 b/superset-frontend/fonts/InterUI/Inter-SemiBoldItalic.woff2
deleted file mode 100644
index b32c0ba..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-SemiBoldItalic.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-Thin.woff b/superset-frontend/fonts/InterUI/Inter-Thin.woff
deleted file mode 100644
index 1a22286..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-Thin.woff and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-Thin.woff2 b/superset-frontend/fonts/InterUI/Inter-Thin.woff2
deleted file mode 100644
index c56bc7c..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-Thin.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-ThinItalic.woff b/superset-frontend/fonts/InterUI/Inter-ThinItalic.woff
deleted file mode 100644
index d8ec837..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-ThinItalic.woff and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-ThinItalic.woff2 b/superset-frontend/fonts/InterUI/Inter-ThinItalic.woff2
deleted file mode 100644
index eca5608..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-ThinItalic.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-italic.var.woff2 b/superset-frontend/fonts/InterUI/Inter-italic.var.woff2
deleted file mode 100644
index 1f5d926..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-italic.var.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter-roman.var.woff2 b/superset-frontend/fonts/InterUI/Inter-roman.var.woff2
deleted file mode 100644
index 05621d8..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter-roman.var.woff2 and /dev/null differ
diff --git a/superset-frontend/fonts/InterUI/Inter.var.woff2 b/superset-frontend/fonts/InterUI/Inter.var.woff2
deleted file mode 100644
index 46bb515..0000000
Binary files a/superset-frontend/fonts/InterUI/Inter.var.woff2 and /dev/null differ
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
index b73b9fc..bdb809b 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -21320,28 +21320,28 @@
"dependencies": {
"abbrev": {
"version": "1.1.1",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
"dev": true,
"optional": true
},
"ansi-regex": {
"version": "2.1.1",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
"dev": true,
"optional": true
},
"are-we-there-yet": {
"version": "1.1.5",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
"dev": true,
"optional": true,
@@ -21352,14 +21352,14 @@
},
"balanced-match": {
"version": "1.0.0",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true,
"optional": true,
@@ -21370,35 +21370,35 @@
},
"code-point-at": {
"version": "1.1.0",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
"dev": true,
"optional": true
},
"debug": {
"version": "4.1.1",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"dev": true,
"optional": true,
@@ -21408,35 +21408,35 @@
},
"deep-extend": {
"version": "0.6.0",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
"dev": true,
"optional": true
},
"delegates": {
"version": "1.0.0",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
"dev": true,
"optional": true
},
"detect-libc": {
"version": "1.0.3",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
"dev": true,
"optional": true
},
"fs.realpath": {
"version": "1.0.0",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
"dev": true,
"optional": true
},
"gauge": {
"version": "2.7.4",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
"dev": true,
"optional": true,
@@ -21453,7 +21453,7 @@
},
"glob": {
"version": "7.1.3",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
"dev": true,
"optional": true,
@@ -21468,14 +21468,14 @@
},
"has-unicode": {
"version": "2.0.1",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
"dev": true,
"optional": true
},
"iconv-lite": {
"version": "0.4.24",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
"dev": true,
"optional": true,
@@ -21485,7 +21485,7 @@
},
"ignore-walk": {
"version": "3.0.1",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
"dev": true,
"optional": true,
@@ -21495,7 +21495,7 @@
},
"inflight": {
"version": "1.0.6",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"dev": true,
"optional": true,
@@ -21506,21 +21506,21 @@
},
"inherits": {
"version": "2.0.3",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
"dev": true,
"optional": true
},
"is-fullwidth-code-point": {
"version": "1.0.0",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true,
"optional": true,
@@ -21530,14 +21530,14 @@
},
"isarray": {
"version": "1.0.0",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
"dev": true,
"optional": true
},
"minimatch": {
"version": "3.0.4",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"dev": true,
"optional": true,
@@ -21554,14 +21554,14 @@
},
"ms": {
"version": "2.1.1",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
"dev": true,
"optional": true
},
"needle": {
"version": "2.3.0",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
"dev": true,
"optional": true,
@@ -21573,7 +21573,7 @@
},
"node-pre-gyp": {
"version": "0.12.0",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
"dev": true,
"optional": true,
@@ -21592,7 +21592,7 @@
},
"nopt": {
"version": "4.0.1",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
"dev": true,
"optional": true,
@@ -21603,14 +21603,14 @@
},
"npm-bundled": {
"version": "1.0.6",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
"dev": true,
"optional": true
},
"npm-packlist": {
"version": "1.4.1",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
"dev": true,
"optional": true,
@@ -21621,7 +21621,7 @@
},
"npmlog": {
"version": "4.1.2",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
"dev": true,
"optional": true,
@@ -21634,21 +21634,21 @@
},
"number-is-nan": {
"version": "1.0.1",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
"dev": true,
"optional": true
},
"once": {
"version": "1.4.0",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"dev": true,
"optional": true,
@@ -21658,21 +21658,21 @@
},
"os-homedir": {
"version": "1.0.2",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
"dev": true,
"optional": true
},
"os-tmpdir": {
"version": "1.0.2",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
"dev": true,
"optional": true
},
"osenv": {
"version": "0.1.5",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
"dev": true,
"optional": true,
@@ -21683,21 +21683,21 @@
},
"path-is-absolute": {
"version": "1.0.1",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
"dev": true,
"optional": true
},
"process-nextick-args": {
"version": "2.0.0",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
"dev": true,
"optional": true
},
"rc": {
"version": "1.2.8",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
"dev": true,
"optional": true,
@@ -21710,7 +21710,7 @@
},
"readable-stream": {
"version": "2.3.6",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"dev": true,
"optional": true,
@@ -21726,7 +21726,7 @@
},
"rimraf": {
"version": "2.6.3",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
"dev": true,
"optional": true,
@@ -21736,49 +21736,49 @@
},
"safe-buffer": {
"version": "5.1.2",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
"dev": true,
"optional": true
},
"sax": {
"version": "1.2.4",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
"dev": true,
"optional": true
},
"semver": {
"version": "5.7.0",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
"dev": true,
"optional": true
},
"set-blocking": {
"version": "2.0.0",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
"dev": true,
"optional": true
},
"signal-exit": {
"version": "3.0.2",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
"dev": true,
"optional": true
},
"string-width": {
"version": "1.0.2",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true,
"optional": true,
@@ -21790,7 +21790,7 @@
},
"string_decoder": {
"version": "1.1.1",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"dev": true,
"optional": true,
@@ -21800,7 +21800,7 @@
},
"strip-ansi": {
"version": "3.0.1",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"optional": true,
@@ -21810,21 +21810,21 @@
},
"strip-json-comments": {
"version": "2.0.1",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
"dev": true,
"optional": true
},
"util-deprecate": {
"version": "1.0.2",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
"dev": true,
"optional": true
},
"wide-align": {
"version": "1.1.3",
- "resolved": "",
+ "resolved": false,
"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
"dev": true,
"optional": true,
@@ -21834,7 +21834,7 @@
},
"wrappy": {
"version": "1.0.2",
- "resolved": "",
+ "resolved": false,
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
"dev": true,
"optional": true
@@ -45552,6 +45552,16 @@
"is-typedarray": "^1.0.0"
}
},
+ "typeface-fira-code": {
+ "version": "1.1.13",
+ "resolved": "https://registry.npmjs.org/typeface-fira-code/-/typeface-fira-code-1.1.13.tgz",
+ "integrity": "sha512-8TRlYeIGAqwNajMHB3eSFs58VVfKsAsA0JRVu7z895s/FBl3nrh4PCvbH8tqxadU0UXEbCxNBvZtXn/Jpt7C3Q=="
+ },
+ "typeface-inter": {
+ "version": "1.1.13",
+ "resolved": "https://registry.npmjs.org/typeface-inter/-/typeface-inter-1.1.13.tgz",
+ "integrity": "sha512-XHTUTR+qqsVAtr1mjJBu3f5q4e3q6PhuhLXJhQbRGKwqLrQmhC7dCoZ5n5Vd+dEmZvc3TdHhOEYfjI01xzM7HA=="
+ },
"typescript": {
"version": "3.8.3",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz",
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
index fc598da..ec73c08 100644
--- a/superset-frontend/package.json
+++ b/superset-frontend/package.json
@@ -166,6 +166,8 @@
"regenerator-runtime": "^0.13.5",
"rison": "^0.1.1",
"shortid": "^2.2.6",
+ "typeface-fira-code": "^1.1.13",
+ "typeface-inter": "^1.1.13",
"urijs": "^1.18.10",
"use-query-params": "^0.4.5"
},
diff --git a/superset-frontend/src/SqlLab/main.less b/superset-frontend/src/SqlLab/main.less
index 957677a..0f892d8 100644
--- a/superset-frontend/src/SqlLab/main.less
+++ b/superset-frontend/src/SqlLab/main.less
@@ -417,7 +417,8 @@ div.tablePopover {
margin-top: 48px;
}
-.ace_editor {
+.ace_editor.ace_editor {
+ //double class is better than !important
border: 1px solid @gray-light;
font-feature-settings: @font-feature-settings;
font-family: @font-family-monospace;
diff --git a/superset-frontend/stylesheets/less/font_specimens/fira_code.less b/superset-frontend/stylesheets/less/font_specimens/fira_code.less
deleted file mode 100644
index 6b310da..0000000
--- a/superset-frontend/stylesheets/less/font_specimens/fira_code.less
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * 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('../../../fonts/FiraCode/woff2/FiraCode-Light.woff2') format('woff2'),
- url('../../../fonts/FiraCode/woff/FiraCode-Light.woff') format('woff');
- font-weight: 300;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'Fira Code';
- src: url('../../../fonts/FiraCode/woff2/FiraCode-Regular.woff2')
- format('woff2'),
- url('../../../fonts/FiraCode/woff/FiraCode-Regular.woff') format('woff');
- font-weight: 400;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'Fira Code';
- src: url('../../../fonts/FiraCode/woff2/FiraCode-Medium.woff2')
- format('woff2'),
- url('../../../fonts/FiraCode/woff/FiraCode-Medium.woff') format('woff');
- font-weight: 500;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'Fira Code';
- src: url('../../../fonts/FiraCode/woff2/FiraCode-Bold.woff2') format('woff2'),
- url('../../../fonts/FiraCode/woff/FiraCode-Bold.woff') format('woff');
- font-weight: 700;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'Fira Code VF';
- src: url('../../../fonts/FiraCode/woff2/FiraCode-VF.woff2')
- format('woff2-variations'),
- url('../../../fonts/FiraCode/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/less/font_specimens/inter_ui.less b/superset-frontend/stylesheets/less/font_specimens/inter_ui.less
deleted file mode 100644
index 26a56e2..0000000
--- a/superset-frontend/stylesheets/less/font_specimens/inter_ui.less
+++ /dev/null
@@ -1,225 +0,0 @@
-/**
- * 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('../../../fonts/InterUI/Inter-Thin.woff2?v=3.12') format('woff2'),
- url('../../../fonts/InterUI/Inter-Thin.woff?v=3.12') format('woff');
-}
-@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 100;
- font-display: swap;
- src: url('../../../fonts/InterUI/Inter-ThinItalic.woff2?v=3.12')
- format('woff2'),
- url('../../../fonts/InterUI/Inter-ThinItalic.woff?v=3.12') format('woff');
-}
-@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 200;
- font-display: swap;
- src: url('../../../fonts/InterUI/Inter-ExtraLight.woff2?v=3.12')
- format('woff2'),
- url('../../../fonts/InterUI/Inter-ExtraLight.woff?v=3.12') format('woff');
-}
-@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 200;
- font-display: swap;
- src: url('../../../fonts/InterUI/Inter-ExtraLightItalic.woff2?v=3.12')
- format('woff2'),
- url('../../../fonts/InterUI/Inter-ExtraLightItalic.woff?v=3.12')
- format('woff');
-}
-@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 300;
- font-display: swap;
- src: url('../../../fonts/InterUI/Inter-Light.woff2?v=3.12') format('woff2'),
- url('../../../fonts/InterUI/Inter-Light.woff?v=3.12') format('woff');
-}
-@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 300;
- font-display: swap;
- src: url('../../../fonts/InterUI/Inter-LightItalic.woff2?v=3.12')
- format('woff2'),
- url('../../../fonts/InterUI/Inter-LightItalic.woff?v=3.12') format('woff');
-}
-@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 400;
- font-display: swap;
- src: url('../../../fonts/InterUI/Inter-Regular.woff2?v=3.12') format('woff2'),
- url('../../../fonts/InterUI/Inter-Regular.woff?v=3.12') format('woff');
-}
-@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 400;
- font-display: swap;
- src: url('../../../fonts/InterUI/Inter-Italic.woff2?v=3.12') format('woff2'),
- url('../../../fonts/InterUI/Inter-Italic.woff?v=3.12') format('woff');
-}
-@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 500;
- font-display: swap;
- src: url('../../../fonts/InterUI/Inter-Medium.woff2?v=3.12') format('woff2'),
- url('../../../fonts/InterUI/Inter-Medium.woff?v=3.12') format('woff');
-}
-@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 500;
- font-display: swap;
- src: url('../../../fonts/InterUI/Inter-MediumItalic.woff2?v=3.12')
- format('woff2'),
- url('../../../fonts/InterUI/Inter-MediumItalic.woff?v=3.12') format('woff');
-}
-@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 600;
- font-display: swap;
- src: url('../../../fonts/InterUI/Inter-SemiBold.woff2?v=3.12') format('woff2'),
- url('../../../fonts/InterUI/Inter-SemiBold.woff?v=3.12') format('woff');
-}
-@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 600;
- font-display: swap;
- src: url('../../../fonts/InterUI/Inter-SemiBoldItalic.woff2?v=3.12')
- format('woff2'),
- url('../../../fonts/InterUI/Inter-SemiBoldItalic.woff?v=3.12')
- format('woff');
-}
-@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 700;
- font-display: swap;
- src: url('../../../fonts/InterUI/Inter-Bold.woff2?v=3.12') format('woff2'),
- url('../../../fonts/InterUI/Inter-Bold.woff?v=3.12') format('woff');
-}
-@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 700;
- font-display: swap;
- src: url('../../../fonts/InterUI/Inter-BoldItalic.woff2?v=3.12')
- format('woff2'),
- url('../../../fonts/InterUI/Inter-BoldItalic.woff?v=3.12') format('woff');
-}
-@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 800;
- font-display: swap;
- src: url('../../../fonts/InterUI/Inter-ExtraBold.woff2?v=3.12')
- format('woff2'),
- url('../../../fonts/InterUI/Inter-ExtraBold.woff?v=3.12') format('woff');
-}
-@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 800;
- font-display: swap;
- src: url('../../../fonts/InterUI/Inter-ExtraBoldItalic.woff2?v=3.12')
- format('woff2'),
- url('../../../fonts/InterUI/Inter-ExtraBoldItalic.woff?v=3.12')
- format('woff');
-}
-@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 900;
- font-display: swap;
- src: url('../../../fonts/InterUI/Inter-Black.woff2?v=3.12') format('woff2'),
- url('../../../fonts/InterUI/Inter-Black.woff?v=3.12') format('woff');
-}
-@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 900;
- font-display: swap;
- src: url('../../../fonts/InterUI/Inter-BlackItalic.woff2?v=3.12')
- format('woff2'),
- url('../../../fonts/InterUI/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('../../../fonts/InterUI/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('../../../fonts/InterUI/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('../../../fonts/InterUI/Inter.var.woff2?v=3.12') format('woff2');
-}
diff --git a/superset-frontend/stylesheets/less/fonts.less b/superset-frontend/stylesheets/less/fonts.less
index 822763c..5933f79 100644
--- a/superset-frontend/stylesheets/less/fonts.less
+++ b/superset-frontend/stylesheets/less/fonts.less
@@ -18,14 +18,11 @@
*/
/*************************************************************************/
-/* 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 */
+/* USAGE NOTES : Add font all licenses to LICENSE.text */
/*************************************************************************/
/******************************* Inter UI ********************************/
-@import './font_specimens/inter_ui.less';
+@import '~typeface-inter/index.css';
/******************************* Fira Code ********************************/
-@import './font_specimens/fira_code.less';
+@import '~typeface-fira-code/index.css';
diff --git a/superset-frontend/webpack.config.js b/superset-frontend/webpack.config.js
index 26f769c..8080b1f 100644
--- a/superset-frontend/webpack.config.js
+++ b/superset-frontend/webpack.config.js
@@ -389,6 +389,9 @@ const config = {
{
test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
loader: 'url-loader?limit=10000&mimetype=application/font-woff',
+ options: {
+ esModule: false,
+ },
},
{
test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,