Skip to content

Commit

Permalink
linting some LESS
Browse files Browse the repository at this point in the history
  • Loading branch information
rusackas committed Mar 27, 2020
1 parent 499f9c8 commit 24026f6
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 89 deletions.
54 changes: 27 additions & 27 deletions superset-frontend/stylesheets/fonts/FiraCode/specimen.less
Original file line number Diff line number Diff line change
Expand Up @@ -16,44 +16,44 @@
* 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-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-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-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-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;
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;
}
114 changes: 57 additions & 57 deletions superset-frontend/stylesheets/fonts/InterUI/specimen.less
Original file line number Diff line number Diff line change
Expand Up @@ -19,147 +19,147 @@

@font-face {
font-family: 'Inter';
font-style: normal;
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");
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-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");
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-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");
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-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");
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-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");
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-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");
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-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");
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-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");
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-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");
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-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");
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-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");
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-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");
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-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");
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-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");
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-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");
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-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");
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-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");
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-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");
src: url('./Inter-BlackItalic.woff2?v=3.12') format('woff2'),
url('./Inter-BlackItalic.woff?v=3.12') format('woff');
}

/* -------------------------------------------------------
Expand All @@ -177,15 +177,15 @@ Usage:
font-display: swap;
font-style: normal;
font-named-instance: 'Regular';
src: url("./Inter-roman.var.woff2?v=3.12") format("woff2");
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");
src: url('./Inter-italic.var.woff2?v=3.12') format('woff2');
}

/* --------------------------------------------------------------------------
Expand All @@ -206,5 +206,5 @@ explicitly, e.g.
font-weight: 100 900;
font-display: swap;
font-style: oblique 0deg 10deg;
src: url("./Inter.var.woff2?v=3.12") format("woff2");
src: url('./Inter.var.woff2?v=3.12') format('woff2');
}
1 change: 0 additions & 1 deletion superset-frontend/stylesheets/less/fonts.less
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
* under the License.
*/


/*************************************************************************/
/* USAGE NOTES */
/* Each typeface used in Superset should have local webfont files. */
Expand Down
12 changes: 8 additions & 4 deletions superset-frontend/stylesheets/less/variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,16 @@
@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}
.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: "Inter", Helvetica, Arial;
@font-family-sans-serif: 'Inter', Helvetica, Arial;
@font-family-serif: Georgia, 'Times New Roman', Times, serif;
@font-family-monospace: 'Fira Code', 'Courier New', monospace;
@font-family-base: @font-family-sans-serif;
Expand Down

0 comments on commit 24026f6

Please sign in to comment.