Skip to content

Commit 02f911b

Browse files
Merge pull request #610 from rust-lang/revert-587-master
Revert style changes to search bar
2 parents 5618f17 + e9fb5a8 commit 02f911b

File tree

3 files changed

+11
-32
lines changed

3 files changed

+11
-32
lines changed

templates/navigation.hbs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
<div class="pure-menu pure-menu-horizontal" role="navigation" aria-label="Main navigation">
44
<form action="/releases/search" method="GET" class="landing-search-form-nav">
55
{{#unless varsb.show_search_form}}
6-
<div class="search-input-nav">
7-
<label for="nav-search"><i class="fa fa-fw fa-search"></i></label>
8-
<input id="nav-search" name="query" type="text" aria-label="Find crate by search query" placeholder="Find crate"{{#if varss.search_query}} value="{{varss.search_query}}"{{/if}}>
9-
</div>
6+
<input class="search-input-nav" name="query" type="text" aria-label="Find crate by search query" placeholder="Find crate"{{#if varss.search_query}} value="{{varss.search_query}}"{{/if}}>
107
{{/unless}}
118
<a href="/" class="pure-menu-heading pure-menu-link" aria-label="Docs.rs"><i class="fa fa-cubes fa-fw"></i> Docs.rs</a>
129
<ul class="pure-menu-list">

templates/navigation_rustdoc.hbs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
<div class="pure-menu pure-menu-horizontal">
44
<form action="/releases/search" method="GET" class="landing-search-form-nav">
55
{{#unless varsb.show_search_form}}
6-
<div class="search-input-nav">
7-
<label for="nav-search"><i class="fa fa-fw fa-search"></i></label>
8-
<input id="nav-search" name="query" type="text" aria-label="Find crate by search query" placeholder="Find crate"{{#if varss.search_query}} value="{{varss.search_query}}"{{/if}}>
9-
</div>
6+
<input class="search-input-nav" name="query" aria-label="Find crate by search query" tabindex="-1" type="text" placeholder="Find crate"{{#if varss.search_query}} value="{{varss.search_query}}"{{/if}}>
107
{{/unless}}
118
<a href="/" class="pure-menu-heading pure-menu-link"><i class="fa fa-cubes fa-fw"></i><span class="title"> Docs.rs</span></a>
129
{{#with content.crate_details}}

templates/style.scss

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -173,37 +173,22 @@ div.nav-container {
173173
form.landing-search-form-nav {
174174
max-width: 1200px;
175175

176-
div.search-input-nav {
176+
input.search-input-nav {
177177
float: right;
178-
max-width: 150px;
178+
max-width: 200px;
179+
border: none;
180+
margin: 0 1em 0 0;
181+
font-size: 0.8em;
182+
text-align: right;
183+
box-shadow: none;
184+
background-color: #fff;
185+
height: 31px;
179186
display: none;
180-
border-left: 1px solid $color-border;
181187

182188
@media #{$media-sm} {
183189
display: block;
184190
}
185-
186-
@media #{$media-md} {
187-
max-width: 200px;
188-
}
189-
190-
label {
191-
color: #777;
192-
cursor: pointer;
193-
padding-left: 0.5rem;
194-
font-size: 0.8em;
195-
}
196-
197-
input {
198-
border: none;
199-
margin: 0 1em 0 0;
200-
font-size: 0.8em;
201-
box-shadow: none;
202-
background-color: #fff;
203-
height: 31px;
204-
}
205191
}
206-
207192

208193
input.search-input-nav:focus {
209194
outline: unset;

0 commit comments

Comments
 (0)