Skip to content

Commit 84f7250

Browse files
authored
Merge pull request scala#14539 from dotty-staging/scaladoc/searchbar-grouping
Scaladoc: Grouping entries in searchbar. Add hints to searchbar
2 parents 5a4a571 + 76d632b commit 84f7250

File tree

6 files changed

+251
-96
lines changed

6 files changed

+251
-96
lines changed

scaladoc-js/common/css/searchbar.css

Lines changed: 52 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,10 @@ div[selected] > .scaladoc-searchbar-inkuire-package {
156156
.search span:hover {
157157
fill: var(--link-hover-fg);
158158
}
159+
160+
#scaladoc-searchbar span.pull-right {
161+
display: none;
162+
}
159163
}
160164

161165
#scaladoc-search {
@@ -177,12 +181,11 @@ div[selected] > .scaladoc-searchbar-inkuire-package {
177181
left: calc(5% + var(--side-width));
178182
z-index: 5;
179183
width: calc(90% - var(--side-width));
180-
box-shadow: 0 2px 16px 0 rgba(0, 42, 76, 0.15);
184+
box-shadow: 2px 2px 8px 0 var(--shadow);
181185
font-size: 13px;
182186
font-family: system-ui, -apple-system, Segoe UI, Roboto, Noto Sans, Ubuntu, Cantarell, Helvetica Neue, Arial, sans-serif;
183187
background-color: var(--leftbar-bg);
184188
color: var(--leftbar-fg);
185-
box-shadow: 0 0 2px var(--shadow);
186189
}
187190

188191
#scaladoc-searchbar-input {
@@ -206,45 +209,74 @@ div[selected] > .scaladoc-searchbar-inkuire-package {
206209
overflow: auto;
207210
}
208211

209-
.scaladoc-searchbar-result {
212+
.scaladoc-searchbar-row {
213+
display: flex;
210214
background-color: var(--leftbar-bg);
211215
color: var(--leftbar-fg);
212216
line-height: 24px;
213217
padding: 4px 10px 4px 10px;
214218
}
215219

216-
.scaladoc-searchbar-result-row {
217-
display: flex;
220+
.scaladoc-searchbar-row.hidden {
221+
display: none;
222+
}
223+
224+
.scaladoc-searchbar-row[divider] {
225+
border-top: solid 1px var(--leftbar-border);
218226
}
219227

220-
.scaladoc-searchbar-result .micon {
228+
.scaladoc-searchbar-row .micon {
221229
height: 16px;
222230
width: 16px;
223231
margin: 4px 8px 0px 0px;
224232
}
225233

226-
.scaladoc-searchbar-result:first-of-type {
227-
margin-top: 10px;
228-
}
229-
230-
.scaladoc-searchbar-result[selected] {
234+
.scaladoc-searchbar-row[selected] {
231235
background-color: var(--leftbar-hover-bg);
232236
color: var(--leftbar-hover-fg);
233237
}
234238

235-
.scaladoc-searchbar-result a {
236-
/* for some reason, with display:block if there's a wrap between the
237-
* search result text and the location span, the dead space to the
238-
* left of the location span doesn't get treated as part of the block,
239-
* which defeats the purpose of making the <a> a block element.
240-
* But inline-block with width:100% works as desired.
241-
*/
242-
display: inline-block;
243-
width: 100%;
239+
.scaladoc-searchbar-row[result] {
240+
flex-direction: column;
241+
}
242+
243+
.scaladoc-searchbar-row[result] a {
244244
text-indent: -20px;
245245
padding-left: 20px;
246246
}
247247

248+
.scaladoc-searchbar-row[loadmore] {
249+
align-items: center;
250+
cursor: pointer;
251+
}
252+
253+
.scaladoc-searchbar-row[loadmore] > a {
254+
display: flex;
255+
align-items: center;
256+
width: 100%;
257+
}
258+
259+
.scaladoc-searchbar-row[loadmore] .i {
260+
margin-left: 4px;
261+
margin-right: 4px;
262+
}
263+
264+
.searchbar-hints {
265+
padding-top: 5vh;
266+
padding-bottom: 5vh;
267+
padding-left: 5vw;
268+
padding-right: 5vw;
269+
display: flex;
270+
flex-direction: column;
271+
align-items: center;
272+
justify-content: center;
273+
}
274+
275+
.searchbar-hints-list {
276+
font-size: medium;
277+
line-height: 2em;
278+
}
279+
248280
#searchBar {
249281
display: inline-flex;
250282
}

0 commit comments

Comments
 (0)