From 7f3f876ea5605703020ed2968dc4aa0c631beb13 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 25 Feb 2022 08:54:36 +0100 Subject: [PATCH 1/3] 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', From 4ea2255cb7c440c3ab5e736c63db3a46ab5701d7 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 25 Feb 2022 11:40:13 +0100 Subject: [PATCH 2/3] =?UTF-8?q?style=20from=20App.vue=20in=20assets/scss?= =?UTF-8?q?=20geschoben.=20style=20for=20alert=20und=20toast=20eingef?= =?UTF-8?q?=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/App.vue | 70 -------------------- frontend/src/assets/scss/gradido.scss | 92 ++++++++++++++++++++++++++- frontend/src/views/Pages/Login.vue | 3 + frontend/src/views/Pages/Register.vue | 2 +- 4 files changed, 95 insertions(+), 72 deletions(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index fe48ab99e..b14f5c8a2 100755 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -40,73 +40,3 @@ export default { }, } - diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss index f81caf157..bc88acd6d 100644 --- a/frontend/src/assets/scss/gradido.scss +++ b/frontend/src/assets/scss/gradido.scss @@ -48,4 +48,94 @@ @import "~bootstrap/scss/bootstrap"; // Bootstrap-vue (2.21.1) scss -@import '~bootstrap-vue/src/index.scss'; \ No newline at end of file +@import '~bootstrap-vue/src/index.scss'; + + +.alert-success { + color: #155724; + background-color: #d4edda; + border-color: #c3e6cb; +} +.alert-danger { + color: #721c24; + background-color: #f8d7da; + border-color: #f5c6cb; +} + + +.b-toast-danger .toast .toast-header { + color: #721c24; + background-color: rgba(248,215,218,.85); + border-bottom-color: rgba(245,198,203,.85); +} +.b-toast-danger .toast .toast-body{ + background-color: rgba(252,237,238,.85); + border-color: rgba(245,198,203,.85); + color: #721c24; +} + +.b-toast-success .toast .toast-header { + color: #155724; + background-color: rgba(212,237,218,.85); + border-bottom-color: rgba(195,230,203,.85); +} +.b-toast-success .toast .toast-body{ + color: #155724; + background-color: rgba(212,237,218,.85); + border-bottom-color: rgba(195,230,203,.85); +} + + + .btn-primary pim { + background-color: #5a7b02; + border-color: #5e72e4; + } + a, + .copyright { + color: #5a7b02; + } + .font1_2em { + font-size: 1.2em; + } + .font2em { + font-size: 1.5em; + } + .gradido-global-color-text { + color: #3d443b; + } + .gradido-global-color-accent { + color: #047006; + } + .gradido-global-color-6e0a9c9e { + color: #000; + } + .gradido-global-color-2d0fb154 { + color: #047006; + } + .gradido-global-color-16efe88c { + color: #7ebc55; + } + .gradido-global-color-1939326 { + color: #f6fff6; + } + .gradido-global-color-9d79fc1 { + color: #047006; + } + .gradido-global-color-6347f4d { + color: #5a7b02; + } + .gradido-global-color-4fbc19a { + color: #014034; + } + .gradido-global-color-d341874 { + color: #b6d939; + } + .gradido-global-color-619d338 { + color: #8ebfb1; + } + .gradido-global-color-44819a9 { + color: #026873; + } + .gradido-global-color-gray { + color: #858383; + } \ No newline at end of file diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue index 42bf7cc01..d33f0d949 100755 --- a/frontend/src/views/Pages/Login.vue +++ b/frontend/src/views/Pages/Login.vue @@ -115,5 +115,8 @@ export default { }) }, }, + created() { + this.toastSuccess(this.$t('error.no-account')) + }, } diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 8d95c8197..03012cf34 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -108,7 +108,7 @@ v-if="showError" show dismissible - variant="warning" + variant="danger" @dismissed="closeAlert" > From 3da6582a9cf39a4b1b075ba15072d38c130ff210 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 25 Feb 2022 15:39:04 +0100 Subject: [PATCH 3/3] fine bg color change for toast --- frontend/src/assets/scss/gradido.scss | 2 +- frontend/src/mixins/toaster.js | 4 ---- frontend/src/views/Pages/Login.vue | 3 --- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss index bc88acd6d..9bc3231c4 100644 --- a/frontend/src/assets/scss/gradido.scss +++ b/frontend/src/assets/scss/gradido.scss @@ -76,7 +76,7 @@ .b-toast-success .toast .toast-header { color: #155724; - background-color: rgba(212,237,218,.85); + background-color: rgba(212,237,218,.58); border-bottom-color: rgba(195,230,203,.85); } .b-toast-success .toast .toast-body{ diff --git a/frontend/src/mixins/toaster.js b/frontend/src/mixins/toaster.js index bf3f0627c..4464a2cc9 100644 --- a/frontend/src/mixins/toaster.js +++ b/frontend/src/mixins/toaster.js @@ -4,16 +4,12 @@ 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) { diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue index d33f0d949..42bf7cc01 100755 --- a/frontend/src/views/Pages/Login.vue +++ b/frontend/src/views/Pages/Login.vue @@ -115,8 +115,5 @@ export default { }) }, }, - created() { - this.toastSuccess(this.$t('error.no-account')) - }, }