diff options
author | Yoshie Muranaka <yoshiemuranaka@gmail.com> | 2020-07-09 01:37:22 +0300 |
---|---|---|
committer | Derick Montague <derick.montague@ibm.com> | 2020-07-13 23:45:54 +0300 |
commit | a88f752908a6188f72274550e0cfe1418cb27f63 (patch) | |
tree | 537ea8621e2f29184230d7edab6d54bcd4194231 /src/assets | |
parent | c3fb64e248f23a732e3bcce0664dddf3f16f5b9a (diff) | |
download | webui-vue-a88f752908a6188f72274550e0cfe1418cb27f63.tar.xz |
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 <yoshiemuranaka@gmail.com>
Change-Id: I1a9f68bdf90edae0d1e38f36ac670bf6426ec8a5
Diffstat (limited to 'src/assets')
-rw-r--r-- | src/assets/styles/_helpers.scss | 2 | ||||
-rw-r--r-- | src/assets/styles/_obmc-custom.scss | 20 | ||||
-rw-r--r-- | src/assets/styles/bmc/_helpers.scss | 3 | ||||
-rw-r--r-- | src/assets/styles/bmc/custom/_alert.scss (renamed from src/assets/styles/vendor-overrides/bootstrap/_alert.scss) | 0 | ||||
-rw-r--r-- | src/assets/styles/bmc/custom/_badge.scss (renamed from src/assets/styles/vendor-overrides/bootstrap/_badge.scss) | 0 | ||||
-rw-r--r-- | src/assets/styles/bmc/custom/_base.scss (renamed from src/assets/styles/bmc/_base.scss) | 0 | ||||
-rw-r--r-- | src/assets/styles/bmc/custom/_bootstrap-grid.scss (renamed from src/assets/styles/vendor-overrides/bootstrap/_bootstrap-grid.scss) | 0 | ||||
-rw-r--r-- | src/assets/styles/bmc/custom/_buttons.scss (renamed from src/assets/styles/vendor-overrides/bootstrap/_buttons.scss) | 0 | ||||
-rw-r--r-- | src/assets/styles/bmc/custom/_calendar.scss (renamed from src/assets/styles/vendor-overrides/bootstrap-vue/_calendar.scss) | 0 | ||||
-rw-r--r-- | src/assets/styles/bmc/custom/_dropdown.scss (renamed from src/assets/styles/vendor-overrides/bootstrap/_dropdown.scss) | 0 | ||||
-rw-r--r-- | src/assets/styles/bmc/custom/_forms.scss (renamed from src/assets/styles/vendor-overrides/bootstrap/_forms.scss) | 0 | ||||
-rw-r--r-- | src/assets/styles/bmc/custom/_index.scss (renamed from src/assets/styles/vendor-overrides/bootstrap/_index.scss) | 2 | ||||
-rw-r--r-- | src/assets/styles/bmc/custom/_modal.scss (renamed from src/assets/styles/vendor-overrides/bootstrap/_modal.scss) | 0 | ||||
-rw-r--r-- | src/assets/styles/bmc/custom/_pagination.scss (renamed from src/assets/styles/vendor-overrides/bootstrap/_pagination.scss) | 0 | ||||
-rw-r--r-- | src/assets/styles/bmc/custom/_tables.scss (renamed from src/assets/styles/vendor-overrides/bootstrap/_tables.scss) | 0 | ||||
-rw-r--r-- | src/assets/styles/bmc/custom/_toasts.scss (renamed from src/assets/styles/vendor-overrides/bootstrap/_toasts.scss) | 0 | ||||
-rw-r--r-- | src/assets/styles/bmc/helpers/_index.scss | 3 | ||||
-rw-r--r-- | src/assets/styles/bootstrap/_helpers.scss (renamed from src/assets/styles/vendor/bootstrap/_helpers.scss) | 0 | ||||
-rw-r--r-- | src/assets/styles/bootstrap/_index.scss (renamed from src/assets/styles/vendor/bootstrap/_components.scss) | 13 | ||||
-rw-r--r-- | src/assets/styles/vendor-overrides/bootstrap-vue/_index.scss | 1 | ||||
-rw-r--r-- | src/assets/styles/vendor/bootstrap-vue/_index.scss | 1 | ||||
-rw-r--r-- | src/assets/styles/vendor/bootstrap/_base.scss | 4 | ||||
-rw-r--r-- | src/assets/styles/vendor/bootstrap/_utils.scss | 2 |
23 files changed, 24 insertions, 27 deletions
diff --git a/src/assets/styles/_helpers.scss b/src/assets/styles/_helpers.scss index f01c00b7..8c225abf 100644 --- a/src/assets/styles/_helpers.scss +++ b/src/assets/styles/_helpers.scss @@ -1,3 +1,3 @@ // Import required for all single file components that use Sass variables @import "./bmc/helpers"; -@import "./vendor/bootstrap/helpers"; +@import "./bootstrap/helpers"; 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"; diff --git a/src/assets/styles/bmc/_helpers.scss b/src/assets/styles/bmc/_helpers.scss deleted file mode 100644 index 217c90e7..00000000 --- a/src/assets/styles/bmc/_helpers.scss +++ /dev/null @@ -1,3 +0,0 @@ -@import "./helpers/colors"; -@import "./helpers/motion"; -@import "./helpers/variables";
\ No newline at end of file diff --git a/src/assets/styles/vendor-overrides/bootstrap/_alert.scss b/src/assets/styles/bmc/custom/_alert.scss index 0b7b518a..0b7b518a 100644 --- a/src/assets/styles/vendor-overrides/bootstrap/_alert.scss +++ b/src/assets/styles/bmc/custom/_alert.scss diff --git a/src/assets/styles/vendor-overrides/bootstrap/_badge.scss b/src/assets/styles/bmc/custom/_badge.scss index 7acd73a0..7acd73a0 100644 --- a/src/assets/styles/vendor-overrides/bootstrap/_badge.scss +++ b/src/assets/styles/bmc/custom/_badge.scss diff --git a/src/assets/styles/bmc/_base.scss b/src/assets/styles/bmc/custom/_base.scss index 39a4aaa7..39a4aaa7 100644 --- a/src/assets/styles/bmc/_base.scss +++ b/src/assets/styles/bmc/custom/_base.scss diff --git a/src/assets/styles/vendor-overrides/bootstrap/_bootstrap-grid.scss b/src/assets/styles/bmc/custom/_bootstrap-grid.scss index 7ad7c81b..7ad7c81b 100644 --- a/src/assets/styles/vendor-overrides/bootstrap/_bootstrap-grid.scss +++ b/src/assets/styles/bmc/custom/_bootstrap-grid.scss diff --git a/src/assets/styles/vendor-overrides/bootstrap/_buttons.scss b/src/assets/styles/bmc/custom/_buttons.scss index b9b8073b..b9b8073b 100644 --- a/src/assets/styles/vendor-overrides/bootstrap/_buttons.scss +++ b/src/assets/styles/bmc/custom/_buttons.scss diff --git a/src/assets/styles/vendor-overrides/bootstrap-vue/_calendar.scss b/src/assets/styles/bmc/custom/_calendar.scss index bf7572e2..bf7572e2 100644 --- a/src/assets/styles/vendor-overrides/bootstrap-vue/_calendar.scss +++ b/src/assets/styles/bmc/custom/_calendar.scss diff --git a/src/assets/styles/vendor-overrides/bootstrap/_dropdown.scss b/src/assets/styles/bmc/custom/_dropdown.scss index c7d39548..c7d39548 100644 --- a/src/assets/styles/vendor-overrides/bootstrap/_dropdown.scss +++ b/src/assets/styles/bmc/custom/_dropdown.scss diff --git a/src/assets/styles/vendor-overrides/bootstrap/_forms.scss b/src/assets/styles/bmc/custom/_forms.scss index 8d3ed9e4..8d3ed9e4 100644 --- a/src/assets/styles/vendor-overrides/bootstrap/_forms.scss +++ b/src/assets/styles/bmc/custom/_forms.scss diff --git a/src/assets/styles/vendor-overrides/bootstrap/_index.scss b/src/assets/styles/bmc/custom/_index.scss index 8f80e5c4..0c393c57 100644 --- a/src/assets/styles/vendor-overrides/bootstrap/_index.scss +++ b/src/assets/styles/bmc/custom/_index.scss @@ -2,8 +2,10 @@ // Bootstrap styles @import "./alert"; @import "./badge"; +@import "./base"; @import "./bootstrap-grid"; @import "./buttons"; +@import "./calendar"; @import "./dropdown"; @import "./forms"; @import "./modal"; diff --git a/src/assets/styles/vendor-overrides/bootstrap/_modal.scss b/src/assets/styles/bmc/custom/_modal.scss index 5d3b6014..5d3b6014 100644 --- a/src/assets/styles/vendor-overrides/bootstrap/_modal.scss +++ b/src/assets/styles/bmc/custom/_modal.scss diff --git a/src/assets/styles/vendor-overrides/bootstrap/_pagination.scss b/src/assets/styles/bmc/custom/_pagination.scss index 4fed21ba..4fed21ba 100644 --- a/src/assets/styles/vendor-overrides/bootstrap/_pagination.scss +++ b/src/assets/styles/bmc/custom/_pagination.scss diff --git a/src/assets/styles/vendor-overrides/bootstrap/_tables.scss b/src/assets/styles/bmc/custom/_tables.scss index b20feb0d..b20feb0d 100644 --- a/src/assets/styles/vendor-overrides/bootstrap/_tables.scss +++ b/src/assets/styles/bmc/custom/_tables.scss diff --git a/src/assets/styles/vendor-overrides/bootstrap/_toasts.scss b/src/assets/styles/bmc/custom/_toasts.scss index 9295b17e..9295b17e 100644 --- a/src/assets/styles/vendor-overrides/bootstrap/_toasts.scss +++ b/src/assets/styles/bmc/custom/_toasts.scss diff --git a/src/assets/styles/bmc/helpers/_index.scss b/src/assets/styles/bmc/helpers/_index.scss new file mode 100644 index 00000000..e4abf9c5 --- /dev/null +++ b/src/assets/styles/bmc/helpers/_index.scss @@ -0,0 +1,3 @@ +@import "./colors"; +@import "./motion"; +@import "./variables";
\ No newline at end of file diff --git a/src/assets/styles/vendor/bootstrap/_helpers.scss b/src/assets/styles/bootstrap/_helpers.scss index 1055578b..1055578b 100644 --- a/src/assets/styles/vendor/bootstrap/_helpers.scss +++ b/src/assets/styles/bootstrap/_helpers.scss diff --git a/src/assets/styles/vendor/bootstrap/_components.scss b/src/assets/styles/bootstrap/_index.scss index 8341cdc1..847e83e3 100644 --- a/src/assets/styles/vendor/bootstrap/_components.scss +++ b/src/assets/styles/bootstrap/_index.scss @@ -1,3 +1,10 @@ +// Base +@import "~bootstrap/scss/root"; +@import "~bootstrap/scss/reboot"; +@import "~bootstrap/scss/transitions"; +@import "~bootstrap/scss/type"; + +// Components @import "~bootstrap/scss/alert"; @import "~bootstrap/scss/badge"; @import "~bootstrap/scss/breadcrumb"; @@ -23,4 +30,8 @@ @import "~bootstrap/scss/spinners"; @import "~bootstrap/scss/tables"; @import "~bootstrap/scss/toasts"; -@import "~bootstrap/scss/tooltip";
\ No newline at end of file +@import "~bootstrap/scss/tooltip"; + +// Utils +@import "~bootstrap/scss/utilities"; +@import "~bootstrap/scss/print";
\ No newline at end of file diff --git a/src/assets/styles/vendor-overrides/bootstrap-vue/_index.scss b/src/assets/styles/vendor-overrides/bootstrap-vue/_index.scss deleted file mode 100644 index a6658148..00000000 --- a/src/assets/styles/vendor-overrides/bootstrap-vue/_index.scss +++ /dev/null @@ -1 +0,0 @@ -@import "./calendar"; diff --git a/src/assets/styles/vendor/bootstrap-vue/_index.scss b/src/assets/styles/vendor/bootstrap-vue/_index.scss deleted file mode 100644 index c10e1f05..00000000 --- a/src/assets/styles/vendor/bootstrap-vue/_index.scss +++ /dev/null @@ -1 +0,0 @@ -@import "~bootstrap-vue/src/index"; diff --git a/src/assets/styles/vendor/bootstrap/_base.scss b/src/assets/styles/vendor/bootstrap/_base.scss deleted file mode 100644 index 1af03449..00000000 --- a/src/assets/styles/vendor/bootstrap/_base.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import "~bootstrap/scss/root"; -@import "~bootstrap/scss/reboot"; -@import "~bootstrap/scss/transitions"; -@import "~bootstrap/scss/type";
\ No newline at end of file diff --git a/src/assets/styles/vendor/bootstrap/_utils.scss b/src/assets/styles/vendor/bootstrap/_utils.scss deleted file mode 100644 index f0b5c44a..00000000 --- a/src/assets/styles/vendor/bootstrap/_utils.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import "~bootstrap/scss/utilities"; -@import "~bootstrap/scss/print";
\ No newline at end of file |