diff options
| author | Marcin Aman <marcin.aman@gmail.com> | 2020-07-21 14:24:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-21 14:24:42 +0200 |
| commit | 8e3130129def0a185099a876da8978211a1eb44a (patch) | |
| tree | 2c7eedc46851d042b6880e29eddad25d207ada3f | |
| parent | 185f7e26edff82460793e1065888e49c5df34512 (diff) | |
| download | dokka-8e3130129def0a185099a876da8978211a1eb44a.tar.gz dokka-8e3130129def0a185099a876da8978211a1eb44a.tar.bz2 dokka-8e3130129def0a185099a876da8978211a1eb44a.zip | |
Wrap superclasses in Javadoc (#1191)
4 files changed, 10 insertions, 3 deletions
diff --git a/plugins/javadoc/src/main/kotlin/javadoc/signatures/JavadocSignatureProvider.kt b/plugins/javadoc/src/main/kotlin/javadoc/signatures/JavadocSignatureProvider.kt index f9bee318..73ba9989 100644 --- a/plugins/javadoc/src/main/kotlin/javadoc/signatures/JavadocSignatureProvider.kt +++ b/plugins/javadoc/src/main/kotlin/javadoc/signatures/JavadocSignatureProvider.kt @@ -70,7 +70,7 @@ class JavadocSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLo if (c is WithSupertypes) { c.supertypes.map { (p, dris) -> val (classes, interfaces) = dris.partition { it.kind == JavaClassKindTypes.CLASS } - list(classes, prefix = " extends ", sourceSets = setOf(p)) { + list(classes, prefix = "extends ", sourceSets = setOf(p)) { link(it.dri.sureClassNames, it.dri, sourceSets = setOf(p)) } list(interfaces, prefix = " implements ", sourceSets = setOf(p)){ diff --git a/plugins/javadoc/src/main/resources/static_res/dokka-javadoc-stylesheet.css b/plugins/javadoc/src/main/resources/static_res/dokka-javadoc-stylesheet.css new file mode 100644 index 00000000..b37eef35 --- /dev/null +++ b/plugins/javadoc/src/main/resources/static_res/dokka-javadoc-stylesheet.css @@ -0,0 +1,6 @@ +pre.wrap-overflow { + overflow-x: auto; + white-space: pre-wrap; + white-space: -moz-pre-wrap; + word-wrap: break-word; +}
\ No newline at end of file diff --git a/plugins/javadoc/src/main/resources/views/class.korte b/plugins/javadoc/src/main/resources/views/class.korte index 1ddf6796..ddaadc3a 100644 --- a/plugins/javadoc/src/main/resources/views/class.korte +++ b/plugins/javadoc/src/main/resources/views/class.korte @@ -32,10 +32,10 @@ </dl> {% endif %} <hr> - <pre> + <pre class="wrap-overflow"> {% if signature.annotations != null %}{{ signature.annotations|raw }} {% endif %} {{ signature.modifiers }} <span class="typeNameLabel">{{ signature.signatureWithoutModifiers|raw }}</span> -{% if signature.supertypes != null %}{{signature.supertypes|raw}} {% endif %} +{% if signature.supertypes != null %}{{signature.supertypes|raw}}{% endif %} </pre> <div class="block">{{ classlikeDocumentation|raw }}</div> </li> diff --git a/plugins/javadoc/src/main/resources/views/components/head.korte b/plugins/javadoc/src/main/resources/views/components/head.korte index a3c74f12..1b8a61ca 100644 --- a/plugins/javadoc/src/main/resources/views/components/head.korte +++ b/plugins/javadoc/src/main/resources/views/components/head.korte @@ -3,6 +3,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta name="dc.created" content="2020-03-25"> <link rel="stylesheet" type="text/css" href="{{ pathToRoot }}stylesheet.css" title="Style"> + <link rel="stylesheet" type="text/css" href="{{ pathToRoot }}dokka-javadoc-stylesheet.css" title="Style"> <link rel="stylesheet" type="text/css" href="{{ pathToRoot }}jquery/jquery-ui.css" title="Style"> <script type="text/javascript" src="{{ pathToRoot }}jquery/jquery-3.3.1.js"></script> <script type="text/javascript" src="{{ pathToRoot }}jquery/jquery-migrate-3.0.1.js"></script> |