From f96b7263a4ad5409b9d8eeea8e7b6359085203d1 Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Tue, 5 Mar 2019 18:19:53 +0100
Subject: Refactor kvision-bootstrap module.

---
 .../src/main/kotlin/pl/treksoft/kvision/KVManagerBootstrap.kt       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'kvision-modules/kvision-bootstrap/src/main/kotlin/pl')

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 {
-- 
cgit