diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 23d637de4..b14f5c8a2 100755 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -40,67 +40,3 @@ export default { }, } - diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss index e29538807..9bc3231c4 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,99 @@ @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 +@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,.58); + 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/mixins/toaster.js b/frontend/src/mixins/toaster.js index 704eaf1a7..4464a2cc9 100644 --- a/frontend/src/mixins/toaster.js +++ b/frontend/src/mixins/toaster.js @@ -16,7 +16,7 @@ export const toasters = { 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', 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" >