]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #26882 - andreastt:style_improvements, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 11 Jul 2015 21:48:44 +0000 (21:48 +0000)
committerbors <bors@rust-lang.org>
Sat, 11 Jul 2015 21:48:44 +0000 (21:48 +0000)
Sharpens the help dialogues edges by removing border-padding, which
matches better with the rest of the document.

Also increases somewhat the rounded edges of the key symbols to
make it clear they are symbols.

Also introduces closing apostrophes and ellipsis for search field
placeholder.

src/librustdoc/html/layout.rs
src/librustdoc/html/static/main.css

index 798cc6a612cde239ce60be7f158839e549bbdaab..2c6f62060b2307f2c96cc1a05a10dc80509efc4e 100644 (file)
@@ -72,7 +72,7 @@ pub fn render<T: fmt::Display, S: fmt::Display>(
             <div class="search-container">
                 <input class="search-input" name="search"
                        autocomplete="off"
-                       placeholder="Click or press 'S' to search, '?' for more options..."
+                       placeholder="Click or press ‘S’ to search, ‘?’ for more options…"
                        type="search">
             </div>
         </form>
@@ -85,7 +85,7 @@ pub fn render<T: fmt::Display, S: fmt::Display>(
 
     <div id="help" class="hidden">
         <div class="shortcuts">
-            <h1>Keyboard shortcuts</h1>
+            <h1>Keyboard Shortcuts</h1>
             <dl>
                 <dt>?</dt>
                 <dd>Show this help dialog</dd>
@@ -100,7 +100,7 @@ pub fn render<T: fmt::Display, S: fmt::Display>(
             </dl>
         </div>
         <div class="infos">
-            <h1>Search tricks</h1>
+            <h1>Search Tricks</h1>
             <p>
                 Prefix searches with a type followed by a colon (e.g.
                 <code>fn:</code>) to restrict the search to a given type.
index aaebdc34cd464729ca782eea957780be535fbbc6..21f1ccc555506ddbb442aafe38c412d5e0bc69e2 100644 (file)
@@ -447,7 +447,6 @@ tr.result span.primitive::after { content: ' (primitive type)'; font-style: ital
 
 #help {
     background: #e9e9e9;
-    border-radius: 4px;
     box-shadow: 0 0 6px rgba(0,0,0,.2);
     position: absolute;
     top: 300px;
@@ -461,7 +460,7 @@ tr.result span.primitive::after { content: ' (primitive type)'; font-style: ital
 
 #help dt {
     float: left;
-    border-radius: 3px;
+    border-radius: 4px;
     border: 1px solid #bfbfbf;
     background: #fff;
     width: 23px;