UCOMmandIt
/
uci-doc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup search code fix search entry formatting

master
Robert Kaussow 2020-12-21 13:14:51 +01:00
parent 42a1b74f42
commit ce36121096
No known key found for this signature in database
GPG Key ID: 65362AE74AF98B61
2 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
assets/js/search.js
View File

@ -46,27 +46,25 @@
} }
results.classList.add("has-hits"); results.classList.add("has-hits");
if (showParent) { if (showParent) {
searchHits = groupBy(searchHits, hit => hit.parent); searchHits = groupBy(searchHits, hit => hit.parent);
} }
const items = []; const items = [];
if (showParent) { for (const section in searchHits) {
for (const section in searchHits) { const item = document.createElement('li');
const item = document.createElement('li'),
title = item.appendChild(document.createElement('span')),
subList = item.appendChild(document.createElement('ul'));
if (showParent) {
const title = item.appendChild(document.createElement('span'));
title.textContent = section; title.textContent = section;
title.classList.add('gdoc-search__list__section-title');
createLinks(searchHits[section], subList);
items.push(item);
} }
} else {
items.push(...createLinks(searchHits)); const subList = item.appendChild(document.createElement('ul'));
createLinks(searchHits[section], subList);
items.push(item);
} }
items.forEach(item => { items.forEach(item => {
@ -84,11 +82,15 @@
const items = []; const items = [];
for (const page of pages) { for (const page of pages) {
const item = document.createElement('li'), const item = document.createElement("li"),
a = item.appendChild(document.createElement('a')); entry = item.appendChild(document.createElement("span")),
a = entry.appendChild(document.createElement("a"));
entry.classList.add("flex")
a.href = page.href; a.href = page.href;
a.textContent = page.title; a.textContent = page.title;
a.classList.add("gdoc-search__entry")
if (target) { if (target) {
target.appendChild(item); target.appendChild(item);

44
src/sass/_base.scss
View File

@ -203,21 +203,6 @@ img {
} }
} }
&__entry {
flex: 1;
color: $body-font-color;
&:hover,
&.is-active {
text-decoration: underline;
text-decoration-style: dashed !important;
}
&:visited {
color: $body-font-color;
}
}
&--main > ul > li > span, &--main > ul > li > span,
&--main > ul > li > span > a, &--main > ul > li > span > a,
&--main > ul > li > label, &--main > ul > li > label,
@ -230,6 +215,22 @@ img {
} }
} }
.gdoc-nav__entry,
.gdoc-search__entry {
flex: 1;
color: $body-font-color;
&:hover,
&.is-active {
text-decoration: underline;
text-decoration-style: dashed !important;
}
&:visited {
color: $body-font-color;
}
}
.gdoc-page { .gdoc-page {
min-width: $body-min-width; min-width: $body-min-width;
flex-grow: 1; flex-grow: 1;
@ -438,9 +439,9 @@ img {
&__list { &__list {
display: none; display: none;
background-color: #ffffff; background: $white;
border-radius: $border-radius; border-radius: $border-radius;
box-shadow: 0 1px 3px 0 rgba(0,0,0,0.1),0 1px 2px 0 rgba(0,0,0,0.06); box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
position: absolute; position: absolute;
margin: 0; margin: 0;
padding: $padding-8; padding: $padding-8;
@ -461,22 +462,17 @@ img {
} }
> li > span { > li > span {
color: $gray-600;
font-size: $font-size-14;
font-weight: bold; font-weight: bold;
color: $gray-600;
} }
> li + li { > li + li {
margin-top: $padding-16; margin-top: $padding-8;
} }
.icon { .icon {
margin-right: $padding-4; margin-right: $padding-4;
} }
a {
font-size: $font-size-16;
}
} }
&:focus-within &__list.has-hits { &:focus-within &__list.has-hits {