Skip to content

Use sans-serif fonts in rustdoc #16207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Use sans-serif fonts in rustdoc #16207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/doc/rust.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,22 @@
src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
}
@font-face {
font-family: 'Source Serif Pro';
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 400;
src: local('Source Serif Pro'), url("SourceSerifPro-Regular.woff") format('woff');
src: local('Source Sans Pro'), url("SourceSansPro-Regular.woff") format('woff');
}
@font-face {
font-family: 'Source Serif Pro';
font-family: 'Source Sans Pro';
font-style: italic;
font-weight: 400;
src: url("Heuristica-Italic.woff") format('woff');
}
@font-face {
font-family: 'Source Serif Pro';
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 700;
src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.woff") format('woff');
src: local('Source Sans Pro Bold'), url("SourceSansPro-Bold.woff") format('woff');
}
@font-face {
font-family: 'Source Code Pro';
Expand All @@ -58,7 +58,7 @@
body {
margin: 0 auto;
padding: 0 15px;
font-family: "Source Serif Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 18px;
color: #333;
line-height: 1.428571429;
Expand Down
8 changes: 4 additions & 4 deletions src/librustdoc/html/render.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,10 +488,10 @@ fn write_shared(cx: &Context,
include_bin!("static/FiraSans-Medium.woff")));
try!(write(cx.dst.join("Heuristica-Italic.woff"),
include_bin!("static/Heuristica-Italic.woff")));
try!(write(cx.dst.join("SourceSerifPro-Regular.woff"),
include_bin!("static/SourceSerifPro-Regular.woff")));
try!(write(cx.dst.join("SourceSerifPro-Bold.woff"),
include_bin!("static/SourceSerifPro-Bold.woff")));
try!(write(cx.dst.join("SourceSansPro-Regular.woff"),
include_bin!("static/SourceSansPro-Regular.woff")));
try!(write(cx.dst.join("SourceSansPro-Bold.woff"),
include_bin!("static/SourceSansPro-Bold.woff")));
try!(write(cx.dst.join("SourceCodePro-Regular.woff"),
include_bin!("static/SourceCodePro-Regular.woff")));
try!(write(cx.dst.join("SourceCodePro-Semibold.woff"),
Expand Down
Binary file added src/librustdoc/html/static/SourceSansPro-Bold.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/librustdoc/html/static/SourceSansPro-It.woff
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ...oc/html/static/SourceSerifPro-LICENSE.txt → ...doc/html/static/SourceSansPro-LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2014 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
Copyright 2010, 2012, 2014 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.

This Font Software is licensed under the SIL Open Font License, Version 1.1.

Expand Down
Binary file added src/librustdoc/html/static/SourceSansPro-Regular.woff
View file
Open in desktop
Binary file not shown.
Binary file removed src/librustdoc/html/static/SourceSerifPro-Bold.woff
View file
Open in desktop
Binary file not shown.
Binary file removed src/librustdoc/html/static/SourceSerifPro-Regular.woff
View file
Open in desktop
Binary file not shown.
14 changes: 7 additions & 7 deletions src/librustdoc/html/static/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,22 @@
src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
}
@font-face {
font-family: 'Source Serif Pro';
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 400;
src: local('Source Serif Pro'), url("SourceSerifPro-Regular.woff") format('woff');
src: local('Source Sans Pro'), url("SourceSansPro-Regular.woff") format('woff');
}
@font-face {
font-family: 'Source Serif Pro';
font-family: 'Source Sans Pro';
font-style: italic;
font-weight: 400;
src: url("Heuristica-Italic.woff") format('woff');
src: local('Source Sans Pro'), url("SourceSansPro-It.woff") format('woff');
}
@font-face {
font-family: 'Source Serif Pro';
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 700;
src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.woff") format('woff');
src: local('Source Sans Pro Bold'), url("SourceSansPro-Bold.woff") format('woff');
}
@font-face {
font-family: 'Source Code Pro';
Expand Down Expand Up @@ -65,7 +65,7 @@
body {
color: #333;
min-width: 500px;
font: 16px/1.4 "Source Serif Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
font: 16px/1.4 "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
margin: 0;
position: relative;
padding: 10px 15px 20px 15px;
Expand Down