Skip to content

Commit 8826879

Browse files
committed
Font changes: increase font of signatures and documentation
1 parent 298eae7 commit 8826879

File tree

3 files changed

+44
-25
lines changed

3 files changed

+44
-25
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: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,6 @@ dl > div > ol {
416416
dl.attributes > dt {
417417
display: block;
418418
float: left;
419-
font-style: italic;
420419
font-weight: bold;
421420
}
422421
dl.attributes > dt.implicit {
@@ -425,9 +424,8 @@ dl.attributes > dt.implicit {
425424
}
426425
dl.attributes > dd {
427426
display: block;
428-
padding-left: 4em;
429-
margin-bottom: 5px;
430-
min-height: 15px;
427+
padding-left: 7em;
428+
min-height: 24px;
431429
}
432430

433431
/* params list documentation */
@@ -584,10 +582,6 @@ footer .mode {
584582
color: var(--grey600);
585583
}
586584

587-
.kind {
588-
font-weight: bold;
589-
}
590-
591585
.other-modifiers a, .other-modifiers a:visited, .other-modifiers span[data-unresolved-link] {
592586
color: var(--link-sig-fg);
593587
}
@@ -600,6 +594,15 @@ footer .mode {
600594
color: var(--code-fg);
601595
display: table-row;
602596
white-space: pre-wrap;
597+
font-size: 14px;
598+
}
599+
600+
.docs .modifiers {
601+
font-size: 14px;
602+
}
603+
604+
.signature, .documentableElement {
605+
font-weight: 500;
603606
}
604607

605608
.signature.monospace {
@@ -634,7 +637,6 @@ footer .mode {
634637
white-space: normal;
635638
position: relative;
636639
padding: 8px;
637-
font-weight: 500;
638640
font-size: 12px;
639641
background: var(--documentable-bg);
640642
border-left: 0.25em solid transparent;
@@ -673,6 +675,7 @@ footer .mode {
673675
.documentableElement .annotations {
674676
color: var(--grey600);
675677
margin-left: 10.5em;
678+
font-size: 14px;
676679
display: none;
677680
}
678681

@@ -726,7 +729,8 @@ footer .mode {
726729
}
727730

728731
.memberDocumentation {
729-
font-size: 14px;
732+
font-size: 15px;
733+
line-height: 1.5;
730734
}
731735

732736
.memberDocumentation>p{

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
2929
case _ => Nil
3030

3131
def inheritedFrom(m: Member) = m.inheritedFrom match
32-
case Some(InheritedFrom(name, dri)) => tableRow("Inherited from", signatureRenderer.renderLink(name, dri))
32+
case Some(InheritedFrom(name, dri)) => tableRow("Inherited from:", signatureRenderer.renderLink(name, dri))
3333
case _ => Nil
3434

3535
def docAttributes(m: Member): Seq[AppliedTag] =
@@ -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)