about summary refs log tree commit diff
diff options
context:
space:
mode:
authorValentin Tsatskin <vtsatskin@mozilla.com>2014-06-13 15:15:37 -0700
committerValentin Tsatskin <vtsatskin@mozilla.com>2014-06-13 15:15:37 -0700
commit0188bebbb703baa7d3cc9608196d9cbd7707a1e0 (patch)
tree4c6ea47cc61e4e1c73a8db581dc3651d0a9f2d07
parente7f11f20e5e72a3b22863a9913df94303321a5ce (diff)
downloadrust-0188bebbb703baa7d3cc9608196d9cbd7707a1e0.tar.gz
rust-0188bebbb703baa7d3cc9608196d9cbd7707a1e0.zip
rustdoc: Larger click areas for sidebar items
* Change links to display:block for click larger targets
* Remove linebreaks due to extra space
* Adjust margins so that element spacing stays the same
* Sidebar item hover background colour chosen from <pre> styling
-rw-r--r--src/librustdoc/html/render.rs2
-rw-r--r--src/librustdoc/html/static/main.css12
-rw-r--r--src/librustdoc/html/static/main.js1
3 files changed, 9 insertions, 6 deletions
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index 541af97ba43..c6a6eb29add 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -2001,7 +2001,7 @@ impl<'a> fmt::Show for Sidebar<'a> {
                 let class = if cur.name.get_ref() == item &&
                                short == curty { "current" } else { "" };
                 try!(write!(w, "<a class='{ty} {class}' href='{href}{path}'>\
-                                {name}</a><br/>",
+                                {name}</a>",
                        ty = short,
                        class = class,
                        href = if curty == "mod" {"../"} else {""},
diff --git a/src/librustdoc/html/static/main.css b/src/librustdoc/html/static/main.css
index 07dd1a6c173..a7bd082ec17 100644
--- a/src/librustdoc/html/static/main.css
+++ b/src/librustdoc/html/static/main.css
@@ -154,25 +154,29 @@ nav.sub {
 
 .block {
     padding: 0 10px;
-    margin-bottom: 10px;
+    margin-bottom: 14px;
 }
 .block h2 {
     margin-top: 0;
+    margin-bottom: 8px;
     text-align: center;
 }
 
 .block a {
-    display: inline-block;
+    display: block;
     text-overflow: ellipsis;
     overflow: hidden;
     line-height: 15px;
-    padding-left: 5px;
-    padding-bottom: 6px;
+    padding: 7px 5px;
     font-size: 14px;
     font-weight: 300;
     transition: border 500ms ease-out;
 }
 
+.block a:hover {
+    background: #F5F5F5;
+}
+
 .content {
     padding: 15px 0;
 }
diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js
index 195028c85bf..697199e9abf 100644
--- a/src/librustdoc/html/static/main.js
+++ b/src/librustdoc/html/static/main.js
@@ -647,7 +647,6 @@
                 }
                 div.append($('<a>', {'href': '../' + crates[i] + '/index.html',
                                     'class': klass}).text(crates[i]));
-                div.append($('<br>'));
             }
             sidebar.append(div);
         }