Skip to content

Commit e8b03dc

Browse files
committed
Improve responsiveness of searchbar and api list. Styling improvements
1 parent 4dd3920 commit e8b03dc

File tree

4 files changed

+42
-12
lines changed

4 files changed

+42
-12
lines changed

scaladoc-js/common/css/searchbar.css

Lines changed: 25 additions & 3 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 {
@@ -242,8 +245,27 @@ div[selected] > .scaladoc-searchbar-inkuire-package {
242245
padding-left: 20px;
243246
}
244247

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+
245264
.searchbar-hints {
246-
height: 60vh;
265+
padding-top: 5vh;
266+
padding-bottom: 5vh;
267+
padding-left: 5vw;
268+
padding-right: 5vw;
247269
display: flex;
248270
flex-direction: column;
249271
align-items: center;

scaladoc-js/main/src/searchbar/SearchbarComponent.scala

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import scala.concurrent.duration._
99
import java.net.URI
1010

1111
class SearchbarComponent(engine: SearchbarEngine, inkuireEngine: InkuireJSSearchEngine, parser: QueryParser):
12-
val resultsChunkSize = 5
12+
val initialChunkSize = 5
13+
val resultsChunkSize = 20
1314
extension (p: PageEntry)
1415
def toHTML =
1516
val wrapper = document.createElement("div").asInstanceOf[html.Div]
@@ -106,8 +107,15 @@ class SearchbarComponent(engine: SearchbarEngine, inkuireEngine: InkuireJSSearch
106107
loadMoreElement.classList.add("scaladoc-searchbar-row")
107108
loadMoreElement.setAttribute("loadmore", "")
108109
loadMoreElement.classList.add("monospace")
110+
val icon = document.createElement("a").asInstanceOf[html.Anchor]
111+
icon.classList.add("i")
112+
icon.classList.add("fas")
113+
icon.classList.add("fa-arrow-down")
114+
val text = document.createElement("span").asInstanceOf[html.Span]
115+
text.textContent = "Show more..."
109116
val anchor = document.createElement("a").asInstanceOf[html.Anchor]
110-
anchor.text = "Show more..."
117+
anchor.appendChild(icon)
118+
anchor.appendChild(text)
111119
loadMoreElement.appendChild(anchor)
112120
loadMoreElement.addEventListener("mouseover", _ => handleHover(loadMoreElement))
113121
loadMoreElement
@@ -128,7 +136,7 @@ class SearchbarComponent(engine: SearchbarEngine, inkuireEngine: InkuireJSSearch
128136
htmlEntries.foreach(fragment.appendChild)
129137
fragment.appendChild(loadMoreElement)
130138

131-
val nextElems = htmlEntries.drop(resultsChunkSize)
139+
val nextElems = htmlEntries.drop(initialChunkSize)
132140
if nextElems.nonEmpty then {
133141
nextElems.foreach(_.classList.add("hidden"))
134142
loadMoreResults(nextElems)

scaladoc/resources/dotty_res/styles/colors.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
--selected-fg: var(--blue900);
8787
--selected-bg: var(--blue200);
8888

89-
--shadow: var(--black);
89+
--shadow: var(--grey500);
9090

9191
--aside-warning-bg: var(--red100);
9292
}
@@ -119,7 +119,7 @@
119119
--link-hover-fg: var(--blue300);
120120
--link-sig-fg: var(--blue400);
121121

122-
--leftbar-bg: var(--grey930);
122+
--leftbar-bg: var(--grey900);
123123
--leftbar-fg: var(--grey300);
124124
--leftbar-current-bg: var(--grey700);
125125
--leftbar-current-fg: var(--white);
@@ -139,7 +139,7 @@
139139
--tab-selected: var(--white);
140140
--tab-default: var(--grey300);
141141

142-
--shadow: var(--white);
142+
--shadow: var(--grey500);
143143

144144
--aside-warning-bg: var(--red800);
145145
}

scaladoc/resources/dotty_res/styles/scalastyle.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -560,9 +560,9 @@ footer .mode {
560560

561561
.documentableElement .modifiers {
562562
display: table-cell;
563-
min-width: 10em;
564-
max-width: 10em;
565-
width: 10em;
563+
min-width: 10vw;
564+
max-width: 10vw;
565+
width: 10vw;
566566
overflow: hidden;
567567
text-align: right;
568568
white-space: nowrap;

0 commit comments

Comments
 (0)