diff --git a/static/styles/app_components.css b/static/styles/app_components.css index fa26879eba..4301942826 100644 --- a/static/styles/app_components.css +++ b/static/styles/app_components.css @@ -469,7 +469,7 @@ display: inline; margin-right: 8px; - font-family: FontAwesome, Yantramanav, "Source Sans 3"; + font-family: FontAwesome; font-weight: 600; } } diff --git a/static/styles/portico/archive.css b/static/styles/portico/archive.css index 4c6433f2af..0d50053337 100644 --- a/static/styles/portico/archive.css +++ b/static/styles/portico/archive.css @@ -1,5 +1,5 @@ body { - font-family: "Source Sans 3", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Source Sans 3", sans-serif; font-size: 14px; } diff --git a/static/styles/portico/billing.css b/static/styles/portico/billing.css index f4c882cb27..58ca244888 100644 --- a/static/styles/portico/billing.css +++ b/static/styles/portico/billing.css @@ -1,5 +1,5 @@ .billing-upgrade-page { - font-family: "Source Sans 3", Helvetica, Arial, sans-serif; + font-family: "Source Sans 3", sans-serif; background-color: hsl(0, 0%, 98%); height: 100vh; @@ -131,7 +131,7 @@ span { background: 0; box-shadow: none; - font-family: "Source Sans 3", Helvetica, Arial; + font-family: "Source Sans 3", sans-serif; font-size: 1.4em; line-height: 20px; } diff --git a/static/styles/portico/markdown.css b/static/styles/portico/markdown.css index 14a605c7d7..ea3e72dd57 100644 --- a/static/styles/portico/markdown.css +++ b/static/styles/portico/markdown.css @@ -242,14 +242,14 @@ .tip::before { display: inline; content: "\f0eb Tip: "; - font-family: FontAwesome, Yantramanav, "Source Sans 3"; + font-family: FontAwesome, "Source Sans 3", sans-serif; font-weight: 600; } .keyboard_tip::before { display: inline; content: "\f11c Keyboard Shortcut: "; - font-family: FontAwesome, Yantramanav, "Source Sans 3"; + font-family: FontAwesome, "Source Sans 3", sans-serif; font-weight: 600; } diff --git a/static/styles/portico/portico.css b/static/styles/portico/portico.css index 69e9a38a7c..4d463a08b8 100644 --- a/static/styles/portico/portico.css +++ b/static/styles/portico/portico.css @@ -1,6 +1,6 @@ body { background-color: hsl(0, 0%, 98%); - font-family: "Source Sans 3", Helvetica, Arial, sans-serif; + font-family: "Source Sans 3", sans-serif; line-height: 150%; height: 100%; font-weight: 300; @@ -274,7 +274,7 @@ html { } .title { - font-family: Helvetica; + font-family: Helvetica, sans-serif; font-size: 100px; font-weight: bold; margin-top: 50px; @@ -1299,7 +1299,7 @@ input.new-organization-button { min-height: calc(100vh - 290px); height: 100%; background-color: hsl(163, 42%, 85%); - font-family: "Source Sans 3", Helvetica, Arial, sans-serif; + font-family: "Source Sans 3", sans-serif; } .error_page .container { diff --git a/static/styles/portico/portico_signin.css b/static/styles/portico/portico_signin.css index 1ffb2f6c45..a5d0ba114b 100644 --- a/static/styles/portico/portico_signin.css +++ b/static/styles/portico/portico_signin.css @@ -323,7 +323,7 @@ html { vertical-align: top; padding: 13px 22px 13px 22px; - font-family: "Source Sans 3"; + font-family: "Source Sans 3", sans-serif; font-size: 1.2rem; font-weight: 400; @@ -404,7 +404,7 @@ html { padding: 10px 32px 10px 12px; margin: 25px 0 5px; - font-family: "Source Sans 3"; + font-family: "Source Sans 3", sans-serif; font-size: 1.2rem; line-height: normal; height: auto; diff --git a/static/styles/portico/stats.css b/static/styles/portico/stats.css index ce978bbded..8386bf2596 100644 --- a/static/styles/portico/stats.css +++ b/static/styles/portico/stats.css @@ -1,5 +1,5 @@ body { - font-family: "Source Sans 3", "Helvetica Neue", sans-serif !important; + font-family: "Source Sans 3", sans-serif !important; background-color: hsl(0, 0%, 98%); } @@ -113,7 +113,7 @@ p { } .button { - font-family: "Source Sans 3", "Helvetica Neue", sans-serif !important; + font-family: "Source Sans 3", sans-serif !important; border: none; border-radius: 4px; outline: none; diff --git a/static/styles/zulip.css b/static/styles/zulip.css index 52d0386a62..ecc7196f7d 100644 --- a/static/styles/zulip.css +++ b/static/styles/zulip.css @@ -33,7 +33,7 @@ html { } body { - font-family: "Source Sans 3", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Source Sans 3", sans-serif; } /* Common background color */ @@ -47,7 +47,7 @@ input, button, select, textarea { - font-family: "Source Sans 3", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Source Sans 3", sans-serif; line-height: normal; } @@ -379,7 +379,7 @@ p.n-margin { textarea, input { - font-family: "Source Sans 3", Helvetica, Arial, sans-serif; + font-family: "Source Sans 3", sans-serif; } /* Override Bootstrap's fixed sizes for various elements */ @@ -1800,7 +1800,7 @@ div.focused_table { padding-right: 20px; border: none; border-radius: 0; - font-family: "Source Sans 3"; + font-family: "Source Sans 3", sans-serif; font-weight: 300; line-height: $header_height; } diff --git a/stylelint.config.js b/stylelint.config.js index 732339aca4..e93d6f45c2 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -5,9 +5,12 @@ module.exports = { rules: { // Add some exceptions for recommended rules "at-rule-no-unknown": [true, {ignoreAtRules: ["extend"]}], + "font-family-no-missing-generic-family-keyword": [ + true, + {ignoreFontFamilies: ["FontAwesome"]}, + ], // Disable recommended rules we don't comply with yet - "font-family-no-missing-generic-family-keyword": null, "no-descending-specificity": null, // Disable standard rules we don't comply with yet