diff --git a/Gruntfile.js b/Gruntfile.js index eff35818..142e6426 100755 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -186,11 +186,11 @@ module.exports = function (grunt) { }) }, { - test: /\.scss$/, + test: /\.less$/, loader: ExtractTextPlugin.extract({ use: [ { loader: "css-loader?minimize" }, - { loader: "sass-loader" } + { loader: "less-loader" } ] }) }, diff --git a/package.json b/package.json index c53a263a..36590318 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "babel-loader": "^6.4.0", "babel-polyfill": "^6.23.0", "babel-preset-env": "^1.2.2", + "bootstrap": "^3.3.7", "css-loader": "^0.27.3", "exports-loader": "^0.6.4", "extract-text-webpack-plugin": "^2.1.0", @@ -51,9 +52,8 @@ "html-webpack-plugin": "^2.28.0", "imports-loader": "^0.7.1", "ink-docstrap": "^1.1.4", - "node-sass": "^4.5.2", - "sass-loader": "^6.0.3", "jsdoc-babel": "^0.3.0", + "less-loader": "^4.0.3", "style-loader": "^0.15.0", "url-loader": "^0.5.8", "web-resource-inliner": "^4.1.0", diff --git a/src/web/html/index.html b/src/web/html/index.html index c89ca165..c4d76b86 100755 --- a/src/web/html/index.html +++ b/src/web/html/index.html @@ -30,6 +30,11 @@ + + diff --git a/src/web/index.js b/src/web/index.js index 57453cdb..d0894e99 100755 --- a/src/web/index.js +++ b/src/web/index.js @@ -9,7 +9,7 @@ import "./stylesheets/main.js"; // Libs import "babel-polyfill"; -import "bootstrap-sass"; +import "bootstrap"; import "bootstrap-switch"; import "bootstrap-colorpicker"; import CanvasComponents from "../core/lib/canvascomponents.js"; diff --git a/src/web/stylesheets/main.js b/src/web/stylesheets/main.js index 58299f43..e99946ad 100644 --- a/src/web/stylesheets/main.js +++ b/src/web/stylesheets/main.js @@ -10,7 +10,7 @@ import "google-code-prettify/src/prettify.css"; /* Frameworks */ -import "./vendors/bootstrap.scss"; +import "./vendors/bootstrap.less"; import "bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.css"; import "bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css"; diff --git a/src/web/stylesheets/vendors/bootstrap.less b/src/web/stylesheets/vendors/bootstrap.less new file mode 100644 index 00000000..bc064c20 --- /dev/null +++ b/src/web/stylesheets/vendors/bootstrap.less @@ -0,0 +1,58 @@ +/** + * Bootstrap imports + * + * @author n1474335 [n1474335@gmail.com] + * @copyright Crown Copyright 2017 + * @license Apache-2.0 + */ + +// Core variables and mixins +@import "~bootstrap/less/variables.less"; +@import "~bootstrap/less/mixins.less"; + +// Reset and dependencies +@import "~bootstrap/less/normalize.less"; +@import "~bootstrap/less/print.less"; +// @import "~bootstrap/less/glyphicons.less"; + +// Core CSS +@import "~bootstrap/less/scaffolding.less"; +@import "~bootstrap/less/type.less"; +@import "~bootstrap/less/code.less"; +// @import "~bootstrap/less/grid.less"; +@import "~bootstrap/less/tables.less"; +@import "~bootstrap/less/forms.less"; +@import "~bootstrap/less/buttons.less"; + +// Components +@import "~bootstrap/less/component-animations.less"; +@import "~bootstrap/less/dropdowns.less"; +@import "~bootstrap/less/button-groups.less"; +@import "~bootstrap/less/input-groups.less"; +@import "~bootstrap/less/navs.less"; +// @import "~bootstrap/less/navbar.less"; +// @import "~bootstrap/less/breadcrumbs.less"; +// @import "~bootstrap/less/pagination.less"; +// @import "~bootstrap/less/pager.less"; +@import "~bootstrap/less/labels.less"; +// @import "~bootstrap/less/badges.less"; +// @import "~bootstrap/less/jumbotron.less"; +// @import "~bootstrap/less/thumbnails.less"; +@import "~bootstrap/less/alerts.less"; +@import "~bootstrap/less/progress-bars.less"; +// @import "~bootstrap/less/media.less"; +@import "~bootstrap/less/list-group.less"; +@import "~bootstrap/less/panels.less"; +// @import "~bootstrap/less/responsive-embed.less"; +// @import "~bootstrap/less/wells.less"; +@import "~bootstrap/less/close.less"; + +// Components w/ JavaScript +@import "~bootstrap/less/modals.less"; +@import "~bootstrap/less/tooltip.less"; +@import "~bootstrap/less/popovers.less"; +// @import "~bootstrap/less/carousel.less"; + +// Utility classes +@import "~bootstrap/less/utilities.less"; +// @import "~bootstrap/less/responsive-utilities.less"; diff --git a/src/web/stylesheets/vendors/bootstrap.scss b/src/web/stylesheets/vendors/bootstrap.scss deleted file mode 100644 index 86ac19a4..00000000 --- a/src/web/stylesheets/vendors/bootstrap.scss +++ /dev/null @@ -1,58 +0,0 @@ -/** - * Bootstrap imports - * - * @author n1474335 [n1474335@gmail.com] - * @copyright Crown Copyright 2017 - * @license Apache-2.0 - */ - -// Core variables and mixins -@import "~bootstrap-sass/assets/stylesheets/~bootstrap-sass/assets/stylesheets/bootstrap/variables"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/mixins"; - -// Reset and dependencies -@import "~bootstrap-sass/assets/stylesheets/bootstrap/normalize"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/print"; -// @import "~bootstrap-sass/assets/stylesheets/bootstrap/glyphicons"; - -// Core CSS -@import "~bootstrap-sass/assets/stylesheets/bootstrap/scaffolding"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/type"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/code"; -// @import "~bootstrap-sass/assets/stylesheets/bootstrap/grid"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/tables"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/forms"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/buttons"; - -// Components -@import "~bootstrap-sass/assets/stylesheets/bootstrap/component-animations"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/dropdowns"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/button-groups"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/input-groups"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/navs"; -// @import "~bootstrap-sass/assets/stylesheets/bootstrap/navbar"; -// @import "~bootstrap-sass/assets/stylesheets/bootstrap/breadcrumbs"; -// @import "~bootstrap-sass/assets/stylesheets/bootstrap/pagination"; -// @import "~bootstrap-sass/assets/stylesheets/bootstrap/pager"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/labels"; -// @import "~bootstrap-sass/assets/stylesheets/bootstrap/badges"; -// @import "~bootstrap-sass/assets/stylesheets/bootstrap/jumbotron"; -// @import "~bootstrap-sass/assets/stylesheets/bootstrap/thumbnails"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/alerts"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/progress-bars"; -// @import "~bootstrap-sass/assets/stylesheets/bootstrap/media"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/list-group"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/panels"; -// @import "~bootstrap-sass/assets/stylesheets/bootstrap/responsive-embed"; -// @import "~bootstrap-sass/assets/stylesheets/bootstrap/wells"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/close"; - -// Components w/ JavaScript -@import "~bootstrap-sass/assets/stylesheets/bootstrap/modals"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/tooltip"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/popovers"; -// @import "~bootstrap-sass/assets/stylesheets/bootstrap/carousel"; - -// Utility classes -@import "~bootstrap-sass/assets/stylesheets/bootstrap/utilities"; -// @import "~bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities";