OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

webfonts: proper fix

This commit is contained in:
Adrien Tétar 2014-07-08 19:51:06 +02:00
parent bfe4ddfdea
commit 4d5f4ff5e9
8 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -8,3 +8,4 @@ src/etc/pkg/rust-logo.ico binary
src/etc/pkg/rust-logo.png binary
src/rt/msvc/* -whitespace
src/rt/valgrind/* -whitespace
*.woff binary

14
src/doc/rust.css
View File

@ -23,22 +23,22 @@
src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
}
@font-face {
font-family: 'Heuristica';
font-family: 'Source Serif Pro';
font-style: normal;
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-family: 'Heuristica';
font-family: 'Source Serif Pro';
font-style: italic;
font-weight: 400;
src: local('Heuristica Italic'), url("Heuristica-Italic.woff") format('woff');
src: url("Heuristica-Italic.woff") format('woff');
}
@font-face {
font-family: 'Heuristica';
font-family: 'Source Serif Pro';
font-style: normal;
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) {
@ -52,7 +52,7 @@
body {
margin: 0 auto;
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;
color: #333;
line-height: 1.428571429;

8
src/librustdoc/html/render.rs
View File

@ -478,12 +478,12 @@ fn write_shared(cx: &Context,
include_bin!("static/FiraSans-Regular.woff")));
try!(write(cx.dst.join("FiraSans-Medium.woff"),
include_bin!("static/FiraSans-Medium.woff")));
try!(write(cx.dst.join("Heuristica-Regular.woff"),
include_bin!("static/Heuristica-Regular.woff")));
try!(write(cx.dst.join("SourceSerifPro-Bold.woff"),
include_bin!("static/SourceSerifPro-Bold.woff")));
try!(write(cx.dst.join("Heuristica-Italic.woff"),
include_bin!("static/Heuristica-Italic.woff")));
try!(write(cx.dst.join("Heuristica-Bold.woff"),
include_bin!("static/Heuristica-Bold.woff")));
try!(write(cx.dst.join("SourceSerifPro-Bold.woff"),
include_bin!("static/SourceSerifPro-Bold.woff")));
fn collect(path: &Path, krate: &str,
key: &str) -> io::IoResult<Vec<String>> {

BIN
src/librustdoc/html/static/Heuristica-Bold.woff
View File

Binary file not shown.

BIN
src/librustdoc/html/static/Heuristica-Regular.woff
View File

Binary file not shown.

BIN
src/librustdoc/html/static/SourceSerifPro-Bold.woff Normal file
View File

Binary file not shown.

BIN
src/librustdoc/html/static/SourceSerifPro-Regular.woff Normal file
View File

Binary file not shown.

14
src/librustdoc/html/static/main.css
View File

@ -22,22 +22,22 @@
src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
}
@font-face {
font-family: 'Heuristica';
font-family: 'Source Serif Pro';
font-style: normal;
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-family: 'Heuristica';
font-family: 'Source Serif Pro';
font-style: italic;
font-weight: 400;
src: local('Heuristica Italic'), url("Heuristica-Italic.woff") format('woff');
src: url("Heuristica-Italic.woff") format('woff');
}
@font-face {
font-family: 'Heuristica';
font-family: 'Source Serif Pro';
font-style: normal;
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";
@ -53,7 +53,7 @@
body {
color: #333;
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;
position: relative;
padding: 10px 15px 20px 15px;