Procházet zdrojové kódy

Restoring bootstrap

See change:

https://github.com/chamilo/chamilo-lms/commit/8494746531510346e1f9149921deb3e014bca2df#diff-11e9f7f953edc64ba14b0cc350ae7b9dL26
Julio Montoya před 6 roky
rodič
revize
fa1563ad7a
3 změnil soubory, kde provedl 4 přidání a 2 odebrání
  1. 1 1
      assets/css/app.scss
  2. 2 0
      assets/css/bootstrap.scss
  3. 1 1
      webpack.config.js

+ 1 - 1
assets/css/app.scss

@@ -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';

+ 2 - 0
assets/css/bootstrap.scss

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

+ 1 - 1
webpack.config.js

@@ -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')