From a88f752908a6188f72274550e0cfe1418cb27f63 Mon Sep 17 00:00:00 2001 From: Yoshie Muranaka Date: Wed, 8 Jul 2020 15:37:22 -0700 Subject: Restructure Sass files - Consolidate all bootstrap partials - Combine all vendor overrides with BMC custom styles - Updated paths for Vuepress docs Signed-off-by: Yoshie Muranaka Change-Id: I1a9f68bdf90edae0d1e38f36ac670bf6426ec8a5 --- src/assets/styles/_obmc-custom.scss | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'src/assets/styles/_obmc-custom.scss') diff --git a/src/assets/styles/_obmc-custom.scss b/src/assets/styles/_obmc-custom.scss index ae4fcb92..c063458c 100644 --- a/src/assets/styles/_obmc-custom.scss +++ b/src/assets/styles/_obmc-custom.scss @@ -3,19 +3,11 @@ // statement. Moving this helper after results in Bootstrap // variables taking precedence over BMC's @import "./bmc/helpers"; -@import "./vendor/bootstrap/helpers"; +@import "./bootstrap/helpers"; -// BMC Base files must follow Bootstrap base files -// to assure BMC base styles override Bootstrap base files -@import "./vendor/bootstrap/base"; -@import "./bmc/base"; +// Vendor styles +@import "./bootstrap"; +@import "~bootstrap-vue/src/index"; -// Conmponents and Utilities from the third-party -// libraries follow base files -@import "./vendor/bootstrap/components"; -@import "./vendor/bootstrap/utils"; -@import "./vendor/bootstrap-vue/index"; - -// Vendor overrides must be the last file imported -@import "./vendor-overrides/bootstrap/index"; -@import "./vendor-overrides/bootstrap-vue/index"; +// Custom BMC styles +@import "./bmc/custom"; -- cgit v1.2.3