From 22a8d5c35db97d65a90b21d97e6835380191845d Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Wed, 25 Sep 2019 22:14:22 +0200
Subject: Upgrade Bootstrap to version 4

---
 kvision-modules/kvision-bootstrap/build.gradle     | 10 +---
 .../pl/treksoft/kvision/KVManagerBootstrap.kt      |  7 +--
 .../src/main/resources/js/bootstrap.config.js      | 64 ----------------------
 .../src/main/resources/js/bootstrap.config.less    |  0
 4 files changed, 6 insertions(+), 75 deletions(-)
 delete mode 100644 kvision-modules/kvision-bootstrap/src/main/resources/js/bootstrap.config.js
 delete mode 100644 kvision-modules/kvision-bootstrap/src/main/resources/js/bootstrap.config.less

(limited to 'kvision-modules/kvision-bootstrap')

diff --git a/kvision-modules/kvision-bootstrap/build.gradle b/kvision-modules/kvision-bootstrap/build.gradle
index 6c504c17..2f8efeb8 100644
--- a/kvision-modules/kvision-bootstrap/build.gradle
+++ b/kvision-modules/kvision-bootstrap/build.gradle
@@ -3,16 +3,12 @@ apply from: "../shared.gradle"
 kotlinFrontend {
 
     npm {
-        dependency("bootstrap", "3.4.1")
-        dependency("bootstrap-webpack", "0.0.6")
+        dependency("popper.js", "1.15.0")
+        dependency("bootstrap", "4.3.1")
         dependency("font-awesome", "4.7.0")
         dependency("font-awesome-webpack-4", "1.0.0")
-        dependency("awesome-bootstrap-checkbox", "0.3.7")
+        dependency("awesome-bootstrap-checkbox", "1.0.1")
         dependency("bootstrap-vertical-tabs", "1.2.2")
-        devDependency("karma", "3.1.4")
-        devDependency("karma-chrome-launcher", "2.2.0")
-        devDependency("karma-webpack", "3.0.5")
-        devDependency("qunit", "2.8.0")
     }
 
 }
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 {
diff --git a/kvision-modules/kvision-bootstrap/src/main/resources/js/bootstrap.config.js b/kvision-modules/kvision-bootstrap/src/main/resources/js/bootstrap.config.js
deleted file mode 100644
index 906942d1..00000000
--- a/kvision-modules/kvision-bootstrap/src/main/resources/js/bootstrap.config.js
+++ /dev/null
@@ -1,64 +0,0 @@
-module.exports = {
-
-  // Default for the style loading
-  styleLoader: 'style-loader!css-loader!less-loader',
-
-  scripts: {
-    'transition': true,
-    'alert': true,
-    'button': true,
-    'carousel': true,
-    'collapse': true,
-    'dropdown': true,
-    'modal': true,
-    'tooltip': true,
-    'popover': true,
-    'scrollspy': true,
-    'tab': true,
-    'affix': true
-  },
-  styles: {
-    "mixins": false,
-
-    "normalize": false,
-    "print": false,
-
-    "scaffolding": false,
-    "type": false,
-    "code": false,
-    "grid": false,
-    "tables": false,
-    "forms": false,
-    "buttons": false,
-
-    "component-animations": false,
-    "glyphicons": false,
-    "dropdowns": false,
-    "button-groups": false,
-    "input-groups": false,
-    "navs": false,
-    "navbar": false,
-    "breadcrumbs": false,
-    "pagination": false,
-    "pager": false,
-    "labels": false,
-    "badges": false,
-    "jumbotron": false,
-    "thumbnails": false,
-    "alerts": false,
-    "progress-bars": false,
-    "media": false,
-    "list-group": false,
-    "panels": false,
-    "wells": false,
-    "close": false,
-
-    "modals": false,
-    "tooltip": false,
-    "popovers": false,
-    "carousel": false,
-
-    "utilities": false,
-    "responsive-utilities": false
-  }
-};
diff --git a/kvision-modules/kvision-bootstrap/src/main/resources/js/bootstrap.config.less b/kvision-modules/kvision-bootstrap/src/main/resources/js/bootstrap.config.less
deleted file mode 100644
index e69de29b..00000000
-- 
cgit