From c494a06064017f307a8d9dc4797e614d2ed99143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20T=C3=A9tar?= Date: Fri, 18 Apr 2014 11:08:34 +0900 Subject: [PATCH] doc: unifying with rustdoc Conflicts: src/doc/rust.md --- src/doc/rust.css | 38 ++++++++++++++------------- src/librustdoc/html/layout.rs | 13 +++++----- src/librustdoc/html/render.rs | 2 +- src/librustdoc/html/static/main.css | 40 +++++++++++++++++------------ 4 files changed, 50 insertions(+), 43 deletions(-) diff --git a/src/doc/rust.css b/src/doc/rust.css index 2177123cfde7b..b581dc2cce82b 100644 --- a/src/doc/rust.css +++ b/src/doc/rust.css @@ -14,38 +14,38 @@ font-family: 'Fira Sans'; font-style: normal; font-weight: 400; - src: local('Fira Sans'), url("http://rust-lang.org/fonts/FiraSans-Regular.woff") format('woff'); + src: local('Fira Sans'), url("http://www.rust-lang.org/fonts/FiraSans-Regular.woff") format('woff'); } @font-face { font-family: 'Fira Sans'; font-style: normal; font-weight: 500; - src: local('Fira Sans Medium'), url("http://rust-lang.org/fonts/FiraSans-Medium.woff") format('woff'); + src: local('Fira Sans Medium'), url("http://www.rust-lang.org/fonts/FiraSans-Medium.woff") format('woff'); } @font-face { font-family: 'Heuristica'; font-style: normal; font-weight: 400; - src: local('Heuristica Regular'), url("http://rust-lang.org/fonts/Heuristica-Regular.woff") format('woff'); + src: local('Heuristica Regular'), url("http://www.rust-lang.org/fonts/Heuristica-Regular.woff") format('woff'); } @font-face { font-family: 'Heuristica'; font-style: italic; font-weight: 400; - src: local('Heuristica Italic'), url("http://rust-lang.org/fonts/Heuristica-Italic.woff") format('woff'); + src: local('Heuristica Italic'), url("http://www.rust-lang.org/fonts/Heuristica-Italic.woff") format('woff'); } @font-face { font-family: 'Heuristica'; font-style: normal; font-weight: 700; - src: local('Heuristica Bold'), url("http://rust-lang.org/fonts/Heuristica-Bold.woff") format('woff'); + src: local('Heuristica Bold'), url("http://www.rust-lang.org/fonts/Heuristica-Bold.woff") format('woff'); } /* Global page semantics ========================================================================== */ body { margin: 0 auto; padding: 0 15px; - font-family: Heuristica, "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Heuristica", "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 18px; color: #333; line-height: 1.428571429; @@ -66,9 +66,16 @@ h1, h2, h3, h4, h5, h6 { } h1, h2, h3 { margin-top: 20px; - margin-bottom: 10px; + margin-bottom: 15px; +} +h1 { + margin-bottom: 20px; } @media (min-width: 1170px) { + h1 { + margin-top: 40px; + margin-bottom: 30px; + } h1, h2, h3 { margin-top: 30px; margin-bottom: 15px; @@ -87,7 +94,6 @@ h1 { font-size: 28px; font-weight: 500; padding: .1em .4em; - margin: 0.67em 0; border-bottom: 2px solid #ddd; } h1.title { @@ -227,7 +233,7 @@ pre.rust .lifetime { color: #B76514; } margin: 0.5em; font-size: 1.1em; } -@media handheld, only screen and (min-width: 768px) { +@media only screen and (min-width: 768px) { #versioninfo { position: fixed; bottom: 0px; @@ -254,21 +260,16 @@ blockquote { blockquote p { font-size: 17px; font-weight: 300; - line-height: 1.25; + line-height: 1.4; } blockquote p:last-child { margin-bottom: 0; } -ul, -ol { - margin-top: 0; - margin-bottom: 10px; +ul, ol { + padding-left: 25px; } -ul ul, -ol ul, -ul ol, -ol ol { +ul ul, ol ul, ul ol, ol ol { margin-bottom: 0; } dl { @@ -280,6 +281,7 @@ dd { nav ul { list-style-type: none; + margin: 0; padding-left: 0px; } diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs index 0b5ca604cc306..d0cfabc8c1106 100644 --- a/src/librustdoc/html/layout.rs +++ b/src/librustdoc/html/layout.rs @@ -32,13 +32,13 @@ pub fn render( r##" - - + + {title} - @@ -54,7 +54,7 @@ r##"
{logo, select, none{} other{ - + }} {sidebar} @@ -66,7 +66,7 @@ r##" + type="search"> @@ -115,8 +115,7 @@ r##" - -"##, +"##, content = *t, root_path = page.root_path, ty = page.ty, diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index f842c44dec88c..1ea2d3fdf9508 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -976,7 +976,7 @@ impl<'a> fmt::Show for Item<'a> { format!("{}-{}", self.item.source.loline, self.item.source.hiline) }; try!(write!(fmt.buf, - "\ [src]", root = self.cx.root_path, diff --git a/src/librustdoc/html/static/main.css b/src/librustdoc/html/static/main.css index 9a9b00e7d5d42..9a0b991237397 100644 --- a/src/librustdoc/html/static/main.css +++ b/src/librustdoc/html/static/main.css @@ -13,31 +13,31 @@ font-family: 'Fira Sans'; font-style: normal; font-weight: 400; - src: local('Fira Sans'), url("http://rust-lang.org/fonts/FiraSans-Regular.woff") format('woff'); + src: local('Fira Sans'), url("http://www.rust-lang.org/fonts/FiraSans-Regular.woff") format('woff'); } @font-face { font-family: 'Fira Sans'; font-style: normal; font-weight: 500; - src: local('Fira Sans Medium'), url("http://rust-lang.org/fonts/FiraSans-Medium.woff") format('woff'); + src: local('Fira Sans Medium'), url("http://www.rust-lang.org/fonts/FiraSans-Medium.woff") format('woff'); } @font-face { font-family: 'Heuristica'; font-style: normal; font-weight: 400; - src: local('Heuristica Regular'), url("http://rust-lang.org/fonts/Heuristica-Regular.woff") format('woff'); + src: local('Heuristica Regular'), url("http://www.rust-lang.org/fonts/Heuristica-Regular.woff") format('woff'); } @font-face { font-family: 'Heuristica'; font-style: italic; font-weight: 400; - src: local('Heuristica Italic'), url("http://rust-lang.org/fonts/Heuristica-Italic.woff") format('woff'); + src: local('Heuristica Italic'), url("http://www.rust-lang.org/fonts/Heuristica-Italic.woff") format('woff'); } @font-face { font-family: 'Heuristica'; font-style: normal; font-weight: 700; - src: local('Heuristica Bold'), url("http://rust-lang.org/fonts/Heuristica-Bold.woff") format('woff'); + src: local('Heuristica Bold'), url("http://www.rust-lang.org/fonts/Heuristica-Bold.woff") format('woff'); } @import "normalize.css"; @@ -58,39 +58,46 @@ body { margin: 0; position: relative; padding: 10px 15px 20px 15px; - padding-bottom: 20px; } -h1, h2, h3, h4 { +h1, h2, h3:not(.impl), h4:not(.method) { color: black; font-weight: 500; margin: 30px 0 20px 0; - padding-bottom: 15px; + padding-bottom: 6px; } h1.fqn { border-bottom: 1px dashed #D5D5D5; margin-top: 0; } -h2, h3, h4 { +h2, h3:not(.impl), h4:not(.method) { border-bottom: 1px solid #DDDDDD; } -h2 code, h3 code, h4 code, .block a { - font-size: 1.2em; +h3.impl, h4.method { + font-weight: 600; + margin-top: 10px; + margin-bottom: 10px; +} +h3.impl { + margin-top: 15px; } -h1, h2, h3, h4, section.sidebar, a.source, .content a, .search-input { +h1, h2, h3, h4, section.sidebar, a.source, .content a.mod, .search-input { font-family: "Fira Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; } -ul { +ol, ul { padding-left: 25px; } +ul ul, ol ul, ul ol, ol ol { + margin-bottom: 0; +} p { margin: 0 0 1em 0; } code, pre { - font-family: Menlo, Monaco, Consolas, Inconsolata, "DejaVu Sans Mono", monospace; + font-family: "Source Code Pro", Menlo, Monaco, Consolas, "DejaVu Sans Mono", Inconsolata, monospace; } pre { font-size: 15px; @@ -194,9 +201,8 @@ nav.sub { } .docblock h1, .docblock h2, .docblock h3, .docblock h4, .docblock h5 { - margin-left: 0; margin: 40px 0 10px 0; - padding-bottom: 10px; + padding: 10px 0; border-bottom: 1px solid #DDD; } @@ -384,7 +390,7 @@ h3.section-link:hover a:after, h4.section-link:hover a:after, h5.section-link:hover a:after, h6.section-link:hover a:after { - content: ' § '; + content: '\2002\00a7\2002'; } /** Media Queries **/