From aaae40c069ee79102a5587f7dc383bac9825f96d Mon Sep 17 00:00:00 2001 From: Stephanie Kendall Date: Tue, 1 Dec 2015 13:44:37 -0600 Subject: [PATCH 1/2] implements a _custom.scss, resolves #17322 --- scss/_custom.scss | 4 ++++ scss/bootstrap.scss | 1 + 2 files changed, 5 insertions(+) create mode 100644 scss/_custom.scss diff --git a/scss/_custom.scss b/scss/_custom.scss new file mode 100644 index 0000000000..6871992aa7 --- /dev/null +++ b/scss/_custom.scss @@ -0,0 +1,4 @@ +// Custom Overrides +// +// Copy settings from `_variables.scss` to this file to override +// the Bootstrap defaults without modifying key, versioned files. diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index e9300f54dc..8f7e90ea2f 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -6,6 +6,7 @@ // Core variables and mixins @import "variables"; +@import "custom"; @import "mixins"; // Reset and dependencies From 523c5a3d1acbe515a96d814d65912d0619150c09 Mon Sep 17 00:00:00 2001 From: Stephanie Kendall Date: Wed, 16 Dec 2015 09:27:09 -0600 Subject: [PATCH 2/2] switching position of custom in bootstrap.scss for better efficiency --- scss/bootstrap.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index 8f7e90ea2f..5ead350f96 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -5,8 +5,8 @@ */ // Core variables and mixins -@import "variables"; @import "custom"; +@import "variables"; @import "mixins"; // Reset and dependencies