Skip to content

Commit 7dca432

Browse files
committed
Fix overflow issues with found members in search
1 parent df1b1c4 commit 7dca432

File tree

3 files changed

+27
-7
lines changed

3 files changed

+27
-7
lines changed

doc-tool/resources/_layouts/search.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,18 @@ <h1>Member Results</h1>
147147
var paramLists = !member.paramLists ? "" : (
148148
member.paramLists
149149
.map(renderParamList)
150-
.reduce(concatenateStrings, "")
150+
.reduce(concatenateStrings, "") + ': '
151+
);
152+
153+
var returnValue = !member.returnValue ? "" : (
154+
member.returnValue
151155
);
152156

153157
div.innerHTML =
154158
'<div class="member-kind">'+ member.kind +'</div>' +
155159
'<div class="member-name">'+ member.name +'</div>' +
156-
'<div class="member-param-lists">' + paramLists + ':</div>' +
157-
'<div class="member-return">'+ member.returnValue +'</div>'
160+
'<div class="member-param-lists">' + paramLists + '</div>' +
161+
'<div class="member-return">'+ returnValue +'</div>'
158162

159163
li.appendChild(div);
160164
};

doc-tool/resources/css/search.css

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,27 @@ div.results li.entity-result-li:hover {
127127
}
128128

129129
div.results li.entity-result-li > div.member-result {
130+
overflow: hidden;
130131
padding-top: 3px;
131132
display: block;
132-
width: 100%;
133-
min-height: 30px;
133+
width: calc(100% - 105px);
134+
margin-bottom: 10px;
134135
transition: all 0.2s ease;
135136
margin-left: 105px;
136137
}
137138

139+
div.results li.entity-result-li:hover > div.member-result {
140+
width: calc(100% - 65px);
141+
}
142+
143+
div.results li.entity-result-li.with-companion:hover > div.member-result {
144+
width: calc(100% - 23px);
145+
}
146+
147+
div.results li.entity-result-li:not(.with-companion) > div.member-result {
148+
margin-left: 65px;
149+
}
150+
138151
div.results li.entity-result-li:hover > div.member-result {
139152
margin-left: 23px;
140153
}
@@ -144,8 +157,11 @@ div.results li.entity-result-li > div.member-result > div.member-kind {
144157
font-weight: 400;
145158
}
146159

160+
div.results li.entity-result-li > div.member-result > div.member-param-lists {
161+
margin-right: 5px;
162+
}
163+
147164
div.results li.entity-result-li > div.member-result > div.member-return {
148-
margin-left: 5px;
149165
font-weight: 400;
150166
white-space: nowrap;
151167
}

doc-tool/src/dotty/tools/dottydoc/model/references.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ object references {
5151
if (args.isEmpty)
5252
"() => " + ret.showReference
5353
else if (args.tail.isEmpty)
54-
args.head + " => " + ret.showReference
54+
args.head.showReference + " => " + ret.showReference
5555
else
5656
args.mkString("(", ",", s") => ${ret.showReference}")
5757

0 commit comments

Comments
 (0)