aboutsummaryrefslogtreecommitdiff
path: root/kvision-modules/kvision-bootstrap/src
diff options
context:
space:
mode:
Diffstat (limited to 'kvision-modules/kvision-bootstrap/src')
-rw-r--r--kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/KVManagerBootstrap.kt7
-rw-r--r--kvision-modules/kvision-bootstrap/src/main/resources/js/bootstrap.config.js64
-rw-r--r--kvision-modules/kvision-bootstrap/src/main/resources/js/bootstrap.config.less0
3 files changed, 3 insertions, 68 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 {
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
--- a/kvision-modules/kvision-bootstrap/src/main/resources/js/bootstrap.config.less
+++ /dev/null