Merge pull request #1540 from gradido/1527-Redesign-the-Toaster

added missing bootstrap scss. bootstrap/scss/bootstrap, plus more mis…
This commit is contained in:
Alexander Friedland 2022-02-25 15:51:59 +01:00 committed by GitHub
commit 94e417a620
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 106 additions and 73 deletions

View File

@ -40,67 +40,3 @@ export default {
}, },
} }
</script> </script>
<style>
.gdd-toaster-title {
color: #ffffff !important;
}
.gdd-toaster-body {
color: #ffffff !important;
}
.gdd-toaster {
color: #ffffff;
}
.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;
}
</style>

View File

@ -3,13 +3,11 @@
@import "~bootstrap/scss/functions"; @import "~bootstrap/scss/functions";
@import "custom/variables"; @import "custom/variables";
// @import "~bootstrap/scss/variables"; wird am // @import "~bootstrap/scss/variables"; wird am
// ende der custom/variables angehangen // ende der custom/variables angehangen
// Bootstrap (4.5.3) mixins // Bootstrap (4.5.3) mixins
@import "~bootstrap/scss/mixins"; @import "~bootstrap/scss/mixins";
// Bootstrap (4.5.3) components // Bootstrap (4.5.3) components
@ -20,11 +18,18 @@
@import "~bootstrap/scss/button-group"; @import "~bootstrap/scss/button-group";
@import "~bootstrap/scss/buttons"; @import "~bootstrap/scss/buttons";
@import "~bootstrap/scss/card"; @import "~bootstrap/scss/card";
@import "~bootstrap/scss/carousel";
@import "~bootstrap/scss/close";
@import "~bootstrap/scss/code";
@import "~bootstrap/scss/custom-forms"; @import "~bootstrap/scss/custom-forms";
@import "~bootstrap/scss/dropdown";
@import "~bootstrap/scss/forms"; @import "~bootstrap/scss/forms";
@import "~bootstrap/scss/functions";
@import "~bootstrap/scss/grid"; @import "~bootstrap/scss/grid";
@import "~bootstrap/scss/input-group"; @import "~bootstrap/scss/input-group";
@import "~bootstrap/scss/list-group"; @import "~bootstrap/scss/list-group";
@import "~bootstrap/scss/mixins";
@import "~bootstrap/scss/modal";
@import "~bootstrap/scss/nav"; @import "~bootstrap/scss/nav";
@import "~bootstrap/scss/navbar"; @import "~bootstrap/scss/navbar";
@import "~bootstrap/scss/pagination"; @import "~bootstrap/scss/pagination";
@ -38,7 +43,99 @@
@import "~bootstrap/scss/type"; @import "~bootstrap/scss/type";
@import "~bootstrap/scss/utilities"; @import "~bootstrap/scss/utilities";
@import "~bootstrap/scss/variables"; @import "~bootstrap/scss/variables";
@import "~bootstrap/scss/bootstrap-grid";
@import "~bootstrap/scss/bootstrap-reboot";
@import "~bootstrap/scss/bootstrap";
// Bootstrap-vue (2.21.1) scss // Bootstrap-vue (2.21.1) scss
@import '~bootstrap-vue/src/index.scss'; @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;
}

View File

@ -16,7 +16,7 @@ export const toasters = {
message = message.replace(/^GraphQL error: /, '') message = message.replace(/^GraphQL error: /, '')
this.$bvToast.toast(message, { this.$bvToast.toast(message, {
autoHideDelay: 5000, autoHideDelay: 5000,
appendToast: false, appendToast: true,
solid: true, solid: true,
toaster: 'b-toaster-top-right', toaster: 'b-toaster-top-right',
headerClass: 'gdd-toaster-title', headerClass: 'gdd-toaster-title',

View File

@ -108,7 +108,7 @@
v-if="showError" v-if="showError"
show show
dismissible dismissible
variant="warning" variant="danger"
@dismissed="closeAlert" @dismissed="closeAlert"
> >
<span class="alert-icon"><i class="ni ni-point"></i></span> <span class="alert-icon"><i class="ni ni-point"></i></span>