---

adrientetar · adrientetar · commit 77d78dacc288 · 2013-10-21T04:13:09.000+02:00
yaml --- r: 93130 b: refs/heads/try c: 694b624 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: 3995495c4a16561ec853e9b20424f0569981f84d
+refs/heads/try: 694b62430537560b38efeffaa78c9592180b46df
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
diff --git a/branches/try/src/librustdoc/html/layout.rs b/branches/try/src/librustdoc/html/layout.rs
@@ -27,8 +27,8 @@ pub struct Page<'self> {
 pub fn render<T: fmt::Default, S: fmt::Default>(
     dst: &mut io::Writer, layout: &Layout, page: &Page, sidebar: &S, t: &T)
 {
-    write!(dst, "
-<!DOCTYPE html>
+    write!(dst,
+"<!DOCTYPE html>
 <html lang=\"en\">
 <head>
     <meta charset=\"utf-8\" />
@@ -38,15 +38,13 @@ pub fn render<T: fmt::Default, S: fmt::Default>(
           rel='stylesheet' type='text/css'>
     <link rel=\"stylesheet\" type=\"text/css\" href=\"{root_path}{crate}/main.css\">
 
-    {favicon, select, none{} other{
-        <link rel=\"icon\" href=\"#\" sizes=\"16x16\"
-              type=\"image/vnd.microsoft.icon\" />}}
+    {favicon, select, none{} other{<link rel=\"shortcut icon\" href=\"#\" />}}
 </head>
 <body>
     <!--[if lte IE 8]>
     <div class=\"warning\">
         This old browser is unsupported and will most likely display funky
-        things
+        things.
     </div>
     <![endif]-->
 
diff --git a/branches/try/src/librustdoc/html/static/main.css b/branches/try/src/librustdoc/html/static/main.css
@@ -9,7 +9,6 @@
  * option. This file may not be copied, modified, or distributed
  * except according to those terms.
  */
-
 @import "normalize.css";
 
 * {
@@ -18,58 +17,47 @@
           box-sizing: border-box;
 }
 
-/* Fonts */
+/* General structure and fonts */
 
 body {
-    font: 13px Arial, sans-serif;
+    min-height: 100%;
+    min-width: 500px;
+    height: 100%;
+    font: 13px "Helvetica Neue", Helvetica, Arial, sans-serif;
     line-height: 165%;
+    position: relative;
+    height: auto;
+    padding-bottom: 20px;
 }
 
 h1, .sidebar .location {
     font: 700 22px "Oswald", Arial, sans-serif;
 }
-
 h2, h3, h4 {
     font: 700 16px "Oswald", Arial, sans-serif;
     text-transform: uppercase;
 }
-
 h2 code, h3 code, h4 code {
     text-transform: none;
     font-size: 1.2em;
 }
 
 code, pre, h1.fqn {
-    font: 15px "Inconsolata", "Consolas", "Courier New", monospace;
+    font: 15px Monaco, Menlo, "Inconsolata", Consolas, "Courier New", monospace;
 }
 h1.fqn {
     font-size: 26px;
     font-weight: normal;
 }
 
 nav {
-    font: 700 26px "Oswald", Arial, sans-serif;
+    font: 700 26px "Oswald", "Helvetica Neue", Helvetica, Arial, sans-serif;
     text-transform: uppercase;
 }
-
 nav.sub {
-    padding-top: 20px;
-    font: 700 16px "Oswald", Arial, sans-serif;
+    padding-top: 10px;
+    font-size: 16px;
     text-transform: uppercase;
-    text-align: right;
-}
-
-/* General structure */
-
-html, body {
-    min-height: 100%;
-    height: 100%;
-}
-
-body {
-    position: relative;
-    height: auto;
-    padding-bottom: 20px;
 }
 
 .sidebar {
@@ -90,7 +78,6 @@ body {
     background: #e9e9e9;
     padding: 10px;
 }
-
 .sidebar img {
     margin: 20px auto;
     display: block;
@@ -156,7 +143,6 @@ body {
 .docblock h1, .docblock h2, .docblock h3, .docblock h4, .docblock h5 {
     margin-left: 0;
 }
-
 .docblock h1 { font-size: 1.1em; }
 .docblock h2 { font-size: 1.05em; }
 .docblock h3, .docblock h4, .docblock h5 { font-size: 1em; }
@@ -234,9 +220,13 @@ a {
 .content .fnname { color: #8c6067; }
 
 .search-input {
-    border: 2px solid #f2f2f2;
+    border: 2px solid #e9e9e9;
     border-radius: 2px;
-    width: 350px;
+    width: calc(100% - 66px);
+}
+.do-search {
+    float: right;
+    width: 62px;
 }
 .search-results .desc {
     white-space: nowrap;
@@ -249,7 +239,6 @@ a {
     background: #e9e9e9;
     border-radius: 4px;
     box-shadow: 0 0 6px rgba(0,0,0,.2);
-
     position: absolute;
     top: 300px;
     left: 50%;
diff --git a/branches/try/src/librustdoc/html/static/normalize.css b/branches/try/src/librustdoc/html/static/normalize.css
