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

[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 1c3629aa868b3ba4af46ce8498b87cf04ef2c0c7..e502f7db6fdcd1e9d0c832c5385df6222997901e 100644 (file)
--- a/app/assets/stylesheets/_bootstrap-custom.scss
+++ b/app/assets/stylesheets/_bootstrap-custom.scss
@@ -13,7 +13,7 @@
 @import "bootstrap/type";
 // @import "bootstrap/images";
 // @import "bootstrap/code";
 @import "bootstrap/type";
 // @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/alert";
 // @import "bootstrap/progress";
 // @import "bootstrap/media";
 // @import "bootstrap/jumbotron";
 @import "bootstrap/alert";
 // @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";