aboutsummaryrefslogtreecommitdiff
path: root/src/Utilities
diff options
context:
space:
mode:
authorDmitry Jemerov <intelliyole@gmail.com>2015-12-03 12:13:17 +0100
committerDmitry Jemerov <intelliyole@gmail.com>2015-12-03 12:13:17 +0100
commit797cb4732c53bf1e3b2091add8cf731fc436607f (patch)
tree5470caa451bdea99c371793bcc5411e179d1df71 /src/Utilities
parent610ca01d0e2d6443f19b4218b26863cdacce07f1 (diff)
parent90cf2ebccd12073a55ff6f187e5a378a2e96e23b (diff)
downloaddokka-797cb4732c53bf1e3b2091add8cf731fc436607f.tar.gz
dokka-797cb4732c53bf1e3b2091add8cf731fc436607f.tar.bz2
dokka-797cb4732c53bf1e3b2091add8cf731fc436607f.zip
Merge pull request #38 from mikehearn/style-css
Enable browsing of the output HTML with CSS
Diffstat (limited to 'src/Utilities')
-rw-r--r--src/Utilities/DokkaModule.kt2
-rw-r--r--src/Utilities/Path.kt14
2 files changed, 1 insertions, 15 deletions
diff --git a/src/Utilities/DokkaModule.kt b/src/Utilities/DokkaModule.kt
index 3b2d26f1..1eb82313 100644
--- a/src/Utilities/DokkaModule.kt
+++ b/src/Utilities/DokkaModule.kt
@@ -26,7 +26,7 @@ class DokkaModule(val environment: AnalysisEnvironment,
binder.bind(LanguageService::class.java).to(KotlinLanguageService::class.java)
binder.bind(HtmlTemplateService::class.java).toProvider(object : Provider<HtmlTemplateService> {
- override fun get(): HtmlTemplateService = HtmlTemplateService.default("/dokka/styles/style.css")
+ override fun get(): HtmlTemplateService = HtmlTemplateService.default("style.css")
})
binder.registerCategory<LanguageService>("language")
diff --git a/src/Utilities/Path.kt b/src/Utilities/Path.kt
index 36277d9f..05838499 100644
--- a/src/Utilities/Path.kt
+++ b/src/Utilities/Path.kt
@@ -1,19 +1,5 @@
package org.jetbrains.dokka
import java.io.File
-import java.io.IOException
-
-fun File.getRelativePath(name: File): File {
- val parent = parentFile ?: throw IOException("No common directory")
-
- val basePath = canonicalPath + File.separator;
- val targetPath = name.canonicalPath;
-
- if (targetPath.startsWith(basePath)) {
- return File(targetPath.substring(basePath.length))
- } else {
- return File(".." + File.separator + parent.getRelativePath(name))
- }
-}
fun File.appendExtension(extension: String) = if (extension.isEmpty()) this else File(path + "." + extension)