Refactor kvision-bootstrap module.

4 files changed, 8 insertions, 10 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 105fa507..01e1f3c3 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
@@ -33,17 +33,19 @@ internal object KVManagerBootstrap {
     private val bootstrapWebpack = try {
         val bootswatch = links.asList().find { it.getAttribute("href")?.contains("bootstrap.min.css") ?: false }
         if (bootswatch != null) {
+            require("bootstrap-webpack!./js/bootstrap.config.js")
             if (bootswatch.getAttribute("href")?.contains("/paper/") == true) {
                 require("./css/paper.css")
             }
-            require("bootstrap-webpack!./js/bootstrap.config.js")
+            require("./css/style.css")
         } else {
             require("bootstrap-webpack")
+            require("./css/style.css")
         }
     } catch (e: Throwable) {
     }
     private val fontAwesomeWebpack = try {
-        require("font-awesome-webpack")
+        require("font-awesome-webpack-4")
     } catch (e: Throwable) {
     }
     private val awesomeBootstrapCheckbox = try {
diff --git a/kvision-modules/kvision-bootstrap/src/main/resources/css/paper.css b/kvision-modules/kvision-bootstrap/src/main/resources/css/paper.css
index 6e923117..1c783608 100644
--- a/kvision-modules/kvision-bootstrap/src/main/resources/css/paper.css
+++ b/kvision-modules/kvision-bootstrap/src/main/resources/css/paper.css
@@ -10,3 +10,7 @@ body {
 .radio label, .checkbox label {
     white-space: nowrap;
 }
+
+.modal-title {
+    font-size: 18px;
+}
diff --git a/src/main/resources/css/style.css b/kvision-modules/kvision-bootstrap/src/main/resources/css/style.css
index 472e4b5d..fbb6f00a 100644
--- a/src/main/resources/css/style.css
+++ b/kvision-modules/kvision-bootstrap/src/main/resources/css/style.css
@@ -132,10 +132,6 @@ trix-toolbar .trix-button-group {
   white-space: nowrap;
 }
 
-.modal-title {
-  font-size: 18px;
-}
-
 ul.dropdown-menu li a {
   cursor: pointer;
 }
diff --git a/src/main/kotlin/pl/treksoft/kvision/KVManager.kt b/src/main/kotlin/pl/treksoft/kvision/KVManager.kt
index de819c98..faa0b77c 100644
--- a/src/main/kotlin/pl/treksoft/kvision/KVManager.kt
+++ b/src/main/kotlin/pl/treksoft/kvision/KVManager.kt
@@ -65,10 +65,6 @@ internal object KVManager {
         )
     )
     private val sdVirtualize = require("snabbdom-virtualize/strings").default
-    private val styleCss = try {
-        require("./css/style.css")
-    } catch (e: Throwable) {
-    }
 
     internal fun patch(id: String, vnode: VNode): VNode {
         val container = document.getElementById(id)