Merge remote-tracking branch 'upstream/pull/2499'

[rails.git] / app / assets / stylesheets / _bootstrap-custom.scss

diff --git a/app/assets/stylesheets/_bootstrap-custom.scss b/app/assets/stylesheets/_bootstrap-custom.scss
index 88056f5e7d0d07148a065a8a24df8e9e65c6f848..e502f7db6fdcd1e9d0c832c5385df6222997901e 100644 (file)
--- a/app/assets/stylesheets/_bootstrap-custom.scss
+++ b/app/assets/stylesheets/_bootstrap-custom.scss
@@ -8,12 +8,12 @@
 @import "bootstrap/functions";
 @import "bootstrap/variables";
 @import "bootstrap/mixins";
 @import "bootstrap/functions";
 @import "bootstrap/variables";
 @import "bootstrap/mixins";

-// @import "bootstrap/root";
-// @import "bootstrap/reboot";
-// @import "bootstrap/type";
+@import "bootstrap/root";
+@import "bootstrap/reboot";
+@import "bootstrap/type";

 // @import "bootstrap/images";
 // @import "bootstrap/code";
 // @import "bootstrap/images";
 // @import "bootstrap/code";

-// @import "bootstrap/grid";
+@import "bootstrap/grid";

 // @import "bootstrap/tables";
 // @import "bootstrap/forms";
 // @import "bootstrap/buttons";
 // @import "bootstrap/tables";
 // @import "bootstrap/forms";
 // @import "bootstrap/buttons";


@@ -27,12 +27,12 @@
 @import "bootstrap/card";
 // @import "bootstrap/breadcrumb";
 // @import "bootstrap/pagination";
 @import "bootstrap/card";
 // @import "bootstrap/breadcrumb";
 // @import "bootstrap/pagination";

-// @import "bootstrap/badge";
+@import "bootstrap/badge";

 // @import "bootstrap/jumbotron";
 // @import "bootstrap/jumbotron";

-// @import "bootstrap/alert";
+@import "bootstrap/alert";

 // @import "bootstrap/progress";
 // @import "bootstrap/media";
 // @import "bootstrap/progress";
 // @import "bootstrap/media";

-// @import "bootstrap/list-group";
+@import "bootstrap/list-group";

 // @import "bootstrap/close";
 // @import "bootstrap/toasts";
 // @import "bootstrap/modal";
 // @import "bootstrap/close";
 // @import "bootstrap/toasts";
 // @import "bootstrap/modal";