From 7f3f876ea5605703020ed2968dc4aa0c631beb13 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 25 Feb 2022 08:54:36 +0100 Subject: [PATCH] added missing bootstrap scss. bootstrap/scss/bootstrap, plus more missing scss files --- frontend/src/App.vue | 6 ++++++ frontend/src/assets/scss/gradido.scss | 19 +++++++++++++------ frontend/src/mixins/toaster.js | 6 +++++- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 23d637de4..fe48ab99e 100755 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -44,6 +44,12 @@ export default { .gdd-toaster-title { color: #ffffff !important; } +.gdd-toaster-text-success { + color: #155724 !important; +} +.gdd-toaster-text-danger { + color: #721c24 !important; +} .gdd-toaster-body { color: #ffffff !important; } diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss index e29538807..f81caf157 100644 --- a/frontend/src/assets/scss/gradido.scss +++ b/frontend/src/assets/scss/gradido.scss @@ -3,15 +3,13 @@ @import "~bootstrap/scss/functions"; - @import "custom/variables"; // @import "~bootstrap/scss/variables"; wird am // ende der custom/variables angehangen - -// Bootstrap (4.5.3) mixins - -@import "~bootstrap/scss/mixins"; +// Bootstrap (4.5.3) mixins +@import "~bootstrap/scss/mixins"; + // Bootstrap (4.5.3) components @import "~bootstrap/scss/alert"; @@ -20,11 +18,18 @@ @import "~bootstrap/scss/button-group"; @import "~bootstrap/scss/buttons"; @import "~bootstrap/scss/card"; +@import "~bootstrap/scss/carousel"; +@import "~bootstrap/scss/close"; +@import "~bootstrap/scss/code"; @import "~bootstrap/scss/custom-forms"; +@import "~bootstrap/scss/dropdown"; @import "~bootstrap/scss/forms"; +@import "~bootstrap/scss/functions"; @import "~bootstrap/scss/grid"; @import "~bootstrap/scss/input-group"; @import "~bootstrap/scss/list-group"; +@import "~bootstrap/scss/mixins"; +@import "~bootstrap/scss/modal"; @import "~bootstrap/scss/nav"; @import "~bootstrap/scss/navbar"; @import "~bootstrap/scss/pagination"; @@ -38,7 +43,9 @@ @import "~bootstrap/scss/type"; @import "~bootstrap/scss/utilities"; @import "~bootstrap/scss/variables"; - +@import "~bootstrap/scss/bootstrap-grid"; +@import "~bootstrap/scss/bootstrap-reboot"; +@import "~bootstrap/scss/bootstrap"; // Bootstrap-vue (2.21.1) scss @import '~bootstrap-vue/src/index.scss'; \ No newline at end of file diff --git a/frontend/src/mixins/toaster.js b/frontend/src/mixins/toaster.js index 704eaf1a7..bf3f0627c 100644 --- a/frontend/src/mixins/toaster.js +++ b/frontend/src/mixins/toaster.js @@ -4,19 +4,23 @@ export const toasters = { this.toast(message, { title: this.$t('success'), variant: 'success', + headerClass: 'gdd-toaster-text-success', + bodyClass: 'gdd-toaster-text-success', }) }, toastError(message) { this.toast(message, { title: this.$t('error.error'), variant: 'danger', + headerClass: 'gdd-toaster-text-danger', + bodyClass: 'gdd-toaster-text-danger', }) }, toast(message, options) { message = message.replace(/^GraphQL error: /, '') this.$bvToast.toast(message, { autoHideDelay: 5000, - appendToast: false, + appendToast: true, solid: true, toaster: 'b-toaster-top-right', headerClass: 'gdd-toaster-title',