From 22a8d5c35db97d65a90b21d97e6835380191845d Mon Sep 17 00:00:00 2001 From: Robert Jaros Date: Wed, 25 Sep 2019 22:14:22 +0200 Subject: Upgrade Bootstrap to version 4 --- .../src/main/kotlin/pl/treksoft/kvision/KVManagerBootstrap.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/KVManagerBootstrap.kt') 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 { -- cgit