diff --git a/LICENSE.txt b/LICENSE.txt index cdf3a17287..bc58fdc9dd 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 1c6d1ec7d6..809e0999ae 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 0000000000..03d7b8989b --- /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 0000000000..9985076c16 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 0000000000..57183904bf 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 0000000000..16281b2b6a 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 0000000000..d250d4596b 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 0000000000..b387e83e67 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 0000000000..e67183e65f 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 0000000000..c386d4c3c3 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 0000000000..3f265501eb 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 0000000000..2e494fd4c2 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 0000000000..d58667c57b 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 0000000000..2db81c2e5e 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 0000000000..6691379f49 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 0000000000..c7737ed3d8 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 0000000000..b16b995bee 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 0000000000..b5f1447643 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 0000000000..a3f1b70cdf 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 0000000000..e38455587f 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 0000000000..835dd4977a 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 0000000000..ffac3f59b5 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 0000000000..1a41a14ff1 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 0000000000..885ac94fbf 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 0000000000..ae956b1501 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 0000000000..d6cf862332 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 0000000000..86578995d2 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 0000000000..ff76919327 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 0000000000..694b2df9fa 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 0000000000..c6ed13a4ff 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 0000000000..9a7bd11090 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 0000000000..4fdb59dc2d 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 0000000000..deca637d81 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 0000000000..42850acc03 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 0000000000..65a7dadddb 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 0000000000..c4ed9a94fa 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 0000000000..555fc55955 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 0000000000..495faef7ff 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 0000000000..871ce4ce5d 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 0000000000..389c7a2bfe 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 0000000000..aa8057992b 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 0000000000..fa7715d120 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 0000000000..b52dd0a0b7 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 0000000000..18d7749f56 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 0000000000..ece5204a19 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 0000000000..8ee64396a0 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 0000000000..b32c0ba3bd 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 0000000000..1a22286f6e 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 0000000000..c56bc7ca6d 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 0000000000..d8ec8373ac 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 0000000000..eca5608c0f 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 0000000000..1f5d92611a 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 0000000000..05621d8d16 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 0000000000..46bb515393 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 0000000000..4d18941ec2 --- /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 e401bcf528..0000000000 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 5bd7bd6500..0000000000 Binary files a/superset-frontend/stylesheets/fonts/Roboto-Regular.woff2 and /dev/null differ diff --git a/superset-frontend/stylesheets/less/fonts.less b/superset-frontend/stylesheets/less/fonts.less new file mode 100644 index 0000000000..f07313472c --- /dev/null +++ b/superset-frontend/stylesheets/less/fonts.less @@ -0,0 +1,32 @@ +/** + * 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. + */ + + +/*************************************************************************/ +/* 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 */ +/*************************************************************************/ + +/******************************* Inter UI ********************************/ +@import '../fonts/InterUI/specimen.less'; + +/******************************* Fira Code ********************************/ +@import '../fonts/FiraCode/specimen.less'; diff --git a/superset-frontend/stylesheets/less/index.less b/superset-frontend/stylesheets/less/index.less index 48f45b05b4..86a89890d7 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 34f3c3db52..0cfbc17598 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 8508e6e97d..20f5cb87e9 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;