Skip to content

Commit b407fdd

Browse files
authored
[Aliki] Fix search result type styling on mobile (#1509)
Styling only applied to `#search-results`. I added a common class to both mobile and desktop to use instead. Also renamed `#search-results` to `#search-results-desktop` to avoid ambiguity with the new class.
1 parent e4e79c4 commit b407fdd

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

lib/rdoc/generator/template/aliki/_header.rhtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<div class="navbar-search navbar-search-desktop" role="search">
88
<form action="#" method="get" accept-charset="utf-8">
99
<input id="search-field" role="combobox" aria-label="Search"
10-
aria-autocomplete="list" aria-controls="search-results"
10+
aria-autocomplete="list" aria-controls="search-results-desktop"
1111
type="text" name="search" placeholder="Search (/) for a class, method..."
1212
spellcheck="false" autocomplete="off"
1313
title="Type to search, Up and Down to navigate, Enter to load">
14-
<ul id="search-results" aria-label="Search Results"
14+
<ul id="search-results-desktop" aria-label="Search Results"
1515
aria-busy="false" aria-expanded="false"
16-
aria-atomic="false" class="initially-hidden"></ul>
16+
aria-atomic="false" class="initially-hidden search-results"></ul>
1717
</form>
1818
</div>
1919

@@ -47,7 +47,7 @@
4747
<div class="search-modal-body">
4848
<ul id="search-results-mobile" aria-label="Search Results"
4949
aria-busy="false" aria-expanded="false"
50-
aria-atomic="false" class="search-modal-results initially-hidden"></ul>
50+
aria-atomic="false" class="search-results search-modal-results initially-hidden"></ul>
5151
<div class="search-modal-empty">
5252
<p>No recent searches</p>
5353
</div>

lib/rdoc/generator/template/aliki/_sidebar_search.rhtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<form action="#" method="get" accept-charset="utf-8">
33
<div id="search-field-wrapper">
44
<input id="search-field" role="combobox" aria-label="Search"
5-
aria-autocomplete="list" aria-controls="search-results"
5+
aria-autocomplete="list" aria-controls="search-results-desktop"
66
type="text" name="search" placeholder="Search (/) for a class, method, ..." spellcheck="false"
77
autocomplete="off"
88
title="Type to search, Up and Down to navigate, Enter to load">
99
</div>
1010

11-
<ul id="search-results" aria-label="Search Results"
11+
<ul id="search-results-desktop" aria-label="Search Results"
1212
aria-busy="false" aria-expanded="false"
13-
aria-atomic="false" class="initially-hidden"></ul>
13+
aria-atomic="false" class="initially-hidden search-results"></ul>
1414
</form>
1515
</div>

lib/rdoc/generator/template/aliki/css/rdoc.css

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1811,50 +1811,50 @@ footer.site-footer .footer-bottom:first-child {
18111811
}
18121812

18131813
/* Search Results */
1814-
#search-results {
1814+
.search-results {
18151815
font-family: var(--font-primary);
18161816
font-weight: 300;
18171817
}
18181818

1819-
#search-results a {
1819+
.search-results a {
18201820
color: var(--color-text-primary);
18211821
}
18221822

1823-
#search-results a:hover {
1823+
.search-results a:hover {
18241824
color: var(--color-accent-primary);
18251825
}
18261826

1827-
#search-results .search-match {
1827+
.search-results .search-match {
18281828
font-family: var(--font-heading);
18291829
font-weight: normal;
18301830
}
18311831

1832-
#search-results .search-selected {
1832+
.search-results .search-selected {
18331833
background: var(--color-code-bg);
18341834
border-bottom: 1px solid transparent;
18351835
}
18361836

1837-
#search-results li {
1837+
.search-results li {
18381838
list-style: none;
18391839
border-bottom: 1px solid var(--color-border-default);
18401840
margin-bottom: 0.5em;
18411841
}
18421842

1843-
#search-results li:last-child {
1843+
.search-results li:last-child {
18441844
border-bottom: none;
18451845
margin-bottom: 0;
18461846
}
18471847

1848-
#search-results li p {
1848+
.search-results li p {
18491849
padding: 0;
18501850
margin: 0.5em;
18511851
}
18521852

1853-
#search-results .search-namespace {
1853+
.search-results .search-namespace {
18541854
font-weight: bold;
18551855
}
18561856

1857-
#search-results .search-type {
1857+
.search-results .search-type {
18581858
display: inline-block;
18591859
margin-left: var(--space-2);
18601860
padding: 0 var(--space-2);
@@ -1866,33 +1866,33 @@ footer.site-footer .footer-bottom:first-child {
18661866
color: var(--color-text-secondary);
18671867
}
18681868

1869-
#search-results .search-type-class {
1869+
.search-results .search-type-class {
18701870
background: var(--color-search-type-class-bg);
18711871
color: var(--color-search-type-class-text);
18721872
}
18731873

1874-
#search-results .search-type-module {
1874+
.search-results .search-type-module {
18751875
background: var(--color-search-type-module-bg);
18761876
color: var(--color-search-type-module-text);
18771877
}
18781878

1879-
#search-results .search-type-constant {
1879+
.search-results .search-type-constant {
18801880
background: var(--color-search-type-constant-bg);
18811881
color: var(--color-search-type-constant-text);
18821882
}
18831883

1884-
#search-results .search-type-instance-method,
1885-
#search-results .search-type-class-method {
1884+
.search-results .search-type-instance-method,
1885+
.search-results .search-type-class-method {
18861886
background: var(--color-search-type-method-bg);
18871887
color: var(--color-search-type-method-text);
18881888
}
18891889

1890-
#search-results li em {
1890+
.search-results li em {
18911891
background-color: var(--color-search-highlight-bg);
18921892
font-style: normal;
18931893
}
18941894

1895-
#search-results pre {
1895+
.search-results pre {
18961896
margin: 0.5em;
18971897
font-family: var(--font-code);
18981898
}
@@ -1919,7 +1919,7 @@ header.top-navbar #search-field::placeholder {
19191919
}
19201920

19211921
/* Search results dropdown in navbar */
1922-
header.top-navbar #search-results {
1922+
header.top-navbar #search-results-desktop {
19231923
position: absolute;
19241924
top: calc(100% + var(--space-2));
19251925
left: 0;
@@ -1935,10 +1935,10 @@ header.top-navbar #search-results {
19351935
padding: 0;
19361936
}
19371937

1938-
header.top-navbar #search-results.initially-hidden {
1938+
header.top-navbar #search-results-desktop.initially-hidden {
19391939
display: none;
19401940
}
19411941

1942-
header.top-navbar #search-results[aria-expanded="false"] {
1942+
header.top-navbar #search-results-desktop[aria-expanded="false"] {
19431943
display: none;
19441944
}

lib/rdoc/generator/template/aliki/js/aliki.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ function createSearchInstance(input, result) {
8585

8686
function hookSearch() {
8787
const input = document.querySelector('#search-field');
88-
const result = document.querySelector('#search-results');
88+
const result = document.querySelector('#search-results-desktop');
8989

9090
if (!input || !result) return; // Exit if search elements not found
9191

0 commit comments

Comments
 (0)