From 2d670d457753e3503332f3cd802b2f899210af82 Mon Sep 17 00:00:00 2001 From: Steven Pribilinskiy Date: Thu, 16 Nov 2017 13:10:02 +0200 Subject: [PATCH] Split bootstrap.scss into optional and required counterparts (#22891) --- scss/_bootstrap-optional.scss | 32 ++++++++++++++++++++++++++++++ scss/_bootstrap-required.scss | 3 +++ scss/bootstrap-reboot.scss | 4 +--- scss/bootstrap.scss | 37 ++--------------------------------- 4 files changed, 38 insertions(+), 38 deletions(-) create mode 100644 scss/_bootstrap-optional.scss create mode 100644 scss/_bootstrap-required.scss diff --git a/scss/_bootstrap-optional.scss b/scss/_bootstrap-optional.scss new file mode 100644 index 000000000000..92157e0dd3b1 --- /dev/null +++ b/scss/_bootstrap-optional.scss @@ -0,0 +1,32 @@ +@import "root"; +@import "print"; +@import "reboot"; +@import "type"; +@import "images"; +@import "code"; +@import "grid"; +@import "tables"; +@import "forms"; +@import "buttons"; +@import "transitions"; +@import "dropdown"; +@import "button-group"; +@import "input-group"; +@import "custom-forms"; +@import "nav"; +@import "navbar"; +@import "card"; +@import "breadcrumb"; +@import "pagination"; +@import "badge"; +@import "jumbotron"; +@import "alert"; +@import "progress"; +@import "media"; +@import "list-group"; +@import "close"; +@import "modal"; +@import "tooltip"; +@import "popover"; +@import "carousel"; +@import "utilities"; diff --git a/scss/_bootstrap-required.scss b/scss/_bootstrap-required.scss new file mode 100644 index 000000000000..2da7b67d95c5 --- /dev/null +++ b/scss/_bootstrap-required.scss @@ -0,0 +1,3 @@ +@import "functions"; +@import "variables"; +@import "mixins"; diff --git a/scss/bootstrap-reboot.scss b/scss/bootstrap-reboot.scss index 3bc8760a9f8a..d5279a4be097 100644 --- a/scss/bootstrap-reboot.scss +++ b/scss/bootstrap-reboot.scss @@ -6,7 +6,5 @@ * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md) */ -@import "functions"; -@import "variables"; -@import "mixins"; +@import "bootstrap-required"; @import "reboot"; diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index bfeffacacf7c..001dc2e0a364 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -5,38 +5,5 @@ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -@import "functions"; -@import "variables"; -@import "mixins"; -@import "root"; -@import "print"; -@import "reboot"; -@import "type"; -@import "images"; -@import "code"; -@import "grid"; -@import "tables"; -@import "forms"; -@import "buttons"; -@import "transitions"; -@import "dropdown"; -@import "button-group"; -@import "input-group"; -@import "custom-forms"; -@import "nav"; -@import "navbar"; -@import "card"; -@import "breadcrumb"; -@import "pagination"; -@import "badge"; -@import "jumbotron"; -@import "alert"; -@import "progress"; -@import "media"; -@import "list-group"; -@import "close"; -@import "modal"; -@import "tooltip"; -@import "popover"; -@import "carousel"; -@import "utilities"; +@import "bootstrap-required"; +@import "bootstrap-optional";