Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions lib/rdoc/generator/template/aliki/_header.rhtml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<div class="navbar-search navbar-search-desktop" role="search">
<form action="#" method="get" accept-charset="utf-8">
<input id="search-field" role="combobox" aria-label="Search"
aria-autocomplete="list" aria-controls="search-results"
aria-autocomplete="list" aria-controls="search-results-desktop"
type="text" name="search" placeholder="Search (/) for a class, method..."
spellcheck="false" autocomplete="off"
title="Type to search, Up and Down to navigate, Enter to load">
<ul id="search-results" aria-label="Search Results"
<ul id="search-results-desktop" aria-label="Search Results"
aria-busy="false" aria-expanded="false"
aria-atomic="false" class="initially-hidden"></ul>
aria-atomic="false" class="initially-hidden search-results"></ul>
</form>
</div>

Expand Down Expand Up @@ -47,7 +47,7 @@
<div class="search-modal-body">
<ul id="search-results-mobile" aria-label="Search Results"
aria-busy="false" aria-expanded="false"
aria-atomic="false" class="search-modal-results initially-hidden"></ul>
aria-atomic="false" class="search-results search-modal-results initially-hidden"></ul>
<div class="search-modal-empty">
<p>No recent searches</p>
</div>
Expand Down
6 changes: 3 additions & 3 deletions lib/rdoc/generator/template/aliki/_sidebar_search.rhtml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<form action="#" method="get" accept-charset="utf-8">
<div id="search-field-wrapper">
<input id="search-field" role="combobox" aria-label="Search"
aria-autocomplete="list" aria-controls="search-results"
aria-autocomplete="list" aria-controls="search-results-desktop"
type="text" name="search" placeholder="Search (/) for a class, method, ..." spellcheck="false"
autocomplete="off"
title="Type to search, Up and Down to navigate, Enter to load">
</div>

<ul id="search-results" aria-label="Search Results"
<ul id="search-results-desktop" aria-label="Search Results"
aria-busy="false" aria-expanded="false"
aria-atomic="false" class="initially-hidden"></ul>
aria-atomic="false" class="initially-hidden search-results"></ul>
</form>
</div>
40 changes: 20 additions & 20 deletions lib/rdoc/generator/template/aliki/css/rdoc.css
Original file line number Diff line number Diff line change
Expand Up @@ -1811,50 +1811,50 @@ footer.site-footer .footer-bottom:first-child {
}

/* Search Results */
#search-results {
.search-results {
font-family: var(--font-primary);
font-weight: 300;
}

#search-results a {
.search-results a {
color: var(--color-text-primary);
}

#search-results a:hover {
.search-results a:hover {
color: var(--color-accent-primary);
}

#search-results .search-match {
.search-results .search-match {
font-family: var(--font-heading);
font-weight: normal;
}

#search-results .search-selected {
.search-results .search-selected {
background: var(--color-code-bg);
border-bottom: 1px solid transparent;
}

#search-results li {
.search-results li {
list-style: none;
border-bottom: 1px solid var(--color-border-default);
margin-bottom: 0.5em;
}

#search-results li:last-child {
.search-results li:last-child {
border-bottom: none;
margin-bottom: 0;
}

#search-results li p {
.search-results li p {
padding: 0;
margin: 0.5em;
}

#search-results .search-namespace {
.search-results .search-namespace {
font-weight: bold;
}

#search-results .search-type {
.search-results .search-type {
display: inline-block;
margin-left: var(--space-2);
padding: 0 var(--space-2);
Expand All @@ -1866,33 +1866,33 @@ footer.site-footer .footer-bottom:first-child {
color: var(--color-text-secondary);
}

#search-results .search-type-class {
.search-results .search-type-class {
background: var(--color-search-type-class-bg);
color: var(--color-search-type-class-text);
}

#search-results .search-type-module {
.search-results .search-type-module {
background: var(--color-search-type-module-bg);
color: var(--color-search-type-module-text);
}

#search-results .search-type-constant {
.search-results .search-type-constant {
background: var(--color-search-type-constant-bg);
color: var(--color-search-type-constant-text);
}

#search-results .search-type-instance-method,
#search-results .search-type-class-method {
.search-results .search-type-instance-method,
.search-results .search-type-class-method {
background: var(--color-search-type-method-bg);
color: var(--color-search-type-method-text);
}

#search-results li em {
.search-results li em {
background-color: var(--color-search-highlight-bg);
font-style: normal;
}

#search-results pre {
.search-results pre {
margin: 0.5em;
font-family: var(--font-code);
}
Expand All @@ -1919,7 +1919,7 @@ header.top-navbar #search-field::placeholder {
}

/* Search results dropdown in navbar */
header.top-navbar #search-results {
header.top-navbar #search-results-desktop {
position: absolute;
top: calc(100% + var(--space-2));
left: 0;
Expand All @@ -1935,10 +1935,10 @@ header.top-navbar #search-results {
padding: 0;
}

header.top-navbar #search-results.initially-hidden {
header.top-navbar #search-results-desktop.initially-hidden {
display: none;
}

header.top-navbar #search-results[aria-expanded="false"] {
header.top-navbar #search-results-desktop[aria-expanded="false"] {
display: none;
}
2 changes: 1 addition & 1 deletion lib/rdoc/generator/template/aliki/js/aliki.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ function createSearchInstance(input, result) {

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

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

Expand Down
Loading