serv/surwiki
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Serve header font

Browse source
This commit is contained in:
Magnus Hoff 2017-09-15 15:03:00 +02:00
parent 53c4ff1b5c
commit 51fe78abce
4 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
assets/amatic-sc-v9-latin-regular.woff Normal file
View file

Binary file not shown.

10
assets/style.css
View file

@ -1,3 +1,11 @@
@font-face {
font-family: 'Amatic SC';
font-style: normal;
font-weight: 400;
src: local('Amatic SC Regular'), local('AmaticSC-Regular'),
url('amatic-sc-v9-latin-regular.woff') format('woff');
}
html { html {
font-family: "Apple Garamond", "Baskerville", font-family: "Apple Garamond", "Baskerville",
"Times New Roman", "Droid Serif", "Times", "Times New Roman", "Droid Serif", "Times",
@ -5,7 +13,7 @@ html {
} }
h1 { h1 {
font-family: 'Amatic SC', cursive; font-family: 'Amatic SC', sans-serif;
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;

13
src/site.rs
View file

@ -6,7 +6,7 @@ use std::fmt;
use futures::{self, Future}; use futures::{self, Future};
use hyper; use hyper;
use hyper::header::ContentType; use hyper::header::{ContentType, ContentLength, CacheControl, CacheDirective};
use hyper::mime; use hyper::mime;
use hyper::server::*; use hyper::server::*;
use serde_json; use serde_json;
@ -82,6 +82,11 @@ struct StyleCss;
#[mime = "application/javascript"] #[mime = "application/javascript"]
struct ScriptJs; struct ScriptJs;
#[derive(StaticResource)]
#[filename = "assets/amatic-sc-v9-latin-regular.woff"]
#[mime = "application/font-woff"]
struct AmaticFont;
struct WikiLookup { struct WikiLookup {
state: State, state: State,
lookup_map: HashMap<String, Box<Fn() -> Box<Resource + Sync + Send>>>, lookup_map: HashMap<String, Box<Fn() -> Box<Resource + Sync + Send>>>,
@ -103,6 +108,12 @@ impl WikiLookup {
as Box<Fn() -> Box<Resource + Sync + Send>> as Box<Fn() -> Box<Resource + Sync + Send>>
); );
lookup_map.insert(
format!("/_assets/amatic-sc-v9-latin-regular.woff"),
Box::new(|| Box::new(AmaticFont) as Box<Resource + Sync + Send>)
as Box<Fn() -> Box<Resource + Sync + Send>>
);
WikiLookup { state, lookup_map } WikiLookup { state, lookup_map }
} }
} }

2
templates/layout.html
View file

@ -3,7 +3,7 @@
<head> <head>
<title>{{title}}</title> <title>{{title}}</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://fonts.googleapis.com/css?family=Amatic+SC" rel="stylesheet"> <link rel=preload href="_assets/amatic-sc-v9-latin-regular.woff" as=font crossorigin>
<link href="_assets/style-{{style_css_checksum}}.css" rel="stylesheet"> <link href="_assets/style-{{style_css_checksum}}.css" rel="stylesheet">
</head> </head>
<body> <body>