diff options
Diffstat (limited to 'dottydoc')
| -rw-r--r-- | dottydoc/js/src/html/Member.scala | 27 | ||||
| -rw-r--r-- | dottydoc/jvm/resources/index.css | 15 |
2 files changed, 35 insertions, 7 deletions
diff --git a/dottydoc/js/src/html/Member.scala b/dottydoc/js/src/html/Member.scala index d0d2c4560..487b7d0c9 100644 --- a/dottydoc/js/src/html/Member.scala +++ b/dottydoc/js/src/html/Member.scala @@ -49,9 +49,15 @@ trait MemberLayout { div( cls := "mdl-cell mdl-cell--12-col member-definition", span( + cls := "member-modifiers-kind", + m.modifiers.mkString(" ") + " " + m.kind + ), + span( cls := "member-name", - s"""${m.modifiers.mkString(" ")} ${m.kind} ${m.name}${typeParams(m)}${paramList(m)}""" + m.name ), + spanWith("member-type-params no-left-margin", typeParams(m)), + spanWith("member-param-list no-left-margin", paramList(m)), returnValue(m, parent) ), shortComment, @@ -62,9 +68,18 @@ trait MemberLayout { } } + def spanWith(clazz: String, contents: String) = contents match { + case "" => None + case _ => Some(span(cls := clazz, contents)) + } + def paramList(m: Entity): String = m match { case d: Def if d.paramLists.nonEmpty => - d.paramLists.map(xs => xs map { case (x, y: UnsetLink) => s"$x: ${y.query}" } mkString ("(", ", ", ")")).mkString("") + d.paramLists.map { xs => + xs.map { + case (x, y: UnsetLink) => s"$x: ${y.query}" + }.mkString ("(", ", ", ")") + }.mkString("") case _ => "" } @@ -83,14 +98,14 @@ trait MemberLayout { def link(rv: MaterializableLink) = rv match { case ml: MaterializedLink => - span(cls := "return-value", ": ", raw(ml.target)) + span(cls := "member-return-value no-left-margin", ": ", raw(ml.target)) case un: UnsetLink => - span(cls := "return-value", ": " + shorten(un.query)) + span(cls := "member-return-value no-left-margin", ": " + shorten(un.query)) } m match { - case rv: ReturnValue => link(rv.returnValue) - case _ => span() + case rv: ReturnValue => Some(link(rv.returnValue)) + case _ => None } } } diff --git a/dottydoc/jvm/resources/index.css b/dottydoc/jvm/resources/index.css index 4217eb286..c9622173e 100644 --- a/dottydoc/jvm/resources/index.css +++ b/dottydoc/jvm/resources/index.css @@ -1,5 +1,5 @@ /* Fonts -------------------------------------------------------------------- */ -@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro); +@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700,600); /* Sidebar ------------------------------------------------------------------ */ span.subtitle { @@ -111,6 +111,19 @@ div.member-definition { line-height: 24px; } +div.member-definition > span+span { + margin-left: 10px; +} + +div.member-definition > span.no-left-margin { + margin-left: 0; +} + +div.member-definition > span.member-name { + color: #458; + font-weight: 600; +} + div.member { min-height: 70px; } |