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

[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..0cbec1a2740d14262e2ff2e5d937ed5adc902d17 100644 (file)
--- a/app/assets/stylesheets/_bootstrap-custom.scss
+++ b/app/assets/stylesheets/_bootstrap-custom.scss
@@ -8,9 +8,9 @@
 @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/grid";