Skip to content

Commit

Permalink
Auto merge of #26882 - andreastt:style_improvements, r=alexcrichton
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Jul 11, 2015
2 parents d18eb74 + 885e701 commit b8bb908
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/librustdoc/html/layout.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ r##"<!DOCTYPE html>
<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>
Expand All @@ -85,7 +85,7 @@ r##"<!DOCTYPE html>
<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>
Expand All @@ -100,7 +100,7 @@ r##"<!DOCTYPE html>
</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.
Expand Down
3 changes: 1 addition & 2 deletions src/librustdoc/html/static/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit b8bb908

Please sign in to comment.