about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-11-02 18:44:56 -0800
committerAlex Crichton <alex@alexcrichton.com>2014-11-03 08:31:45 -0800
commit82efef76c3610d1c8ff986216ff1d3f3765b1f22 (patch)
treec3ded7ca6337183f66e6cbd65ad9ab4216ea5c48
parentceb5404ee8040465fca65b92af05456edabdd038 (diff)
parentf4fb57b1106dfd386da8bec2c0617e50e1e7311f (diff)
downloadrust-82efef76c3610d1c8ff986216ff1d3f3765b1f22.tar.gz
rust-82efef76c3610d1c8ff986216ff1d3f3765b1f22.zip
rollup merge of #18500 : adrientetar/fonts
-rw-r--r--src/doc/rust.css4
-rw-r--r--src/librustdoc/html/static/SourceSerifPro-Bold.woffbin48718 -> 48720 bytes
-rw-r--r--src/librustdoc/html/static/main.css11
3 files changed, 11 insertions, 4 deletions
diff --git a/src/doc/rust.css b/src/doc/rust.css
index 4bbb8098402..9656d17721e 100644
--- a/src/doc/rust.css
+++ b/src/doc/rust.css
@@ -62,6 +62,10 @@ body {
     font-size: 18px;
     color: #333;
     line-height: 1.428571429;
+
+    -webkit-font-feature-settings: "kern", "liga";
+    -moz-font-feature-settings: "kern", "liga";
+    font-feature-settings: "kern", "liga";
 }
 @media (min-width: 768px) {
     body {
diff --git a/src/librustdoc/html/static/SourceSerifPro-Bold.woff b/src/librustdoc/html/static/SourceSerifPro-Bold.woff
index 435a6f975c9..ac1b1b3a0bb 100644
--- a/src/librustdoc/html/static/SourceSerifPro-Bold.woff
+++ b/src/librustdoc/html/static/SourceSerifPro-Bold.woff
Binary files differdiff --git a/src/librustdoc/html/static/main.css b/src/librustdoc/html/static/main.css
index 7eec634405b..7cc34798f99 100644
--- a/src/librustdoc/html/static/main.css
+++ b/src/librustdoc/html/static/main.css
@@ -69,6 +69,10 @@ body {
     margin: 0;
     position: relative;
     padding: 10px 15px 20px 15px;
+
+    -webkit-font-feature-settings: "kern", "liga";
+    -moz-font-feature-settings: "kern", "liga";
+    font-feature-settings: "kern", "liga";
 }
 
 h1 {
@@ -101,7 +105,7 @@ h3.impl, h3.method, h4.method {
 h3.impl, h3.method {
     margin-top: 15px;
 }
-h1, h2, h3, h4, section.sidebar, a.source, .search-input, .content table a, .collapse-toggle {
+h1, h2, h3, h4, section.sidebar, a.source, .search-input, .content table :not(code)>a, .collapse-toggle {
     font-family: "Fira Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
 
@@ -177,7 +181,7 @@ nav.sub {
     color: #333;
 }
 
-.location a:first-child { font-weight: bold; }
+.location a:first-child { font-weight: 500; }
 
 .block {
     padding: 0 10px;
@@ -494,7 +498,7 @@ pre.rust { position: relative; }
 }
 
 .collapse-toggle {
-    font-weight: 100;
+    font-weight: 300;
     position: absolute;
     left: 13px;
     color: #999;
@@ -523,7 +527,6 @@ pre.rust { position: relative; }
 
 .toggle-label {
     color: #999;
-    font-style: italic;
 }