auto merge of #9960 : adridu59/rust/patch-doc-limited, r=alexcrichton

This is #9868 but doesn't move css files to a separate subfolder, which was causing errors on the Rust buildbot. @alexcrichton
author: bors <bors@rust-lang.org> 2013-10-21 18:06:34 -0700
committer: bors <bors@rust-lang.org> 2013-10-21 18:06:34 -0700
commit: 8a60caa107b7a55f480ae60a5184bd2e2a6319e7 (patch)
tree: aaaf7461505acaa2d8b5cf9a6c54e0f6e0f3ff9a /src
parent: 7e4404b6fbbf28bbe115ab8837f929e51c831a31 (diff)
parent: 22465e9561293752c195e32f85644a6b141850d3 (diff)
download: rust-8a60caa107b7a55f480ae60a5184bd2e2a6319e7.tar.gz
rust-8a60caa107b7a55f480ae60a5184bd2e2a6319e7.zip
3 files changed, 23 insertions, 431 deletions
diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs
index d29bf5ed55b..5f3ffd185e7 100644
--- a/src/librustdoc/html/layout.rs
+++ b/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/src/librustdoc/html/static/main.css b/src/librustdoc/html/static/main.css
index f24110a62eb..3abd5f3ee9c 100644
--- a/src/librustdoc/html/static/main.css
+++ b/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,29 +17,33 @@
           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;
@@ -48,28 +51,13 @@ h1.fqn {
 }
 
 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/src/librustdoc/html/static/normalize.css b/src/librustdoc/html/static/normalize.css
