+
diff --git a/frontend/src/assets/scss/gradido-template.scss b/frontend/src/assets/scss/gradido-template.scss
index 645513205..fc9d496c3 100644
--- a/frontend/src/assets/scss/gradido-template.scss
+++ b/frontend/src/assets/scss/gradido-template.scss
@@ -64,18 +64,18 @@ a:hover,
}
.btn-gradido {
- display: inline-block;
- padding: 0.6em 3em;
+ display: inline-block !important;
+ padding: 0.6em 3em !important;
letter-spacing: 0.05em;
- color: #fff;
- transition: all 0.5s ease;
+ color: #fff !important;
+ transition: all 0.5s ease !important;
background: rgb(249 205 105);
background: linear-gradient(135deg, rgb(249 205 105 / 100%) 2%, rgb(197 141 56 / 100%) 55%);
box-shadow: rgb(0 0 0 / 40%) 0 30px 90px;
- border-radius: 26px;
- padding-right: 50px;
- padding-left: 50px;
- border-style: none;
+ border-radius: 26px !important;
+ padding-right: 50px !important;
+ padding-left: 50px !important;
+ border-style: none !important;
}
.btn-gradido:hover {
@@ -88,17 +88,17 @@ a:hover,
}
.btn-gradido-disable {
- padding: 0.6em 3em;
+ padding: 0.6em 3em !important;
letter-spacing: 0.05em;
- color: #fff;
- transition: all 0.5s ease;
+ color: #fff !important;
+ transition: all 0.5s ease !important;
background: rgb(97 97 97);
background: linear-gradient(135deg, rgb(180 180 180 / 100%) 46%, rgb(180 180 180 / 100%) 99%);
box-shadow: rgb(0 0 0 / 40%) 0 30px 90px;
- border-radius: 26px;
- padding-right: 50px;
- padding-left: 50px;
- border-style: none;
+ border-radius: 26px !important;
+ padding-right: 50px !important;
+ padding-left: 50px !important;
+ border-style: none !important;
}
.btn-gradido-disable:hover {
diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss
index e1f0ce97c..5139b9983 100644
--- a/frontend/src/assets/scss/gradido.scss
+++ b/frontend/src/assets/scss/gradido.scss
@@ -54,5 +54,6 @@
// Bootstrap-vue (2.21.1) scss
//@import "bootstrap-vue/src/index";
+@import "custom/variables";
@import "gradido-template";
@import "gradido-template-dark";
diff --git a/frontend/src/components/ContentFooter.vue b/frontend/src/components/ContentFooter.vue
index 720c14e0a..a0d2891fe 100755
--- a/frontend/src/components/ContentFooter.vue
+++ b/frontend/src/components/ContentFooter.vue
@@ -1,7 +1,7 @@
-->
-->
+
+
diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index b7d4160e6..d98428013 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -7,51 +7,51 @@
:class="shadow ? 'appBoxShadow' : ''"
>
-
-
-
+
+
+
{{ $t('navigation.overview') }}
-
-
+
+
{{ $t('navigation.send') }}
-
-
-
+
+
+
{{ $t('navigation.transactions') }}
-
-
-
+
+
+
{{ $t('creation') }}
-
-
-
+
+
+
{{ $t('navigation.info') }}
-
-
-
+
+
+
{{ $t('navigation.circles') }}
-
-
-
+
+
+
{{ $t('navigation.usersearch') }}
-
-
+
+
-
-
+
-
+
{{ $t('navigation.settings') }}
-
+
{{ $t('settings.newSettings') }}
-
-
-
+
+
{{ $t('navigation.admin_area') }}
-
-
+
-
+
{{ $t('navigation.logout') }}
-
-
+
+
diff --git a/frontend/src/components/Overview/CommunityNews.vue b/frontend/src/components/Overview/CommunityNews.vue
index 826d2b6eb..6eb8dee13 100644
--- a/frontend/src/components/Overview/CommunityNews.vue
+++ b/frontend/src/components/Overview/CommunityNews.vue
@@ -1,17 +1,17 @@
-
+
+
{{ itemText }}
diff --git a/frontend/src/composables/useToast.js b/frontend/src/composables/useToast.js
new file mode 100644
index 000000000..bc9bdbe49
--- /dev/null
+++ b/frontend/src/composables/useToast.js
@@ -0,0 +1,49 @@
+import { useI18n } from 'vue-i18n'
+import { useToast } from 'bootstrap-vue-next'
+
+export function useAppToast() {
+ const { t } = useI18n()
+ const { show } = useToast()
+ const toastSuccess = (message) => {
+ toast(message, {
+ title: t('success'),
+ variant: 'success',
+ })
+ }
+
+ const toastError = (message) => {
+ toast(message, {
+ title: t('error'),
+ variant: 'danger',
+ })
+ }
+
+ const toastInfo = (message) => {
+ toast(message, {
+ title: t('navigation.info'),
+ variant: 'warning',
+ })
+ }
+
+ const toast = (message, options = {}) => {
+ if (message.replace) message = message.replace(/^GraphQL error: /, '')
+ options = {
+ solid: true,
+ toaster: 'b-toaster-top-right',
+ headerClass: 'gdd-toaster-title',
+ bodyClass: 'gdd-toaster-body',
+ toastClass: 'gdd-toaster',
+ ...options,
+ body: message,
+ }
+
+ show({ props: { ...options } })
+ }
+
+ return {
+ toastSuccess,
+ toastError,
+ toastInfo,
+ toast,
+ }
+}
diff --git a/frontend/src/filters/amount.js b/frontend/src/filters/amount.js
index 97340117d..22adbefa1 100644
--- a/frontend/src/filters/amount.js
+++ b/frontend/src/filters/amount.js
@@ -7,7 +7,7 @@ export const loadFilters = (_i18n) => {
const amount = (value) => {
if (!value && value !== 0) return ''
- return i18n.n(value.toString(), 'decimal').replace('-', '− ')
+ return i18n.global.n(value.toString(), 'decimal').replace('-', '− ')
}
const GDD = (value) => {
diff --git a/frontend/src/layouts/AuthLayout.vue b/frontend/src/layouts/AuthLayout.vue
index c77aa13d4..33b4bb5f3 100644
--- a/frontend/src/layouts/AuthLayout.vue
+++ b/frontend/src/layouts/AuthLayout.vue
@@ -40,13 +40,13 @@
-
+
- {{ $t('125') }}
-
+