Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make search results tab and help button focusable with keyboard #79896

Merged
merged 1 commit into from
Dec 11, 2020
Merged

Make search results tab and help button focusable with keyboard #79896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/librustdoc/html/layout.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ crate fn render<T: Print, S: Print>(
placeholder=\"Click or press ‘S’ to search, ‘?’ for more options…\" \
type=\"search\">\
</div>\
<span class=\"help-button\">?</span>
<button class=\"help-button\">?</button>
<a id=\"settings-menu\" href=\"{root_path}settings.html\">\
<img src=\"{static_root_path}wheel{suffix}.svg\" \
width=\"18\" \
Expand Down
6 changes: 3 additions & 3 deletions src/librustdoc/html/static/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1633,10 +1633,10 @@ function defocusSearchBar() {

function makeTabHeader(tabNb, text, nbElems) {
if (currentTab === tabNb) {
return "<div class=\"selected\">" + text +
" <div class=\"count\">(" + nbElems + ")</div></div>";
return "<button class=\"selected\">" + text +
" <div class=\"count\">(" + nbElems + ")</div></button>";
}
return "<div>" + text + " <div class=\"count\">(" + nbElems + ")</div></div>";
return "<button>" + text + " <div class=\"count\">(" + nbElems + ")</div></button>";
}

function showResults(results) {
Expand Down
11 changes: 6 additions & 5 deletions src/librustdoc/html/static/rustdoc.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1176,21 +1176,22 @@ pre.rust {
height: 35px;
}

#titles > div {
#titles > button {
float: left;
width: 33.3%;
text-align: center;
font-size: 18px;
cursor: pointer;
border: 0;
border-top: 2px solid;
}

#titles > div:not(:last-child) {
#titles > button:not(:last-child) {
margin-right: 1px;
width: calc(33.3% - 1px);
}

#titles > div > div.count {
#titles > button > div.count {
display: inline-block;
font-size: 16px;
}
Expand Down Expand Up @@ -1459,7 +1460,7 @@ h4 > .notable-traits {
top: 24px;
}

#titles > div > div.count {
#titles > button > div.count {
float: left;
width: 100%;
}
Expand Down Expand Up @@ -1565,7 +1566,7 @@ h4 > .notable-traits {
}

@media (max-width: 416px) {
#titles, #titles > div {
#titles, #titles > button {
height: 73px;
}

Expand Down
10 changes: 5 additions & 5 deletions src/librustdoc/html/static/themes/ayu.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,22 +403,22 @@ pre.ignore:hover, .information:hover + pre.ignore {
border-color: #5c6773;
}

#titles > div.selected {
#titles > button.selected {
background-color: #141920 !important;
border-bottom: 1px solid #ffb44c !important;
border-top: none;
}

#titles > div:not(.selected) {
#titles > button:not(.selected) {
background-color: transparent !important;
border: none;
}

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

#titles > div > div.count {
#titles > button > div.count {
color: #888;
}

Expand All @@ -434,7 +434,7 @@ above the `@media (max-width: 700px)` rules due to a bug in the css checker */
.block a.current.derive,.content span.macro,.content a.macro,.block a.current.macro {}
.content .highlighted.trait {}
.content span.struct,.content a.struct,.block a.current.struct {}
#titles>div:hover,#titles>div.selected {}
#titles>button:hover,#titles>button.selected {}
.content .highlighted.traitalias {}
.content span.type,.content a.type,.block a.current.type {}
.content span.union,.content a.union,.block a.current.union {}
Expand Down
7 changes: 4 additions & 3 deletions src/librustdoc/html/static/themes/dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,16 +352,17 @@ pre.ignore:hover, .information:hover + pre.ignore {
border-color: #777;
}

#titles > div:not(.selected) {
#titles > button:not(.selected) {
background-color: #252525;
border-top-color: #252525;
}

#titles > div:hover, #titles > div.selected {
#titles > button:hover, #titles > button.selected {
border-top-color: #0089ff;
background-color: #353535;
}

#titles > div > div.count {
#titles > button > div.count {
color: #888;
}

Expand Down
7 changes: 4 additions & 3 deletions src/librustdoc/html/static/themes/light.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,16 +343,17 @@ pre.ignore:hover, .information:hover + pre.ignore {
border-color: #999;
}

#titles > div:not(.selected) {
#titles > button:not(.selected) {
background-color: #e6e6e6;
border-top-color: #e6e6e6;
}

#titles > div:hover, #titles > div.selected {
#titles > button:hover, #titles > button.selected {
border-top-color: #0089ff;
background-color: #353535;
}

#titles > div > div.count {
#titles > button > div.count {
color: #888;
}

Expand Down