Skip to content

Commit e5f9a44

Browse files
committed
Auto merge of #2562 - Turbo87:fira, r=locks
Use "Fira Sans" font from Mozilla CDN as default font This brings us closer to a unified style with the other Rust web assets. Currently deployed at https://staging-crates-io.herokuapp.com/ r? @locks
2 parents 64e75cf + 9733ce3 commit e5f9a44

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

app/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
1515
<link rel="stylesheet" href="{{rootURL}}assets/cargo.css">
16-
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Fira+Sans:ital,wght@0,400;0,600;0,800;1,400;1,600;1,800&display=swap">
16+
<link rel="stylesheet" href="https://code.cdn.mozilla.net/fonts/fira.css">
1717

1818
<link rel="manifest" href="{{rootURL}}manifest.webmanifest">
1919
<meta name="msapplication-config" content="{{rootURL}}browserconfig.xml">

app/styles/application.module.css

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
--header-bg-color: var(--dark-green);
77
--footer-bg-color: var(--dark-green);
88

9-
/* Use the modern font stack inspired by Bootstrap 4 */
10-
--font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
9+
--font-family: "Fira Sans", sans-serif;
1110

1211
--main-color: #383838;
1312
--main-color-light: #858585;
@@ -23,8 +22,6 @@
2322
--header-bg-color: var(--violet);
2423
--main-bg: white;
2524
--footer-bg-color: var(--dark-grey);
26-
27-
--font-family: "Fira Sans", sans-serif;
2825
}
2926

3027
* {

config/nginx.conf.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ http {
188188
add_header X-Frame-Options "SAMEORIGIN";
189189
add_header X-XSS-Protection "1; mode=block";
190190

191-
add_header Content-Security-Policy "default-src 'self'; connect-src 'self' https://docs.rs https://<%= s3_host(ENV) %>; script-src 'self' 'unsafe-eval' https://www.google.com https://www.gstatic.com; style-src 'self' 'unsafe-inline' https://www.google.com https://ajax.googleapis.com https://fonts.googleapis.com; font-src https://fonts.gstatic.com; img-src *; object-src 'none'";
191+
add_header Content-Security-Policy "default-src 'self'; connect-src 'self' https://docs.rs https://<%= s3_host(ENV) %>; script-src 'self' 'unsafe-eval' https://www.google.com https://www.gstatic.com; style-src 'self' 'unsafe-inline' https://www.google.com https://ajax.googleapis.com https://code.cdn.mozilla.net; font-src https://code.cdn.mozilla.net; img-src *; object-src 'none'";
192192
add_header Access-Control-Allow-Origin "*";
193193

194194
add_header Strict-Transport-Security "max-age=31536000" always;

0 commit comments

Comments
 (0)