Skip to content

Commit 7c19b7a

Browse files
committed
Font changes: increase font of signatures and documentation
1 parent 0d24a84 commit 7c19b7a

File tree

3 files changed

+42
-24
lines changed

3 files changed

+42
-24
lines changed

scaladoc-testcases/src/example/level2/Documentation.scala

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,21 @@ abstract class Documentation[T, A <: Int, B >: String, -X, +Y](c1: String, val c
134134
def useOfOutsideTypeInsideObject(): ReturnObjectWithType.returnType = ???
135135
def useOfSameLevelOutsideType(): SameLevelTypeLinking = ???
136136

137+
/** Lorem ipsum
138+
*
139+
*
140+
*
141+
* Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur scelerisque facilisis sapien a lobortis. Fusce ultricies erat ante, sit amet bibendum orci commodo in. Sed elementum tempus ipsum id sodales. Ut quis nisi vitae turpis lacinia mattis id nec orci. Nullam tincidunt accumsan nisl, ac maximus quam eleifend tincidunt. Nunc ipsum nulla, mattis vitae auctor blandit, euismod sit amet elit. Proin sed porttitor nisi. Curabitur tristique pretium nisi. Vestibulum sagittis condimentum blandit. In ac consequat odio, in fermentum turpis. In hac habitasse platea dictumst.
142+
* Proin scelerisque est sed magna fermentum, at ullamcorper purus porta. Aliquam posuere arcu elit, molestie fermentum justo malesuada non. In eget massa risus. Proin rutrum maximus arcu, et lacinia est suscipit nec. Morbi varius odio pretium turpis ornare, ut sollicitudin nunc egestas. Aliquam pulvinar massa odio, id tempor purus suscipit id. Nunc imperdiet sapien ligula, ut pretium lacus efficitur sit amet. Sed sed urna sed erat tempus sagittis quis eget elit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Duis accumsan hendrerit nunc, in sagittis tellus. Vivamus mattis ligula sed dolor lacinia iaculis. Pellentesque vel turpis est. Nam pellentesque diam id arcu pharetra, et consectetur eros facilisis. Aliquam erat volutpat.
143+
*
144+
* Phasellus ac quam pretium, convallis dui id, vestibulum nibh. Fusce vulputate interdum ullamcorper. Sed nec erat varius, sagittis ipsum eget, interdum ex. Ut sed leo sit amet ligula ullamcorper facilisis et convallis tellus. Nullam consectetur vitae lorem vel mattis. Suspendisse ultrices ornare leo, ut porttitor est finibus vel. Ut faucibus arcu eget sapien lobortis, a luctus arcu posuere. Vivamus faucibus mauris facilisis enim ornare dapibus.
145+
*
146+
* Quisque pharetra et orci non aliquet. Sed urna ipsum, commodo et ultricies sed, volutpat at nunc. Cras non lectus ac mauris lobortis efficitur vel ac ante. Mauris vestibulum risus at mauris pretium, vel iaculis dolor pretium. Nam fringilla fermentum lacus et varius. Nulla pulvinar maximus tortor, et venenatis ipsum luctus id. Integer hendrerit tellus felis, eget hendrerit dolor aliquam sit amet.
147+
*
148+
* Aenean elementum risus sed enim egestas, vitae imperdiet urna eleifend. Donec elementum leo neque, eu consequat eros placerat vel. Integer pulvinar sem feugiat, tincidunt erat a, porta nulla. Mauris eu urna egestas, facilisis ex sodales, sollicitudin quam. Integer porta metus et nunc blandit lacinia. Integer posuere mauris et dui ornare, a finibus neque tristique. Cras sit amet lectus nunc. Nam facilisis tincidunt efficitur.
149+
*/
150+
def loremIpsum[T](a: T): Map[T, T] = ???
151+
137152
protected[example] val valWithScopeModifier = ???
138153
protected[this] val valWithScopeModifierThis = ???
139154

scaladoc/resources/dotty_res/styles/scalastyle.css

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,6 @@ dl > div > ol {
421421
dl.attributes > dt {
422422
display: block;
423423
float: left;
424-
font-style: italic;
425424
font-weight: bold;
426425
}
427426
dl.attributes > dt.implicit {
@@ -430,9 +429,7 @@ dl.attributes > dt.implicit {
430429
}
431430
dl.attributes > dd {
432431
display: block;
433-
padding-left: 4em;
434-
margin-bottom: 5px;
435-
min-height: 15px;
432+
padding-left: 7em;
436433
}
437434

438435
/* params list documentation */
@@ -589,10 +586,6 @@ footer .mode {
589586
color: var(--grey600);
590587
}
591588

592-
.kind {
593-
font-weight: bold;
594-
}
595-
596589
.other-modifiers a, .other-modifiers a:visited, .other-modifiers span[data-unresolved-link] {
597590
color: var(--link-sig-fg);
598591
}
@@ -605,6 +598,15 @@ footer .mode {
605598
color: var(--code-fg);
606599
display: table-row;
607600
white-space: pre-wrap;
601+
font-size: 14px;
602+
}
603+
604+
.docs .modifiers {
605+
font-size: 14px;
606+
}
607+
608+
.signature, .documentableElement {
609+
font-weight: 500;
608610
}
609611

610612
.signature.monospace {
@@ -639,7 +641,6 @@ footer .mode {
639641
white-space: normal;
640642
position: relative;
641643
padding: 8px;
642-
font-weight: 500;
643644
font-size: 12px;
644645
background: var(--documentable-bg);
645646
border-left: 0.25em solid transparent;
@@ -678,6 +679,7 @@ footer .mode {
678679
.documentableElement .annotations {
679680
color: var(--grey600);
680681
margin-left: 10.5em;
682+
font-size: 14px;
681683
display: none;
682684
}
683685

@@ -731,7 +733,8 @@ footer .mode {
731733
}
732734

733735
.memberDocumentation {
734-
font-size: 14px;
736+
font-size: 15px;
737+
line-height: 1.5;
735738
}
736739

737740
.memberDocumentation>p{

scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,31 +46,31 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
4646
def opt(name: String, on: Option[DocPart]): Seq[AppliedTag] =
4747
if on.isEmpty then Nil else tableRow(name, renderDocPart(on.get))
4848

49-
def authors(authors: List[DocPart]) = if summon[DocContext].args.includeAuthors then list("Authors", authors) else Nil
49+
def authors(authors: List[DocPart]) = if summon[DocContext].args.includeAuthors then list("Authors:", authors) else Nil
5050

5151
m.docs.fold(Nil)(d =>
52-
nested("Type Params", d.typeParams) ++
53-
nested("Value Params", d.valueParams) ++
54-
opt("Returns", d.result) ++
55-
nested("Throws", d.throws) ++
56-
opt("Constructor", d.constructor) ++
52+
nested("Type parameters:", d.typeParams) ++
53+
nested("Value parameters:", d.valueParams) ++
54+
opt("Returns:", d.result) ++
55+
nested("Throws:", d.throws) ++
56+
opt("Constructor:", d.constructor) ++
5757
authors(d.authors) ++
58-
list("See also", d.see) ++
59-
opt("Version", d.version) ++
60-
opt("Since", d.since) ++
61-
list("Todo", d.todo) ++
62-
list("Note", d.note) ++
63-
list("Example", d.example)
58+
list("See also:", d.see) ++
59+
opt("Version:", d.version) ++
60+
opt("Since:", d.since) ++
61+
list("Todo:", d.todo) ++
62+
list("Note:", d.note) ++
63+
list("Example:", d.example)
6464
)
6565

6666
def companion(m: Member): Seq[AppliedTag] = m.companion.fold(Nil){dri =>
6767
val kindName = if m.kind == Kind.Object then "class" else "object"
68-
tableRow("Companion", signatureRenderer.renderLink(kindName, dri))
68+
tableRow("Companion:", signatureRenderer.renderLink(kindName, dri))
6969
}
7070

7171
def source(m: Member): Seq[AppliedTag] =
7272
summon[DocContext].sourceLinks.pathTo(m).fold(Nil){ link =>
73-
tableRow("Source", a(href := link)(m.sources.fold("(source)")(_.path.getFileName().toString())))
73+
tableRow("Source:", a(href := link)(m.sources.fold("(source)")(_.path.getFileName().toString())))
7474
}
7575

7676
def deprecation(m: Member): Seq[AppliedTag] = m.deprecated.fold(Nil){ a =>

0 commit comments

Comments
 (0)