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/_helpers.scss | 2 +- src/assets/styles/_obmc-custom.scss | 20 ++----- src/assets/styles/bmc/_base.scss | 7 --- src/assets/styles/bmc/_helpers.scss | 3 - src/assets/styles/bmc/custom/_alert.scss | 64 ++++++++++++++++++++++ src/assets/styles/bmc/custom/_badge.scss | 21 +++++++ src/assets/styles/bmc/custom/_base.scss | 7 +++ src/assets/styles/bmc/custom/_bootstrap-grid.scss | 8 +++ src/assets/styles/bmc/custom/_buttons.scss | 43 +++++++++++++++ src/assets/styles/bmc/custom/_calendar.scss | 8 +++ src/assets/styles/bmc/custom/_dropdown.scss | 22 ++++++++ src/assets/styles/bmc/custom/_forms.scss | 56 +++++++++++++++++++ src/assets/styles/bmc/custom/_index.scss | 14 +++++ src/assets/styles/bmc/custom/_modal.scss | 7 +++ src/assets/styles/bmc/custom/_pagination.scss | 20 +++++++ src/assets/styles/bmc/custom/_tables.scss | 63 +++++++++++++++++++++ src/assets/styles/bmc/custom/_toasts.scss | 44 +++++++++++++++ src/assets/styles/bmc/helpers/_index.scss | 3 + src/assets/styles/bootstrap/_helpers.scss | 3 + src/assets/styles/bootstrap/_index.scss | 37 +++++++++++++ .../vendor-overrides/bootstrap-vue/_calendar.scss | 8 --- .../vendor-overrides/bootstrap-vue/_index.scss | 1 - .../styles/vendor-overrides/bootstrap/_alert.scss | 64 ---------------------- .../styles/vendor-overrides/bootstrap/_badge.scss | 21 ------- .../bootstrap/_bootstrap-grid.scss | 8 --- .../vendor-overrides/bootstrap/_buttons.scss | 43 --------------- .../vendor-overrides/bootstrap/_dropdown.scss | 22 -------- .../styles/vendor-overrides/bootstrap/_forms.scss | 56 ------------------- .../styles/vendor-overrides/bootstrap/_index.scss | 12 ---- .../styles/vendor-overrides/bootstrap/_modal.scss | 7 --- .../vendor-overrides/bootstrap/_pagination.scss | 20 ------- .../styles/vendor-overrides/bootstrap/_tables.scss | 63 --------------------- .../styles/vendor-overrides/bootstrap/_toasts.scss | 44 --------------- src/assets/styles/vendor/bootstrap-vue/_index.scss | 1 - src/assets/styles/vendor/bootstrap/_base.scss | 4 -- .../styles/vendor/bootstrap/_components.scss | 26 --------- src/assets/styles/vendor/bootstrap/_helpers.scss | 3 - src/assets/styles/vendor/bootstrap/_utils.scss | 2 - 38 files changed, 427 insertions(+), 430 deletions(-) delete mode 100644 src/assets/styles/bmc/_base.scss delete mode 100644 src/assets/styles/bmc/_helpers.scss create mode 100644 src/assets/styles/bmc/custom/_alert.scss create mode 100644 src/assets/styles/bmc/custom/_badge.scss create mode 100644 src/assets/styles/bmc/custom/_base.scss create mode 100644 src/assets/styles/bmc/custom/_bootstrap-grid.scss create mode 100644 src/assets/styles/bmc/custom/_buttons.scss create mode 100644 src/assets/styles/bmc/custom/_calendar.scss create mode 100644 src/assets/styles/bmc/custom/_dropdown.scss create mode 100644 src/assets/styles/bmc/custom/_forms.scss create mode 100644 src/assets/styles/bmc/custom/_index.scss create mode 100644 src/assets/styles/bmc/custom/_modal.scss create mode 100644 src/assets/styles/bmc/custom/_pagination.scss create mode 100644 src/assets/styles/bmc/custom/_tables.scss create mode 100644 src/assets/styles/bmc/custom/_toasts.scss create mode 100644 src/assets/styles/bmc/helpers/_index.scss create mode 100644 src/assets/styles/bootstrap/_helpers.scss create mode 100644 src/assets/styles/bootstrap/_index.scss delete mode 100644 src/assets/styles/vendor-overrides/bootstrap-vue/_calendar.scss delete mode 100644 src/assets/styles/vendor-overrides/bootstrap-vue/_index.scss delete mode 100644 src/assets/styles/vendor-overrides/bootstrap/_alert.scss delete mode 100644 src/assets/styles/vendor-overrides/bootstrap/_badge.scss delete mode 100644 src/assets/styles/vendor-overrides/bootstrap/_bootstrap-grid.scss delete mode 100644 src/assets/styles/vendor-overrides/bootstrap/_buttons.scss delete mode 100644 src/assets/styles/vendor-overrides/bootstrap/_dropdown.scss delete mode 100644 src/assets/styles/vendor-overrides/bootstrap/_forms.scss delete mode 100644 src/assets/styles/vendor-overrides/bootstrap/_index.scss delete mode 100644 src/assets/styles/vendor-overrides/bootstrap/_modal.scss delete mode 100644 src/assets/styles/vendor-overrides/bootstrap/_pagination.scss delete mode 100644 src/assets/styles/vendor-overrides/bootstrap/_tables.scss delete mode 100644 src/assets/styles/vendor-overrides/bootstrap/_toasts.scss delete mode 100644 src/assets/styles/vendor/bootstrap-vue/_index.scss delete mode 100644 src/assets/styles/vendor/bootstrap/_base.scss delete mode 100644 src/assets/styles/vendor/bootstrap/_components.scss delete mode 100644 src/assets/styles/vendor/bootstrap/_helpers.scss delete mode 100644 src/assets/styles/vendor/bootstrap/_utils.scss (limited to 'src/assets') 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/_base.scss b/src/assets/styles/bmc/_base.scss deleted file mode 100644 index 39a4aaa7..00000000 --- a/src/assets/styles/bmc/_base.scss +++ /dev/null @@ -1,7 +0,0 @@ -dt, -legend, -label { - color: $gray-800; - font-size: 14px; - font-weight: 400; -} 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/bmc/custom/_alert.scss b/src/assets/styles/bmc/custom/_alert.scss new file mode 100644 index 00000000..0b7b518a --- /dev/null +++ b/src/assets/styles/bmc/custom/_alert.scss @@ -0,0 +1,64 @@ +.alert { + display: flex; + padding: $spacer; + border-width: 0 0 0 3px; + color: $gray-800; + margin-bottom: $spacer; + + &.small { + padding: $spacer / 2; + font-size: 1rem; + } + + .close { + font-weight: 300; + opacity: 1; + } + + .alert-icon { + display: inline-flex; + align-items: center; + margin-right: $spacer; + margin-bottom: $spacer; + + @include media-breakpoint-up(sm) { + margin-bottom: 0; + } + } + + .alert-content { + flex: 1 1 auto; + } + + .alert-title { + margin-bottom: $spacer / 2; + } + + .alert-msg { + p + p { + margin-bottom: $spacer; + } + + p:last-of-type { + margin-bottom: 0; + } + } + + &.alert-info { + border-left-color: $info; + background-color: $info-light; + fill: $info; + } + + &.alert-danger { + border-left-color: $danger; + background-color: $danger-light; + fill: $danger; + } + + &.alert-warning { + border-left-color: $warning; + background-color: $warning-light; + fill: $warning; + } + } \ No newline at end of file diff --git a/src/assets/styles/bmc/custom/_badge.scss b/src/assets/styles/bmc/custom/_badge.scss new file mode 100644 index 00000000..7acd73a0 --- /dev/null +++ b/src/assets/styles/bmc/custom/_badge.scss @@ -0,0 +1,21 @@ +.badge-pill { + // Need to explicitly set border-radius + // for pill variant because global $enable-rounded + // Bootstrap setting removes rounded pill style + border-radius: 10rem; + fill: currentColor; + font-weight: 400; + line-height: 1.5; + display: inline-flex; + .close { + font-size: 1em; + margin-left: $spacer/2; + font-weight: inherit; + color: inherit; + } +} + +.badge-primary { + background-color: $info-light; + color: $info; +} \ No newline at end of file diff --git a/src/assets/styles/bmc/custom/_base.scss b/src/assets/styles/bmc/custom/_base.scss new file mode 100644 index 00000000..39a4aaa7 --- /dev/null +++ b/src/assets/styles/bmc/custom/_base.scss @@ -0,0 +1,7 @@ +dt, +legend, +label { + color: $gray-800; + font-size: 14px; + font-weight: 400; +} diff --git a/src/assets/styles/bmc/custom/_bootstrap-grid.scss b/src/assets/styles/bmc/custom/_bootstrap-grid.scss new file mode 100644 index 00000000..7ad7c81b --- /dev/null +++ b/src/assets/styles/bmc/custom/_bootstrap-grid.scss @@ -0,0 +1,8 @@ +.container-xl { + // Fluid layout container class sets 100% + // width until xl breakpoint. Once a max-width + // is set, setting the left margin to 0 is needed + // so the content doesn't center align + // https://bootstrap-vue.org/docs/components/layout#fluid-width-container + margin-left: 0; +} \ No newline at end of file diff --git a/src/assets/styles/bmc/custom/_buttons.scss b/src/assets/styles/bmc/custom/_buttons.scss new file mode 100644 index 00000000..b9b8073b --- /dev/null +++ b/src/assets/styles/bmc/custom/_buttons.scss @@ -0,0 +1,43 @@ +.btn { + font-weight: $headings-font-weight; + padding-top: $spacer / 2; + padding-right: $spacer; + padding-bottom: $spacer / 2; + padding-left: $spacer; + + // Buttons with SVGs and text expect + // text to be wrapped in a span element + svg + span { + margin-left: $spacer / 4; + } +} + +.btn-primary { + fill: currentColor; +} + +.btn-secondary { + fill: currentColor; +} + +.btn-link { + fill: $primary; + text-decoration: none !important; + + &:focus { + box-shadow: $btn-focus-box-shadow; + } + &:hover { + fill: darken($primary, 15%); + } +} + +.btn:disabled { + color: $gray-600; + fill: currentColor; + + &:not(.btn-link) { + border-color: $gray-400; + background-color: $gray-400; + } +} \ No newline at end of file diff --git a/src/assets/styles/bmc/custom/_calendar.scss b/src/assets/styles/bmc/custom/_calendar.scss new file mode 100644 index 00000000..bf7572e2 --- /dev/null +++ b/src/assets/styles/bmc/custom/_calendar.scss @@ -0,0 +1,8 @@ +.b-calendar-nav { + .btn { + &:hover { + background: none; + color: $dark; + } + } +} \ No newline at end of file diff --git a/src/assets/styles/bmc/custom/_dropdown.scss b/src/assets/styles/bmc/custom/_dropdown.scss new file mode 100644 index 00000000..c7d39548 --- /dev/null +++ b/src/assets/styles/bmc/custom/_dropdown.scss @@ -0,0 +1,22 @@ +.dropdown-item { + padding-left: $spacer/2; +} + +.b-dropdown-form { + padding: $spacer/2; + .form-group { + margin-bottom: $spacer/2; + } +} + +// Adding component style to global stylesheet because +// single-file component scoped styles aren't +// being applied to dynamically appended elements +// The overflow menu should be above the table + +.table-filter { + .dropdown-menu { + z-index: $zindex-dropdown + 1; + padding: 0; + } +} \ No newline at end of file diff --git a/src/assets/styles/bmc/custom/_forms.scss b/src/assets/styles/bmc/custom/_forms.scss new file mode 100644 index 00000000..8d3ed9e4 --- /dev/null +++ b/src/assets/styles/bmc/custom/_forms.scss @@ -0,0 +1,56 @@ +.form-text { + margin-top: -$spacer / 4; + margin-bottom: $spacer / 2; + color: $gray-800; +} + +.col-form-label { + color: $gray-800; + font-size: 14px; +} + +.form-group { + margin-bottom: $spacer * 2; +} + +.custom-select, +.custom-control-label, +.form-control { + //important needed to override validation colors on radio labels + color: $dark !important; + font-size: 16px; + border-color: $gray-400 !important; + &.is-invalid, + &:invalid { + border-bottom: 2px solid $danger !important; + } +} + +.custom-control { + .custom-control-input[disabled=disabled] { + & + .custom-control-label { + // Disabled label for checkbox, radio, + // switch bootstrap form components + color: $gray-700!important; + } + } +} + +.b-form-tag-remove { + // X button to remove tag + font-weight: normal; +} + +.b-form-tags-button { + // Add button inside input field + white-space: nowrap; + margin-right: -$spacer; + &.btn-link-primary { + color: $primary; + fill: currentColor; + } +} + +.form-background { + background-color: $container-bgd; +} \ No newline at end of file diff --git a/src/assets/styles/bmc/custom/_index.scss b/src/assets/styles/bmc/custom/_index.scss new file mode 100644 index 00000000..0c393c57 --- /dev/null +++ b/src/assets/styles/bmc/custom/_index.scss @@ -0,0 +1,14 @@ +// OpenBMC Global Style Overrides of out of the box +// Bootstrap styles +@import "./alert"; +@import "./badge"; +@import "./base"; +@import "./bootstrap-grid"; +@import "./buttons"; +@import "./calendar"; +@import "./dropdown"; +@import "./forms"; +@import "./modal"; +@import "./pagination"; +@import "./tables"; +@import "./toasts"; \ No newline at end of file diff --git a/src/assets/styles/bmc/custom/_modal.scss b/src/assets/styles/bmc/custom/_modal.scss new file mode 100644 index 00000000..5d3b6014 --- /dev/null +++ b/src/assets/styles/bmc/custom/_modal.scss @@ -0,0 +1,7 @@ +.modal-header { + .close { + font-weight: normal; + color: $dark; + opacity: 1; + } +} \ No newline at end of file diff --git a/src/assets/styles/bmc/custom/_pagination.scss b/src/assets/styles/bmc/custom/_pagination.scss new file mode 100644 index 00000000..4fed21ba --- /dev/null +++ b/src/assets/styles/bmc/custom/_pagination.scss @@ -0,0 +1,20 @@ +.table-pagination-select { + display: flex; + flex-direction: row-reverse; + select { + width: fit-content; + } + label { + margin-left: $spacer; + line-height: $spacer * 2; + } +} + +.b-pagination { + .page-item.active button { + color: $dark; + background-color: $white; + border-color: $border-color; + box-shadow: inset 0px -3px $primary; + } +} \ No newline at end of file diff --git a/src/assets/styles/bmc/custom/_tables.scss b/src/assets/styles/bmc/custom/_tables.scss new file mode 100644 index 00000000..b20feb0d --- /dev/null +++ b/src/assets/styles/bmc/custom/_tables.scss @@ -0,0 +1,63 @@ +.table { + position: relative; + z-index: $zindex-dropdown; + + td { + border-top: 1px solid $gray-300; + border-bottom: 1px solid $gray-300; + &:first-of-type { + border-left: 1px solid $gray-300; + } + &:last-of-type { + border-right: 1px solid $gray-300; + } + } + + // thead-light added for specificiy + .thead-light th { + border: none; + color: $dark; + } + + .status-icon svg { + width: 1rem; + height: auto; + } + + .b-table-has-details { + td { + border-bottom: none; + } + .table-row-expand svg { + transform: rotate(180deg); + } + } + + .b-table-details { + background-color: $light; + td { + padding-left: calc(50px + (#{$table-cell-padding} * 2)); + } + dl { + margin: 0; + } + dt { + display: inline-block; + margin-right: $spacer / 2; + } + dd { + display: inline-block; + } + } + + .table-row-expand { + width: 50px; + .btn { + padding: 0; + width: 50px; + } + svg { + fill: $dark; + } + } +} \ No newline at end of file diff --git a/src/assets/styles/bmc/custom/_toasts.scss b/src/assets/styles/bmc/custom/_toasts.scss new file mode 100644 index 00000000..9295b17e --- /dev/null +++ b/src/assets/styles/bmc/custom/_toasts.scss @@ -0,0 +1,44 @@ +.b-toaster { + top: 75px!important; // make sure toasts do not hide top header +} + +.toast { + padding: $spacer/2 $spacer/2 $spacer/2 $spacer; + border-width: 0 0 0 3px; + .close { + font-weight: 300; + opacity: 1; + } +} + +.toast-header { + background-color: inherit!important; //override specificity + border: none; + color: $dark!important; //override specificity + padding-bottom: 0; +} + +.toast-body { + color: $dark; + padding-top: 0; +} + +.b-toast-success .toast { + border-left-color: $success!important; + background-color: $success-light; +} + +.b-toast-info .toast { + border-left-color: $info!important; + background-color: $info-light; +} + +.b-toast-danger .toast { + border-left-color: $danger!important; + background-color: $danger-light; +} + +.b-toast-warning .toast { + border-left-color: $warning!important; + background-color: $warning-light; +} \ No newline at end of file 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/bootstrap/_helpers.scss b/src/assets/styles/bootstrap/_helpers.scss new file mode 100644 index 00000000..1055578b --- /dev/null +++ b/src/assets/styles/bootstrap/_helpers.scss @@ -0,0 +1,3 @@ +@import "~bootstrap/scss/functions"; +@import "~bootstrap/scss/variables"; +@import "~bootstrap/scss/mixins"; \ No newline at end of file diff --git a/src/assets/styles/bootstrap/_index.scss b/src/assets/styles/bootstrap/_index.scss new file mode 100644 index 00000000..847e83e3 --- /dev/null +++ b/src/assets/styles/bootstrap/_index.scss @@ -0,0 +1,37 @@ +// 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"; +@import "~bootstrap/scss/button-group"; +@import "~bootstrap/scss/buttons"; +@import "~bootstrap/scss/card"; +@import "~bootstrap/scss/close"; +@import "~bootstrap/scss/code"; +@import "~bootstrap/scss/custom-forms"; +@import "~bootstrap/scss/dropdown"; +@import "~bootstrap/scss/forms"; +@import "~bootstrap/scss/grid"; +@import "~bootstrap/scss/images"; +@import "~bootstrap/scss/input-group"; +@import "~bootstrap/scss/list-group"; +@import "~bootstrap/scss/media"; +@import "~bootstrap/scss/modal"; +@import "~bootstrap/scss/nav"; +@import "~bootstrap/scss/navbar"; +@import "~bootstrap/scss/pagination"; +@import "~bootstrap/scss/popover"; +@import "~bootstrap/scss/progress"; +@import "~bootstrap/scss/spinners"; +@import "~bootstrap/scss/tables"; +@import "~bootstrap/scss/toasts"; +@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/_calendar.scss b/src/assets/styles/vendor-overrides/bootstrap-vue/_calendar.scss deleted file mode 100644 index bf7572e2..00000000 --- a/src/assets/styles/vendor-overrides/bootstrap-vue/_calendar.scss +++ /dev/null @@ -1,8 +0,0 @@ -.b-calendar-nav { - .btn { - &:hover { - background: none; - color: $dark; - } - } -} \ 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-overrides/bootstrap/_alert.scss b/src/assets/styles/vendor-overrides/bootstrap/_alert.scss deleted file mode 100644 index 0b7b518a..00000000 --- a/src/assets/styles/vendor-overrides/bootstrap/_alert.scss +++ /dev/null @@ -1,64 +0,0 @@ -.alert { - display: flex; - padding: $spacer; - border-width: 0 0 0 3px; - color: $gray-800; - margin-bottom: $spacer; - - &.small { - padding: $spacer / 2; - font-size: 1rem; - } - - .close { - font-weight: 300; - opacity: 1; - } - - .alert-icon { - display: inline-flex; - align-items: center; - margin-right: $spacer; - margin-bottom: $spacer; - - @include media-breakpoint-up(sm) { - margin-bottom: 0; - } - } - - .alert-content { - flex: 1 1 auto; - } - - .alert-title { - margin-bottom: $spacer / 2; - } - - .alert-msg { - p + p { - margin-bottom: $spacer; - } - - p:last-of-type { - margin-bottom: 0; - } - } - - &.alert-info { - border-left-color: $info; - background-color: $info-light; - fill: $info; - } - - &.alert-danger { - border-left-color: $danger; - background-color: $danger-light; - fill: $danger; - } - - &.alert-warning { - border-left-color: $warning; - background-color: $warning-light; - fill: $warning; - } - } \ No newline at end of file diff --git a/src/assets/styles/vendor-overrides/bootstrap/_badge.scss b/src/assets/styles/vendor-overrides/bootstrap/_badge.scss deleted file mode 100644 index 7acd73a0..00000000 --- a/src/assets/styles/vendor-overrides/bootstrap/_badge.scss +++ /dev/null @@ -1,21 +0,0 @@ -.badge-pill { - // Need to explicitly set border-radius - // for pill variant because global $enable-rounded - // Bootstrap setting removes rounded pill style - border-radius: 10rem; - fill: currentColor; - font-weight: 400; - line-height: 1.5; - display: inline-flex; - .close { - font-size: 1em; - margin-left: $spacer/2; - font-weight: inherit; - color: inherit; - } -} - -.badge-primary { - background-color: $info-light; - color: $info; -} \ No newline at end of file diff --git a/src/assets/styles/vendor-overrides/bootstrap/_bootstrap-grid.scss b/src/assets/styles/vendor-overrides/bootstrap/_bootstrap-grid.scss deleted file mode 100644 index 7ad7c81b..00000000 --- a/src/assets/styles/vendor-overrides/bootstrap/_bootstrap-grid.scss +++ /dev/null @@ -1,8 +0,0 @@ -.container-xl { - // Fluid layout container class sets 100% - // width until xl breakpoint. Once a max-width - // is set, setting the left margin to 0 is needed - // so the content doesn't center align - // https://bootstrap-vue.org/docs/components/layout#fluid-width-container - margin-left: 0; -} \ No newline at end of file diff --git a/src/assets/styles/vendor-overrides/bootstrap/_buttons.scss b/src/assets/styles/vendor-overrides/bootstrap/_buttons.scss deleted file mode 100644 index b9b8073b..00000000 --- a/src/assets/styles/vendor-overrides/bootstrap/_buttons.scss +++ /dev/null @@ -1,43 +0,0 @@ -.btn { - font-weight: $headings-font-weight; - padding-top: $spacer / 2; - padding-right: $spacer; - padding-bottom: $spacer / 2; - padding-left: $spacer; - - // Buttons with SVGs and text expect - // text to be wrapped in a span element - svg + span { - margin-left: $spacer / 4; - } -} - -.btn-primary { - fill: currentColor; -} - -.btn-secondary { - fill: currentColor; -} - -.btn-link { - fill: $primary; - text-decoration: none !important; - - &:focus { - box-shadow: $btn-focus-box-shadow; - } - &:hover { - fill: darken($primary, 15%); - } -} - -.btn:disabled { - color: $gray-600; - fill: currentColor; - - &:not(.btn-link) { - border-color: $gray-400; - background-color: $gray-400; - } -} \ No newline at end of file diff --git a/src/assets/styles/vendor-overrides/bootstrap/_dropdown.scss b/src/assets/styles/vendor-overrides/bootstrap/_dropdown.scss deleted file mode 100644 index c7d39548..00000000 --- a/src/assets/styles/vendor-overrides/bootstrap/_dropdown.scss +++ /dev/null @@ -1,22 +0,0 @@ -.dropdown-item { - padding-left: $spacer/2; -} - -.b-dropdown-form { - padding: $spacer/2; - .form-group { - margin-bottom: $spacer/2; - } -} - -// Adding component style to global stylesheet because -// single-file component scoped styles aren't -// being applied to dynamically appended elements -// The overflow menu should be above the table - -.table-filter { - .dropdown-menu { - z-index: $zindex-dropdown + 1; - padding: 0; - } -} \ No newline at end of file diff --git a/src/assets/styles/vendor-overrides/bootstrap/_forms.scss b/src/assets/styles/vendor-overrides/bootstrap/_forms.scss deleted file mode 100644 index 8d3ed9e4..00000000 --- a/src/assets/styles/vendor-overrides/bootstrap/_forms.scss +++ /dev/null @@ -1,56 +0,0 @@ -.form-text { - margin-top: -$spacer / 4; - margin-bottom: $spacer / 2; - color: $gray-800; -} - -.col-form-label { - color: $gray-800; - font-size: 14px; -} - -.form-group { - margin-bottom: $spacer * 2; -} - -.custom-select, -.custom-control-label, -.form-control { - //important needed to override validation colors on radio labels - color: $dark !important; - font-size: 16px; - border-color: $gray-400 !important; - &.is-invalid, - &:invalid { - border-bottom: 2px solid $danger !important; - } -} - -.custom-control { - .custom-control-input[disabled=disabled] { - & + .custom-control-label { - // Disabled label for checkbox, radio, - // switch bootstrap form components - color: $gray-700!important; - } - } -} - -.b-form-tag-remove { - // X button to remove tag - font-weight: normal; -} - -.b-form-tags-button { - // Add button inside input field - white-space: nowrap; - margin-right: -$spacer; - &.btn-link-primary { - color: $primary; - fill: currentColor; - } -} - -.form-background { - background-color: $container-bgd; -} \ No newline at end of file diff --git a/src/assets/styles/vendor-overrides/bootstrap/_index.scss b/src/assets/styles/vendor-overrides/bootstrap/_index.scss deleted file mode 100644 index 8f80e5c4..00000000 --- a/src/assets/styles/vendor-overrides/bootstrap/_index.scss +++ /dev/null @@ -1,12 +0,0 @@ -// OpenBMC Global Style Overrides of out of the box -// Bootstrap styles -@import "./alert"; -@import "./badge"; -@import "./bootstrap-grid"; -@import "./buttons"; -@import "./dropdown"; -@import "./forms"; -@import "./modal"; -@import "./pagination"; -@import "./tables"; -@import "./toasts"; \ No newline at end of file diff --git a/src/assets/styles/vendor-overrides/bootstrap/_modal.scss b/src/assets/styles/vendor-overrides/bootstrap/_modal.scss deleted file mode 100644 index 5d3b6014..00000000 --- a/src/assets/styles/vendor-overrides/bootstrap/_modal.scss +++ /dev/null @@ -1,7 +0,0 @@ -.modal-header { - .close { - font-weight: normal; - color: $dark; - opacity: 1; - } -} \ No newline at end of file diff --git a/src/assets/styles/vendor-overrides/bootstrap/_pagination.scss b/src/assets/styles/vendor-overrides/bootstrap/_pagination.scss deleted file mode 100644 index 4fed21ba..00000000 --- a/src/assets/styles/vendor-overrides/bootstrap/_pagination.scss +++ /dev/null @@ -1,20 +0,0 @@ -.table-pagination-select { - display: flex; - flex-direction: row-reverse; - select { - width: fit-content; - } - label { - margin-left: $spacer; - line-height: $spacer * 2; - } -} - -.b-pagination { - .page-item.active button { - color: $dark; - background-color: $white; - border-color: $border-color; - box-shadow: inset 0px -3px $primary; - } -} \ No newline at end of file diff --git a/src/assets/styles/vendor-overrides/bootstrap/_tables.scss b/src/assets/styles/vendor-overrides/bootstrap/_tables.scss deleted file mode 100644 index b20feb0d..00000000 --- a/src/assets/styles/vendor-overrides/bootstrap/_tables.scss +++ /dev/null @@ -1,63 +0,0 @@ -.table { - position: relative; - z-index: $zindex-dropdown; - - td { - border-top: 1px solid $gray-300; - border-bottom: 1px solid $gray-300; - &:first-of-type { - border-left: 1px solid $gray-300; - } - &:last-of-type { - border-right: 1px solid $gray-300; - } - } - - // thead-light added for specificiy - .thead-light th { - border: none; - color: $dark; - } - - .status-icon svg { - width: 1rem; - height: auto; - } - - .b-table-has-details { - td { - border-bottom: none; - } - .table-row-expand svg { - transform: rotate(180deg); - } - } - - .b-table-details { - background-color: $light; - td { - padding-left: calc(50px + (#{$table-cell-padding} * 2)); - } - dl { - margin: 0; - } - dt { - display: inline-block; - margin-right: $spacer / 2; - } - dd { - display: inline-block; - } - } - - .table-row-expand { - width: 50px; - .btn { - padding: 0; - width: 50px; - } - svg { - fill: $dark; - } - } -} \ No newline at end of file diff --git a/src/assets/styles/vendor-overrides/bootstrap/_toasts.scss b/src/assets/styles/vendor-overrides/bootstrap/_toasts.scss deleted file mode 100644 index 9295b17e..00000000 --- a/src/assets/styles/vendor-overrides/bootstrap/_toasts.scss +++ /dev/null @@ -1,44 +0,0 @@ -.b-toaster { - top: 75px!important; // make sure toasts do not hide top header -} - -.toast { - padding: $spacer/2 $spacer/2 $spacer/2 $spacer; - border-width: 0 0 0 3px; - .close { - font-weight: 300; - opacity: 1; - } -} - -.toast-header { - background-color: inherit!important; //override specificity - border: none; - color: $dark!important; //override specificity - padding-bottom: 0; -} - -.toast-body { - color: $dark; - padding-top: 0; -} - -.b-toast-success .toast { - border-left-color: $success!important; - background-color: $success-light; -} - -.b-toast-info .toast { - border-left-color: $info!important; - background-color: $info-light; -} - -.b-toast-danger .toast { - border-left-color: $danger!important; - background-color: $danger-light; -} - -.b-toast-warning .toast { - border-left-color: $warning!important; - background-color: $warning-light; -} \ No newline at end of file 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/_components.scss b/src/assets/styles/vendor/bootstrap/_components.scss deleted file mode 100644 index 8341cdc1..00000000 --- a/src/assets/styles/vendor/bootstrap/_components.scss +++ /dev/null @@ -1,26 +0,0 @@ -@import "~bootstrap/scss/alert"; -@import "~bootstrap/scss/badge"; -@import "~bootstrap/scss/breadcrumb"; -@import "~bootstrap/scss/button-group"; -@import "~bootstrap/scss/buttons"; -@import "~bootstrap/scss/card"; -@import "~bootstrap/scss/close"; -@import "~bootstrap/scss/code"; -@import "~bootstrap/scss/custom-forms"; -@import "~bootstrap/scss/dropdown"; -@import "~bootstrap/scss/forms"; -@import "~bootstrap/scss/grid"; -@import "~bootstrap/scss/images"; -@import "~bootstrap/scss/input-group"; -@import "~bootstrap/scss/list-group"; -@import "~bootstrap/scss/media"; -@import "~bootstrap/scss/modal"; -@import "~bootstrap/scss/nav"; -@import "~bootstrap/scss/navbar"; -@import "~bootstrap/scss/pagination"; -@import "~bootstrap/scss/popover"; -@import "~bootstrap/scss/progress"; -@import "~bootstrap/scss/spinners"; -@import "~bootstrap/scss/tables"; -@import "~bootstrap/scss/toasts"; -@import "~bootstrap/scss/tooltip"; \ No newline at end of file diff --git a/src/assets/styles/vendor/bootstrap/_helpers.scss b/src/assets/styles/vendor/bootstrap/_helpers.scss deleted file mode 100644 index 1055578b..00000000 --- a/src/assets/styles/vendor/bootstrap/_helpers.scss +++ /dev/null @@ -1,3 +0,0 @@ -@import "~bootstrap/scss/functions"; -@import "~bootstrap/scss/variables"; -@import "~bootstrap/scss/mixins"; \ 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 -- cgit v1.2.3