mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-04 05:53:43 +00:00 
			
		
		
		
	styles: Consistently use generic fallback font families.
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
		
				
					committed by
					
						
						Anders Kaseorg
					
				
			
			
				
	
			
			
			
						parent
						
							1a83112cf9
						
					
				
				
					commit
					236e114870
				
			@@ -469,7 +469,7 @@
 | 
				
			|||||||
        display: inline;
 | 
					        display: inline;
 | 
				
			||||||
        margin-right: 8px;
 | 
					        margin-right: 8px;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        font-family: FontAwesome, Yantramanav, "Source Sans 3";
 | 
					        font-family: FontAwesome;
 | 
				
			||||||
        font-weight: 600;
 | 
					        font-weight: 600;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,5 @@
 | 
				
			|||||||
body {
 | 
					body {
 | 
				
			||||||
    font-family: "Source Sans 3", "Helvetica Neue", Helvetica, Arial, sans-serif;
 | 
					    font-family: "Source Sans 3", sans-serif;
 | 
				
			||||||
    font-size: 14px;
 | 
					    font-size: 14px;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,5 @@
 | 
				
			|||||||
.billing-upgrade-page {
 | 
					.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%);
 | 
					    background-color: hsl(0, 0%, 98%);
 | 
				
			||||||
    height: 100vh;
 | 
					    height: 100vh;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -131,7 +131,7 @@
 | 
				
			|||||||
        span {
 | 
					        span {
 | 
				
			||||||
            background: 0;
 | 
					            background: 0;
 | 
				
			||||||
            box-shadow: none;
 | 
					            box-shadow: none;
 | 
				
			||||||
            font-family: "Source Sans 3", Helvetica, Arial;
 | 
					            font-family: "Source Sans 3", sans-serif;
 | 
				
			||||||
            font-size: 1.4em;
 | 
					            font-size: 1.4em;
 | 
				
			||||||
            line-height: 20px;
 | 
					            line-height: 20px;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -242,14 +242,14 @@
 | 
				
			|||||||
    .tip::before {
 | 
					    .tip::before {
 | 
				
			||||||
        display: inline;
 | 
					        display: inline;
 | 
				
			||||||
        content: "\f0eb   Tip:  ";
 | 
					        content: "\f0eb   Tip:  ";
 | 
				
			||||||
        font-family: FontAwesome, Yantramanav, "Source Sans 3";
 | 
					        font-family: FontAwesome, "Source Sans 3", sans-serif;
 | 
				
			||||||
        font-weight: 600;
 | 
					        font-weight: 600;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    .keyboard_tip::before {
 | 
					    .keyboard_tip::before {
 | 
				
			||||||
        display: inline;
 | 
					        display: inline;
 | 
				
			||||||
        content: "\f11c   Keyboard Shortcut:  ";
 | 
					        content: "\f11c   Keyboard Shortcut:  ";
 | 
				
			||||||
        font-family: FontAwesome, Yantramanav, "Source Sans 3";
 | 
					        font-family: FontAwesome, "Source Sans 3", sans-serif;
 | 
				
			||||||
        font-weight: 600;
 | 
					        font-weight: 600;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
body {
 | 
					body {
 | 
				
			||||||
    background-color: hsl(0, 0%, 98%);
 | 
					    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%;
 | 
					    line-height: 150%;
 | 
				
			||||||
    height: 100%;
 | 
					    height: 100%;
 | 
				
			||||||
    font-weight: 300;
 | 
					    font-weight: 300;
 | 
				
			||||||
@@ -274,7 +274,7 @@ html {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.title {
 | 
					.title {
 | 
				
			||||||
    font-family: Helvetica;
 | 
					    font-family: Helvetica, sans-serif;
 | 
				
			||||||
    font-size: 100px;
 | 
					    font-size: 100px;
 | 
				
			||||||
    font-weight: bold;
 | 
					    font-weight: bold;
 | 
				
			||||||
    margin-top: 50px;
 | 
					    margin-top: 50px;
 | 
				
			||||||
@@ -1299,7 +1299,7 @@ input.new-organization-button {
 | 
				
			|||||||
    min-height: calc(100vh - 290px);
 | 
					    min-height: calc(100vh - 290px);
 | 
				
			||||||
    height: 100%;
 | 
					    height: 100%;
 | 
				
			||||||
    background-color: hsl(163, 42%, 85%);
 | 
					    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 {
 | 
					.error_page .container {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -323,7 +323,7 @@ html {
 | 
				
			|||||||
        vertical-align: top;
 | 
					        vertical-align: top;
 | 
				
			||||||
        padding: 13px 22px 13px 22px;
 | 
					        padding: 13px 22px 13px 22px;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        font-family: "Source Sans 3";
 | 
					        font-family: "Source Sans 3", sans-serif;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        font-size: 1.2rem;
 | 
					        font-size: 1.2rem;
 | 
				
			||||||
        font-weight: 400;
 | 
					        font-weight: 400;
 | 
				
			||||||
@@ -404,7 +404,7 @@ html {
 | 
				
			|||||||
            padding: 10px 32px 10px 12px;
 | 
					            padding: 10px 32px 10px 12px;
 | 
				
			||||||
            margin: 25px 0 5px;
 | 
					            margin: 25px 0 5px;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            font-family: "Source Sans 3";
 | 
					            font-family: "Source Sans 3", sans-serif;
 | 
				
			||||||
            font-size: 1.2rem;
 | 
					            font-size: 1.2rem;
 | 
				
			||||||
            line-height: normal;
 | 
					            line-height: normal;
 | 
				
			||||||
            height: auto;
 | 
					            height: auto;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,5 @@
 | 
				
			|||||||
body {
 | 
					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%);
 | 
					    background-color: hsl(0, 0%, 98%);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -113,7 +113,7 @@ p {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.button {
 | 
					.button {
 | 
				
			||||||
    font-family: "Source Sans 3", "Helvetica Neue", sans-serif !important;
 | 
					    font-family: "Source Sans 3", sans-serif !important;
 | 
				
			||||||
    border: none;
 | 
					    border: none;
 | 
				
			||||||
    border-radius: 4px;
 | 
					    border-radius: 4px;
 | 
				
			||||||
    outline: none;
 | 
					    outline: none;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -33,7 +33,7 @@ html {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
body {
 | 
					body {
 | 
				
			||||||
    font-family: "Source Sans 3", "Helvetica Neue", Helvetica, Arial, sans-serif;
 | 
					    font-family: "Source Sans 3", sans-serif;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Common background color */
 | 
					/* Common background color */
 | 
				
			||||||
@@ -47,7 +47,7 @@ input,
 | 
				
			|||||||
button,
 | 
					button,
 | 
				
			||||||
select,
 | 
					select,
 | 
				
			||||||
textarea {
 | 
					textarea {
 | 
				
			||||||
    font-family: "Source Sans 3", "Helvetica Neue", Helvetica, Arial, sans-serif;
 | 
					    font-family: "Source Sans 3", sans-serif;
 | 
				
			||||||
    line-height: normal;
 | 
					    line-height: normal;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -379,7 +379,7 @@ p.n-margin {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
textarea,
 | 
					textarea,
 | 
				
			||||||
input {
 | 
					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 */
 | 
					/* Override Bootstrap's fixed sizes for various elements */
 | 
				
			||||||
@@ -1800,7 +1800,7 @@ div.focused_table {
 | 
				
			|||||||
        padding-right: 20px;
 | 
					        padding-right: 20px;
 | 
				
			||||||
        border: none;
 | 
					        border: none;
 | 
				
			||||||
        border-radius: 0;
 | 
					        border-radius: 0;
 | 
				
			||||||
        font-family: "Source Sans 3";
 | 
					        font-family: "Source Sans 3", sans-serif;
 | 
				
			||||||
        font-weight: 300;
 | 
					        font-weight: 300;
 | 
				
			||||||
        line-height: $header_height;
 | 
					        line-height: $header_height;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,9 +5,12 @@ module.exports = {
 | 
				
			|||||||
    rules: {
 | 
					    rules: {
 | 
				
			||||||
        // Add some exceptions for recommended rules
 | 
					        // Add some exceptions for recommended rules
 | 
				
			||||||
        "at-rule-no-unknown": [true, {ignoreAtRules: ["extend"]}],
 | 
					        "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
 | 
					        // Disable recommended rules we don't comply with yet
 | 
				
			||||||
        "font-family-no-missing-generic-family-keyword": null,
 | 
					 | 
				
			||||||
        "no-descending-specificity": null,
 | 
					        "no-descending-specificity": null,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // Disable standard rules we don't comply with yet
 | 
					        // Disable standard rules we don't comply with yet
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user