mirror of https://github.com/rust-lang/rust.git
webfonts: proper fix
This commit is contained in:
parent
bfe4ddfdea
commit
4d5f4ff5e9
|
@ -8,3 +8,4 @@ src/etc/pkg/rust-logo.ico binary
|
||||||
src/etc/pkg/rust-logo.png binary
|
src/etc/pkg/rust-logo.png binary
|
||||||
src/rt/msvc/* -whitespace
|
src/rt/msvc/* -whitespace
|
||||||
src/rt/valgrind/* -whitespace
|
src/rt/valgrind/* -whitespace
|
||||||
|
*.woff binary
|
||||||
|
|
|
@ -23,22 +23,22 @@
|
||||||
src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
|
src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
|
||||||
}
|
}
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'Heuristica';
|
font-family: 'Source Serif Pro';
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
src: local('Heuristica Regular'), url("Heuristica-Regular.woff") format('woff');
|
src: local('Source Serif Pro'), url("SourceSerifPro-Regular.woff") format('woff');
|
||||||
}
|
}
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'Heuristica';
|
font-family: 'Source Serif Pro';
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
src: local('Heuristica Italic'), url("Heuristica-Italic.woff") format('woff');
|
src: url("Heuristica-Italic.woff") format('woff');
|
||||||
}
|
}
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'Heuristica';
|
font-family: 'Source Serif Pro';
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
src: local('Heuristica Bold'), url("Heuristica-Bold.woff") format('woff');
|
src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.woff") format('woff');
|
||||||
}
|
}
|
||||||
|
|
||||||
*:not(body) {
|
*:not(body) {
|
||||||
|
@ -52,7 +52,7 @@
|
||||||
body {
|
body {
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
padding: 0 15px;
|
padding: 0 15px;
|
||||||
font-family: "Heuristica", "Helvetica Neue", Helvetica, Arial, sans-serif;
|
font-family: "Source Serif Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
color: #333;
|
color: #333;
|
||||||
line-height: 1.428571429;
|
line-height: 1.428571429;
|
||||||
|
|
|
@ -478,12 +478,12 @@ fn write_shared(cx: &Context,
|
||||||
include_bin!("static/FiraSans-Regular.woff")));
|
include_bin!("static/FiraSans-Regular.woff")));
|
||||||
try!(write(cx.dst.join("FiraSans-Medium.woff"),
|
try!(write(cx.dst.join("FiraSans-Medium.woff"),
|
||||||
include_bin!("static/FiraSans-Medium.woff")));
|
include_bin!("static/FiraSans-Medium.woff")));
|
||||||
try!(write(cx.dst.join("Heuristica-Regular.woff"),
|
try!(write(cx.dst.join("SourceSerifPro-Bold.woff"),
|
||||||
include_bin!("static/Heuristica-Regular.woff")));
|
include_bin!("static/SourceSerifPro-Bold.woff")));
|
||||||
try!(write(cx.dst.join("Heuristica-Italic.woff"),
|
try!(write(cx.dst.join("Heuristica-Italic.woff"),
|
||||||
include_bin!("static/Heuristica-Italic.woff")));
|
include_bin!("static/Heuristica-Italic.woff")));
|
||||||
try!(write(cx.dst.join("Heuristica-Bold.woff"),
|
try!(write(cx.dst.join("SourceSerifPro-Bold.woff"),
|
||||||
include_bin!("static/Heuristica-Bold.woff")));
|
include_bin!("static/SourceSerifPro-Bold.woff")));
|
||||||
|
|
||||||
fn collect(path: &Path, krate: &str,
|
fn collect(path: &Path, krate: &str,
|
||||||
key: &str) -> io::IoResult<Vec<String>> {
|
key: &str) -> io::IoResult<Vec<String>> {
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -22,22 +22,22 @@
|
||||||
src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
|
src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
|
||||||
}
|
}
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'Heuristica';
|
font-family: 'Source Serif Pro';
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
src: local('Heuristica Regular'), url("Heuristica-Regular.woff") format('woff');
|
src: local('Source Serif Pro'), url("SourceSerifPro-Regular.woff") format('woff');
|
||||||
}
|
}
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'Heuristica';
|
font-family: 'Source Serif Pro';
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
src: local('Heuristica Italic'), url("Heuristica-Italic.woff") format('woff');
|
src: url("Heuristica-Italic.woff") format('woff');
|
||||||
}
|
}
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'Heuristica';
|
font-family: 'Source Serif Pro';
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
src: local('Heuristica Bold'), url("Heuristica-Bold.woff") format('woff');
|
src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.woff") format('woff');
|
||||||
}
|
}
|
||||||
|
|
||||||
@import "normalize.css";
|
@import "normalize.css";
|
||||||
|
@ -53,7 +53,7 @@
|
||||||
body {
|
body {
|
||||||
color: #333;
|
color: #333;
|
||||||
min-width: 500px;
|
min-width: 500px;
|
||||||
font: 15.5px/1.4 "Heuristica", "Helvetica Neue", Helvetica, Arial, sans-serif;
|
font: 16px/1.4 "Source Serif Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
position: relative;
|
position: relative;
|
||||||
padding: 10px 15px 20px 15px;
|
padding: 10px 15px 20px 15px;
|
||||||
|
|
Loading…
Reference in New Issue