aboutsummaryrefslogtreecommitdiff
path: root/kvision-modules/kvision-bootstrap/src/main/kotlin/pl
diff options
context:
space:
mode:
authorRobert Jaros <rjaros@finn.pl>2019-09-25 22:14:22 +0200
committerRobert Jaros <rjaros@finn.pl>2019-09-25 22:14:22 +0200
commit22a8d5c35db97d65a90b21d97e6835380191845d (patch)
tree158bc4a45638bf2a2da2ba571f46dec14b618379 /kvision-modules/kvision-bootstrap/src/main/kotlin/pl
parent9da6c523723ca8a77c19c471b9beaeb0102f1cbf (diff)
downloadkvision-22a8d5c35db97d65a90b21d97e6835380191845d.tar.gz
kvision-22a8d5c35db97d65a90b21d97e6835380191845d.tar.bz2
kvision-22a8d5c35db97d65a90b21d97e6835380191845d.zip
Upgrade Bootstrap to version 4
Diffstat (limited to 'kvision-modules/kvision-bootstrap/src/main/kotlin/pl')
-rw-r--r--kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/KVManagerBootstrap.kt7
1 files changed, 3 insertions, 4 deletions
diff --git a/kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/KVManagerBootstrap.kt b/kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/KVManagerBootstrap.kt
index 01e1f3c3..678ad33e 100644
--- a/kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/KVManagerBootstrap.kt
+++ b/kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/KVManagerBootstrap.kt
@@ -32,16 +32,15 @@ internal object KVManagerBootstrap {
private val links = document.getElementsByTagName("link")
private val bootstrapWebpack = try {
val bootswatch = links.asList().find { it.getAttribute("href")?.contains("bootstrap.min.css") ?: false }
+ require("bootstrap")
if (bootswatch != null) {
- require("bootstrap-webpack!./js/bootstrap.config.js")
if (bootswatch.getAttribute("href")?.contains("/paper/") == true) {
require("./css/paper.css")
}
- require("./css/style.css")
} else {
- require("bootstrap-webpack")
- require("./css/style.css")
+ require("bootstrap/dist/css/bootstrap.min.css")
}
+ require("./css/style.css")
} catch (e: Throwable) {
}
private val fontAwesomeWebpack = try {