diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss index 5139b9983..6d09e7cea 100644 --- a/frontend/src/assets/scss/gradido.scss +++ b/frontend/src/assets/scss/gradido.scss @@ -53,7 +53,6 @@ @import "bootstrap/scss/bootstrap"; // 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/Auth/AuthFooter.vue b/frontend/src/components/Auth/AuthFooter.vue index d74593e36..fe514f93c 100644 --- a/frontend/src/components/Auth/AuthFooter.vue +++ b/frontend/src/components/Auth/AuthFooter.vue @@ -1,7 +1,7 @@ diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue index 4374f7182..b43c84418 100644 --- a/frontend/src/components/ClipboardCopy.vue +++ b/frontend/src/components/ClipboardCopy.vue @@ -10,9 +10,10 @@ > {{ link }}
- - - + + + +
@@ -26,7 +27,8 @@ {{ linkText }}
- + +
diff --git a/frontend/src/components/CommunitySwitch.vue b/frontend/src/components/CommunitySwitch.vue index e46c94aaa..4f8741fd4 100644 --- a/frontend/src/components/CommunitySwitch.vue +++ b/frontend/src/components/CommunitySwitch.vue @@ -1,13 +1,13 @@ ---> + + + + diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue index e84f9273b..ab61f6a67 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue +++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue @@ -9,16 +9,16 @@ :placeholder="$t('form.memo')" rows="3" > - - + + {{ $t('form.cancel') }} - - + + {{ $t('form.reply') }} - - + + diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue index 60f0a0819..1e31ca02b 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue +++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue @@ -1,8 +1,8 @@ diff --git a/frontend/src/components/ContributionMessages/ParseMessage.vue b/frontend/src/components/ContributionMessages/ParseMessage.vue index 20aecf842..0d2dbf448 100644 --- a/frontend/src/components/ContributionMessages/ParseMessage.vue +++ b/frontend/src/components/ContributionMessages/ParseMessage.vue @@ -8,7 +8,7 @@
- {{ text | GDD }} + {{ $filters.GDD(text) }}
{{ text }} diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue index cc7a4f669..1649c8ffb 100644 --- a/frontend/src/components/Contributions/ContributionForm.vue +++ b/frontend/src/components/Contributions/ContributionForm.vue @@ -52,10 +52,10 @@ diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue index 0afa5546e..abf42dbe0 100644 --- a/frontend/src/components/Contributions/ContributionListItem.vue +++ b/frontend/src/components/Contributions/ContributionListItem.vue @@ -4,8 +4,8 @@ class="contribution-list-item bg-white appBoxShadow gradido-border-radius pt-3 px-3" :class="status === 'IN_PROGRESS' && !allContribution ? 'pulse border border-205' : ''" > - - + + - - - + + +
{{ firstName }} {{ lastName }} @@ -35,31 +35,32 @@ > {{ $t('contribution.alert.answerQuestion') }}
-
- + +
{{ $t('creation') }} {{ $t('(') }}{{ amount / 20 }} {{ $t('h') }}{{ $t(')') }}
- + + {{ $t('contribution.alert.denied') }}
{{ $t('contribution.deleted') }}
-
{{ amount | GDD }}
-
- +
{{ $filters.GDD(amount) }}
+ +
-
-
- + + - +
{{ $t('delete') }}
-
- + +
- + +
{{ $t('edit') }}
-
- + +
- + +
{{ $t('moderatorChat') }}
-
-
+ +
- + - + diff --git a/frontend/src/components/Contributions/OpenCreationsAmount.vue b/frontend/src/components/Contributions/OpenCreationsAmount.vue index 5f49f5474..e1cdbd3ec 100644 --- a/frontend/src/components/Contributions/OpenCreationsAmount.vue +++ b/frontend/src/components/Contributions/OpenCreationsAmount.vue @@ -1,34 +1,34 @@ diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.vue b/frontend/src/components/DecayInformations/CollapseLinksList.vue index c580fa04a..2bc65bbd4 100644 --- a/frontend/src/components/DecayInformations/CollapseLinksList.vue +++ b/frontend/src/components/DecayInformations/CollapseLinksList.vue @@ -11,7 +11,7 @@ @reset-transaction-link-list="resetTransactionLinkList" />
- {{ buttonText }} - +
- + +
@@ -57,9 +58,9 @@ export default { computed: { buttonText() { const i = this.transactionLinkCount - this.transactionLinks.length - if (i === 1) return this.$tc('link-load', 0) - if (i <= this.pageSize) return this.$tc('link-load', 1, { n: i }) - return this.$tc('link-load', 2, { n: this.pageSize }) + if (i === 1) return this.$t('link-load', 0) + if (i <= this.pageSize) return this.$t('link-load', 1, { n: i }) + return this.$t('link-load', 2, { n: this.pageSize }) }, }, } diff --git a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue index ce679fb30..1efff6629 100644 --- a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue +++ b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue @@ -1,26 +1,27 @@ --> + + +