From: Mark Otto <markdotto@gmail.com>
Date: Sun, 17 Jan 2016 23:54:17 +0000 (-0800)
Subject: add custom overrides to other bundles
X-Git-Tag: v4.0.0-alpha.3~356
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=567a0e9cee748d198fb3570e65b0a25a6aa373cb;p=thirdparty%2Fbootstrap.git

add custom overrides to other bundles
---

diff --git a/scss/bootstrap-grid.scss b/scss/bootstrap-grid.scss
index 28d59095e3..5dc331eb68 100644
--- a/scss/bootstrap-grid.scss
+++ b/scss/bootstrap-grid.scss
@@ -52,6 +52,7 @@ $grid-gutter-width:          1.875rem !default; // 30px
 // Grid mixins
 //
 
+@import "custom";
 @import "variables";
 
 @import "mixins/clearfix";
diff --git a/scss/bootstrap-reboot.scss b/scss/bootstrap-reboot.scss
index f7ff43eb2b..eeff5166c6 100644
--- a/scss/bootstrap-reboot.scss
+++ b/scss/bootstrap-reboot.scss
@@ -2,6 +2,7 @@
 //
 // Includes only Normalize and our custom Reboot reset.
 
+@import "custom";
 @import "variables";
 @import "mixins/hover";
 @import "mixins/tab-focus";