index 6adf56e7985..fd2854ab60f 100644
--- a/src/librustdoc/html/static/normalize.css
+++ b/src/librustdoc/html/static/normalize.css
@@ -1,396 +1 @@
-/*! normalize.css v2.1.2 | MIT License | git.io/normalize */
-
-/* ==========================================================================
-   HTML5 display definitions
-   ========================================================================== */
-
-/**
- * Correct `block` display not defined in IE 8/9.
- */
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-main,
-nav,
-section,
-summary {
-    display: block;
-}
-
-/**
- * Correct `inline-block` display not defined in IE 8/9.
- */
-
-audio,
-canvas,
-video {
-    display: inline-block;
-}
-
-/**
- * Prevent modern browsers from displaying `audio` without controls.
- * Remove excess height in iOS 5 devices.
- */
-
-audio:not([controls]) {
-    display: none;
-    height: 0;
-}
-
-/**
- * Address styling not present in IE 8/9.
- */
-
-[hidden] {
-    display: none;
-}
-
-/* ==========================================================================
-   Base
-   ========================================================================== */
-
-/**
- * 1. Set default font family to sans-serif.
- * 2. Prevent iOS text size adjust after orientation change, without disabling
- *    user zoom.
- */
-
-html {
-    font-family: sans-serif; /* 1 */
-    -ms-text-size-adjust: 100%; /* 2 */
-    -webkit-text-size-adjust: 100%; /* 2 */
-}
-
-/**
- * Remove default margin.
- */
-
-body {
-    margin: 0;
-}
-
-/* ==========================================================================
-   Links
-   ========================================================================== */
-
-/**
- * Address `outline` inconsistency between Chrome and other browsers.
- */
-
-a:focus {
-    outline: thin dotted;
-}
-
-/**
- * Improve readability when focused and also mouse hovered in all browsers.
- */
-
-a:active,
-a:hover {
-    outline: 0;
-}
-
-/* ==========================================================================
-   Typography
-   ========================================================================== */
-
-/**
- * Address variable `h1` font-size and margin within `section` and `article`
- * contexts in Firefox 4+, Safari 5, and Chrome.
- */
-
-h1 {
-    font-size: 2em;
-    margin: 0.67em 0;
-}
-
-/**
- * Address styling not present in IE 8/9, Safari 5, and Chrome.
- */
-
-abbr[title] {
-    border-bottom: 1px dotted;
-}
-
-/**
- * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
- */
-
-b,
-strong {
-    font-weight: bold;
-}
-
-/**
- * Address styling not present in Safari 5 and Chrome.
- */
-
-dfn {
-    font-style: italic;
-}
-
-/**
- * Address differences between Firefox and other browsers.
- */
-
-hr {
-    -moz-box-sizing: content-box;
-    box-sizing: content-box;
-    height: 0;
-}
-
-/**
- * Address styling not present in IE 8/9.
- */
-
-mark {
-    background: #ff0;
-    color: #000;
-}
-
-/**
- * Correct font family set oddly in Safari 5 and Chrome.
- */
-
-code,
-kbd,
-pre,
-samp {
-    font-family: monospace, serif;
-    font-size: 1em;
-}
-
-/**
- * Improve readability of pre-formatted text in all browsers.
- */
-
-pre {
-    white-space: pre-wrap;
-}
-
-/**
- * Set consistent quote types.
- */
-
-q {
-    quotes: "\201C" "\201D" "\2018" "\2019";
-}
-
-/**
- * Address inconsistent and variable font size in all browsers.
- */
-
-small {
-    font-size: 80%;
-}
-
-/**
- * Prevent `sub` and `sup` affecting `line-height` in all browsers.
- */
-
-sub,
-sup {
-    font-size: 75%;
-    line-height: 0;
-    position: relative;
-    vertical-align: baseline;
-}
-
-sup {
-    top: -0.5em;
-}
-
-sub {
-    bottom: -0.25em;
-}
-
-/* ==========================================================================
-   Embedded content
-   ========================================================================== */
-
-/**
- * Remove border when inside `a` element in IE 8/9.
- */
-
-img {
-    border: 0;
-}
-
-/**
- * Correct overflow displayed oddly in IE 9.
- */
-
-svg:not(:root) {
-    overflow: hidden;
-}
-
-/* ==========================================================================
-   Figures
-   ========================================================================== */
-
-/**
- * Address margin not present in IE 8/9 and Safari 5.
- */
-
-figure {
-    margin: 0;
-}
-
-/* ==========================================================================
-   Forms
-   ========================================================================== */
-
-/**
- * Define consistent border, margin, and padding.
- */
-
-fieldset {
-    border: 1px solid #c0c0c0;
-    margin: 0 2px;
-    padding: 0.35em 0.625em 0.75em;
-}
-
-/**
- * 1. Correct `color` not being inherited in IE 8/9.
- * 2. Remove padding so people aren't caught out if they zero out fieldsets.
- */
-
-legend {
-    border: 0; /* 1 */
-    padding: 0; /* 2 */
-}
-
-/**
- * 1. Correct font family not being inherited in all browsers.
- * 2. Correct font size not being inherited in all browsers.
- * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
- */
-
-button,
-input,
-select,
-textarea {
-    font-family: inherit; /* 1 */
-    font-size: 100%; /* 2 */
-    margin: 0; /* 3 */
-}
-
-/**
- * Address Firefox 4+ setting `line-height` on `input` using `!important` in
- * the UA stylesheet.
- */
-
-button,
-input {
-    line-height: normal;
-}
-
-/**
- * Address inconsistent `text-transform` inheritance for `button` and `select`.
- * All other form control elements do not inherit `text-transform` values.
- * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
- * Correct `select` style inheritance in Firefox 4+ and Opera.
- */
-
-button,
-select {
-    text-transform: none;
-}
-
-/**
- * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
- *    and `video` controls.
- * 2. Correct inability to style clickable `input` types in iOS.
- * 3. Improve usability and consistency of cursor style between image-type
- *    `input` and others.
- */
-
-button,
-html input[type="button"], /* 1 */
-input[type="reset"],
-input[type="submit"] {
-    -webkit-appearance: button; /* 2 */
-    cursor: pointer; /* 3 */
-}
-
-/**
- * Re-set default cursor for disabled elements.
- */
-
-button[disabled],
-html input[disabled] {
-    cursor: default;
-}
-
-/**
- * 1. Address box sizing set to `content-box` in IE 8/9.
- * 2. Remove excess padding in IE 8/9.
- */
-
-input[type="checkbox"],
-input[type="radio"] {
-    box-sizing: border-box; /* 1 */
-    padding: 0; /* 2 */
-}
-
-/**
- * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
- * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
- *    (include `-moz` to future-proof).
- */
-
-input[type="search"] {
-    -webkit-appearance: textfield; /* 1 */
-    -moz-box-sizing: content-box;
-    -webkit-box-sizing: content-box; /* 2 */
-    box-sizing: content-box;
-}
-
-/**
- * Remove inner padding and search cancel button in Safari 5 and Chrome
- * on OS X.
- */
-
-input[type="search"]::-webkit-search-cancel-button,
-input[type="search"]::-webkit-search-decoration {
-    -webkit-appearance: none;
-}
-
-/**
- * Remove inner padding and border in Firefox 4+.
- */
-
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-    border: 0;
-    padding: 0;
-}
-
-/**
- * 1. Remove default vertical scrollbar in IE 8/9.
- * 2. Improve readability and alignment in all browsers.
- */
-
-textarea {
-    overflow: auto; /* 1 */
-    vertical-align: top; /* 2 */
-}
-
-/* ==========================================================================
-   Tables
-   ========================================================================== */
-
-/**
- * Remove most spacing between table cells.
- */
-
-table {
-    border-collapse: collapse;
-    border-spacing: 0;
-}
+/*! normalize.css v2.1.2 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:.67em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}
\ No newline at end of file
author	bors <bors@rust-lang.org>	2013-10-21 18:06:34 -0700
committer	bors <bors@rust-lang.org>	2013-10-21 18:06:34 -0700
commit	8a60caa107b7a55f480ae60a5184bd2e2a6319e7 (patch)
tree	aaaf7461505acaa2d8b5cf9a6c54e0f6e0f3ff9a /src
parent	7e4404b6fbbf28bbe115ab8837f929e51c831a31 (diff)
parent	22465e9561293752c195e32f85644a6b141850d3 (diff)
download	rust-8a60caa107b7a55f480ae60a5184bd2e2a6319e7.tar.gz rust-8a60caa107b7a55f480ae60a5184bd2e2a6319e7.zip