diff options
| author | Mark Otto <[email protected]> | 2016-01-17 15:51:49 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-01-17 15:51:49 -0800 |
| commit | d00eef1dac656cf629a587520a304afc0f046f54 (patch) | |
| tree | 8efad4a2646d4ee3a5a1cc41f3ab61355e1d9909 | |
| parent | 2f4af5c2955224faaa81fc0c1d558a990f3d4b2c (diff) | |
| parent | 523c5a3d1acbe515a96d814d65912d0619150c09 (diff) | |
| download | bootstrap-d00eef1dac656cf629a587520a304afc0f046f54.tar.xz bootstrap-d00eef1dac656cf629a587520a304afc0f046f54.zip | |
Merge branch 'provide-custom-scss' of https://github.com/stephaniepurvis/bootstrap into stephaniepurvis-provide-custom-scss
| -rw-r--r-- | scss/_custom.scss | 4 | ||||
| -rw-r--r-- | scss/bootstrap.scss | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/scss/_custom.scss b/scss/_custom.scss new file mode 100644 index 000000000..6871992aa --- /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 ab33f86c4..ef30c6b63 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -5,6 +5,7 @@ */ // Core variables and mixins +@import "custom"; @import "variables"; @import "mixins"; |