From 4ea2255cb7c440c3ab5e736c63db3a46ab5701d7 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 25 Feb 2022 11:40:13 +0100 Subject: [PATCH] =?UTF-8?q?style=20from=20App.vue=20in=20assets/scss=20ges?= =?UTF-8?q?choben.=20style=20for=20alert=20und=20toast=20eingef=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" >