Skip to content

Commit 2363a20

Browse files
GuillaumeGomezGuillaumeGomez
committed
Make search results tab and help button focusable with keyboard
1 parent e413d89 commit 2363a20

File tree

6 files changed

+23
-20
lines changed

6 files changed

+23
-20
lines changed

‎src/librustdoc/html/layout.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ crate fn render<T: Print, S: Print>(
9898
placeholder=\"Click or press ‘S’ to search, ‘?’ for more options…\" \
9999
type=\"search\">\
100100
</div>\
101-
<span class=\"help-button\">?</span>
101+
<button class=\"help-button\">?</button>
102102
<a id=\"settings-menu\" href=\"{root_path}settings.html\">\
103103
<img src=\"{static_root_path}wheel{suffix}.svg\" \
104104
width=\"18\" \

‎src/librustdoc/html/static/main.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1633,10 +1633,10 @@ function defocusSearchBar() {
16331633

16341634
function makeTabHeader(tabNb, text, nbElems) {
16351635
if (currentTab === tabNb) {
1636-
return "<div class=\"selected\">" + text +
1637-
" <div class=\"count\">(" + nbElems + ")</div></div>";
1636+
return "<button class=\"selected\">" + text +
1637+
" <div class=\"count\">(" + nbElems + ")</div></button>";
16381638
}
1639-
return "<div>" + text + " <div class=\"count\">(" + nbElems + ")</div></div>";
1639+
return "<button>" + text + " <div class=\"count\">(" + nbElems + ")</div></button>";
16401640
}
16411641

16421642
function showResults(results) {

‎src/librustdoc/html/static/rustdoc.css

+6-5
Original file line numberDiff line numberDiff line change
@@ -1176,21 +1176,22 @@ pre.rust {
11761176
height: 35px;
11771177
}
11781178

1179-
#titles > div {
1179+
#titles > button {
11801180
float: left;
11811181
width: 33.3%;
11821182
text-align: center;
11831183
font-size: 18px;
11841184
cursor: pointer;
1185+
border: 0;
11851186
border-top: 2px solid;
11861187
}
11871188

1188-
#titles > div:not(:last-child) {
1189+
#titles > button:not(:last-child) {
11891190
margin-right: 1px;
11901191
width: calc(33.3% - 1px);
11911192
}
11921193

1193-
#titles > div > div.count {
1194+
#titles > button > div.count {
11941195
display: inline-block;
11951196
font-size: 16px;
11961197
}
@@ -1459,7 +1460,7 @@ h4 > .notable-traits {
14591460
top: 24px;
14601461
}
14611462

1462-
#titles > div > div.count {
1463+
#titles > button > div.count {
14631464
float: left;
14641465
width: 100%;
14651466
}
@@ -1565,7 +1566,7 @@ h4 > .notable-traits {
15651566
}
15661567

15671568
@media (max-width: 416px) {
1568-
#titles, #titles > div {
1569+
#titles, #titles > button {
15691570
height: 73px;
15701571
}
15711572

‎src/librustdoc/html/static/themes/ayu.css

+5-5
Original file line numberDiff line numberDiff line change
@@ -403,22 +403,22 @@ pre.ignore:hover, .information:hover + pre.ignore {
403403
border-color: #5c6773;
404404
}
405405

406-
#titles > div.selected {
406+
#titles > button.selected {
407407
background-color: #141920 !important;
408408
border-bottom: 1px solid #ffb44c !important;
409409
border-top: none;
410410
}
411411

412-
#titles > div:not(.selected) {
412+
#titles > button:not(.selected) {
413413
background-color: transparent !important;
414414
border: none;
415415
}
416416

417-
#titles > div:hover {
417+
#titles > button:hover {
418418
border-bottom: 1px solid rgba(242, 151, 24, 0.3);
419419
}
420420

421-
#titles > div > div.count {
421+
#titles > button > div.count {
422422
color: #888;
423423
}
424424

@@ -434,7 +434,7 @@ above the `@media (max-width: 700px)` rules due to a bug in the css checker */
434434
.block a.current.derive,.content span.macro,.content a.macro,.block a.current.macro {}
435435
.content .highlighted.trait {}
436436
.content span.struct,.content a.struct,.block a.current.struct {}
437-
#titles>div:hover,#titles>div.selected {}
437+
#titles>button:hover,#titles>button.selected {}
438438
.content .highlighted.traitalias {}
439439
.content span.type,.content a.type,.block a.current.type {}
440440
.content span.union,.content a.union,.block a.current.union {}

‎src/librustdoc/html/static/themes/dark.css

+4-3
Original file line numberDiff line numberDiff line change
@@ -352,16 +352,17 @@ pre.ignore:hover, .information:hover + pre.ignore {
352352
border-color: #777;
353353
}
354354

355-
#titles > div:not(.selected) {
355+
#titles > button:not(.selected) {
356356
background-color: #252525;
357357
border-top-color: #252525;
358358
}
359359

360-
#titles > div:hover, #titles > div.selected {
360+
#titles > button:hover, #titles > button.selected {
361361
border-top-color: #0089ff;
362+
background-color: #353535;
362363
}
363364

364-
#titles > div > div.count {
365+
#titles > button > div.count {
365366
color: #888;
366367
}
367368

‎src/librustdoc/html/static/themes/light.css

+4-3
Original file line numberDiff line numberDiff line change
@@ -343,16 +343,17 @@ pre.ignore:hover, .information:hover + pre.ignore {
343343
border-color: #999;
344344
}
345345

346-
#titles > div:not(.selected) {
346+
#titles > button:not(.selected) {
347347
background-color: #e6e6e6;
348348
border-top-color: #e6e6e6;
349349
}
350350

351-
#titles > div:hover, #titles > div.selected {
351+
#titles > button:hover, #titles > button.selected {
352352
border-top-color: #0089ff;
353+
background-color: #353535;
353354
}
354355

355-
#titles > div > div.count {
356+
#titles > button > div.count {
356357
color: #888;
357358
}
358359

0 commit comments

Comments
 (0)