diff --git a/frontend/src/assets/scss/custom/gradido-custom/_color.scss b/frontend/src/assets/scss/custom/gradido-custom/_color.scss index 009d387ae..87cc0f45a 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_color.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_color.scss @@ -13,6 +13,9 @@ $gray-700: #525f7f !default; // Line p color $gray-800: #32325d !default; // Line heading color $gray-900: #212529 !default; $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; $black: #000 !default; $grays: () !default; $grays: map.merge( @@ -26,7 +29,10 @@ $grays: map.merge( "700": $gray-700, "800": $gray-800, "900": $gray-900, - "f5": $gradido-f5 + "f5": $gradido-f5, + "248": $gradido-248, + "140": $gradido-140, + "205": $gradido-205 ), $grays ); @@ -61,6 +67,9 @@ $colors: map.merge( "lighter": $gray-200, "gray-dark": $gray-800, "f5": $gradido-f5, + "248": $gradido-248, + "140": $gradido-140, + "205": $gradido-205 ), $colors ); @@ -98,7 +107,10 @@ $theme-colors: map.merge( "neutral": $white, "dark": $dark, "darker": $darker, - "f5": $gradido-f5 + "f5": $gradido-f5, + "248": $gradido-248, + "140": $gradido-140, + "205": $gradido-205 ), $theme-colors ); diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue index 304acaf99..be413c8d2 100644 --- a/frontend/src/components/GddSend/TransactionForm.vue +++ b/frontend/src/components/GddSend/TransactionForm.vue @@ -7,7 +7,7 @@ - + {{ $t('send_gdd') }} @@ -23,7 +23,7 @@ - + {{ $t('send_per_link') }} diff --git a/frontend/src/components/Inputs/InputAmount.vue b/frontend/src/components/Inputs/InputAmount.vue index 7884b7161..b08a4c546 100644 --- a/frontend/src/components/Inputs/InputAmount.vue +++ b/frontend/src/components/Inputs/InputAmount.vue @@ -12,6 +12,7 @@ v-model="currentValue" v-bind="ariaInput" :id="labelFor" + :class="$route.path === '/send' ? 'bg-248' : ''" :name="name" :placeholder="placeholder" type="text" diff --git a/frontend/src/components/Inputs/InputEmail.vue b/frontend/src/components/Inputs/InputEmail.vue index fcd6231a0..bdab22698 100644 --- a/frontend/src/components/Inputs/InputEmail.vue +++ b/frontend/src/components/Inputs/InputEmail.vue @@ -15,6 +15,7 @@ type="email" :state="validated ? valid : false" trim + :class="$route.path === '/send' ? 'bg-248' : ''" > {{ errors[0] }} diff --git a/frontend/src/components/Inputs/InputTextarea.vue b/frontend/src/components/Inputs/InputTextarea.vue index 15bff8d40..87ef1ae9d 100644 --- a/frontend/src/components/Inputs/InputTextarea.vue +++ b/frontend/src/components/Inputs/InputTextarea.vue @@ -10,6 +10,7 @@ v-model="currentValue" v-bind="ariaInput" :id="labelFor" + :class="$route.path === '/send' ? 'bg-248' : ''" :name="name" :placeholder="placeholder" :state="validated ? valid : false" diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue index 1bf52013a..5f9fbd4bb 100644 --- a/frontend/src/components/Menu/Sidebar.vue +++ b/frontend/src/components/Menu/Sidebar.vue @@ -73,7 +73,7 @@ - {{ $t('navigation.logout') }} + {{ $t('navigation.logout') }} diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue index ce287b966..f2a30b360 100644 --- a/frontend/src/components/Transactions/TransactionReceive.vue +++ b/frontend/src/components/Transactions/TransactionReceive.vue @@ -22,7 +22,7 @@
{{ $t('decay.types.receive') }}
-
{{ amount | GDD }}
+
{{ amount | GDD }}
{{ $t('via_link') }} {{ $t('decay.types.send') }}
-
{{ amount | GDD }}
+
{{ amount | GDD }}
{{ $t('via_link') }}