Restoring bootstrap

See change:

8494746531 (diff-11e9f7f953edc64ba14b0cc350ae7b9dL26)
pull/2715/head
Julio Montoya 6 years ago
parent 94ff140330
commit fa1563ad7a
  1. 2
      assets/css/app.scss
  2. 2
      assets/css/bootstrap.scss
  3. 2
      webpack.config.js

@ -5,7 +5,7 @@
@import "~fullcalendar/dist/fullcalendar.css";
@import "~select2/dist/css/select2.css";
@import "~bootstrap-daterangepicker/daterangepicker.scss";
@import "~bootstrap-daterangepicker/daterangepicker.css";
@import "~bootstrap-select/dist/css/bootstrap-select.css";
@import '~jquery-ui/themes/base/all.css';

@ -0,0 +1,2 @@
@import "~bootstrap/scss/bootstrap";
@import "~@fortawesome/fontawesome-free/css/all.css";

@ -23,7 +23,7 @@ Encore
.addEntry('bootstrap', './assets/js/bootstrap.js')
// Reads app.scss -> output as web/build/css/base.css
.addStyleEntry('css/app', './assets/css/app.scss')
//.addStyleEntry('css/bootstrap', './assets/css/bootstrap.scss')
.addStyleEntry('css/bootstrap', './assets/css/bootstrap.scss')
.addStyleEntry('css/chat', './assets/css/chat.css')
.addStyleEntry('css/document', './assets/css/document.css')

Loading…
Cancel
Save