diff --git a/frontend/src/assets/scss/custom/gradido-custom/_color.scss b/frontend/src/assets/scss/custom/gradido-custom/_color.scss index 87cc0f45a..733bcb4a0 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_color.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_color.scss @@ -16,6 +16,8 @@ $gradido-f5: #f5f5f5 !default; $gradido-248: rgb(248 248 248) !default; $gradido-140: rgb(140 66 5) !default; $gradido-205: rgb(205 86 86) !default; +$gradido-197: rgb(197 141 56) !default; +$gradido-4: rgb(4 112 6) !default; $black: #000 !default; $grays: () !default; $grays: map.merge( @@ -32,7 +34,9 @@ $grays: map.merge( "f5": $gradido-f5, "248": $gradido-248, "140": $gradido-140, - "205": $gradido-205 + "205": $gradido-205, + "197": $gradido-197, + "4": $gradido-4 ), $grays ); @@ -69,7 +73,9 @@ $colors: map.merge( "f5": $gradido-f5, "248": $gradido-248, "140": $gradido-140, - "205": $gradido-205 + "205": $gradido-205, + "197": $gradido-197, + "4": $gradido-4 ), $colors ); @@ -110,7 +116,9 @@ $theme-colors: map.merge( "f5": $gradido-f5, "248": $gradido-248, "140": $gradido-140, - "205": $gradido-205 + "205": $gradido-205, + "197": $gradido-197, + "4": $gradido-4 ), $theme-colors ); diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue index dfff60840..a3116d7c4 100644 --- a/frontend/src/components/Contributions/ContributionListItem.vue +++ b/frontend/src/components/Contributions/ContributionListItem.vue @@ -31,7 +31,7 @@
createdAt {{ createdAt }}
--> -
{{ $t('creation') }}
+
{{ $t('creation') }} ({{ amount / 20 }} h)
{{ amount | GDD }}
@@ -69,7 +69,7 @@ " > - {{ $t('edit') }} +
{{ $t('edit') }}
diff --git a/frontend/src/components/Contributions/OpenCreationsAmount.vue b/frontend/src/components/Contributions/OpenCreationsAmount.vue index 1b0ad6462..7224b0131 100644 --- a/frontend/src/components/Contributions/OpenCreationsAmount.vue +++ b/frontend/src/components/Contributions/OpenCreationsAmount.vue @@ -1,29 +1,33 @@