remove last month label, matching stands and button size

This commit is contained in:
ogerly 2023-01-16 14:24:02 +01:00
parent 8514e9af9d
commit 41f7dfe56f
6 changed files with 65 additions and 52 deletions

View File

@ -35,12 +35,15 @@
<b-col offset="2">{{ $t('form.new_balance') }}</b-col>
<b-col>{{ (balance - amount) | GDD }}</b-col>
</b-row>
<b-row class="mt-5 p-5">
<b-col>
<b-button @click="$emit('on-back')">{{ $t('back') }}</b-button>
<b-row class="mt-5">
<b-col cols="12" md="6" lg="6">
<b-button block @click="$emit('on-back')" class="mb-3 mb-md-0 mb-lg-0">
{{ $t('back') }}
</b-button>
</b-col>
<b-col class="text-right">
<b-col cols="12" md="6" lg="6" class="text-lg-right">
<b-button
block
class="send-button"
variant="gradido"
:disabled="disabled"

View File

@ -17,7 +17,7 @@
</b-col>
</b-row>
<b-row class="mt-5 pr-3 text-color-gdd-yellow h3">
<b-row class="mt-5 text-color-gdd-yellow h3">
<b-col cols="2" class="text-right">
<b-icon class="text-color-gdd-yellow" icon="droplet-half"></b-icon>
</b-col>
@ -39,12 +39,15 @@
<b-col offset="2">{{ $t('form.new_balance') }}</b-col>
<b-col>{{ (balance - amount) | GDD }}</b-col>
</b-row>
<b-row class="mt-5 p-5">
<b-col>
<b-button @click="$emit('on-back')">{{ $t('back') }}</b-button>
<b-row class="mt-5">
<b-col cols="12" md="6" lg="6">
<b-button block @click="$emit('on-back')" class="mb-3 mb-md-0 mb-lg-0">
{{ $t('back') }}
</b-button>
</b-col>
<b-col class="text-right">
<b-col cols="12" md="6" lg="6" class="text-lg-right">
<b-button
block
variant="gradido"
:disabled="disabled"
@click="$emit('send-transaction'), (disabled = true)"

View File

@ -92,14 +92,20 @@
<div v-if="!!isBalanceDisabled" class="text-danger mt-5">
{{ $t('form.no_gdd_available') }}
</div>
<b-row v-else class="test-buttons mt-5">
<b-col>
<b-button type="reset" variant="secondary" @click="onReset">
<b-row v-else class="test-buttons mt-3">
<b-col cols="12" md="6" lg="6">
<b-button
block
type="reset"
variant="secondary"
@click="onReset"
class="mb-3 mb-md-0 mb-lg-0"
>
{{ $t('form.reset') }}
</b-button>
</b-col>
<b-col class="text-right">
<b-button type="submit" variant="gradido">
<b-col cols="12" md="6" lg="6" class="text-lg-right">
<b-button block type="submit" variant="gradido">
{{ $t('form.check_now') }}
</b-button>
</b-col>

View File

@ -26,45 +26,46 @@
</template>
</transaction-list-item>
</div>
<div v-if="transactionCount > 0" class="h4 m-3">{{ $t('lastMonth') }}</div>
<div v-for="({ id, typeId }, index) in transactions" :key="`l2-` + id">
<transaction-list-item
v-if="typeId !== 'DECAY'"
:typeId="typeId"
class="pointer mb-4 bg-white appBoxShadow gradido-border-radius p-3 test-list-group-item"
>
<template #SEND>
<transaction-send
v-bind="transactions[index]"
:previousBookedBalance="previousBookedBalance(index)"
v-on="$listeners"
/>
</template>
<div class="mt-3">
<div v-for="({ id, typeId }, index) in transactions" :key="`l2-` + id">
<transaction-list-item
v-if="typeId !== 'DECAY'"
:typeId="typeId"
class="pointer mb-3 bg-white appBoxShadow gradido-border-radius p-3 test-list-group-item"
>
<template #SEND>
<transaction-send
v-bind="transactions[index]"
:previousBookedBalance="previousBookedBalance(index)"
v-on="$listeners"
/>
</template>
<template #RECEIVE>
<transaction-receive
v-bind="transactions[index]"
:previousBookedBalance="previousBookedBalance(index)"
v-on="$listeners"
/>
</template>
<template #RECEIVE>
<transaction-receive
v-bind="transactions[index]"
:previousBookedBalance="previousBookedBalance(index)"
v-on="$listeners"
/>
</template>
<template #CREATION>
<transaction-creation
v-bind="transactions[index]"
:previousBookedBalance="previousBookedBalance(index)"
v-on="$listeners"
/>
</template>
<template #CREATION>
<transaction-creation
v-bind="transactions[index]"
:previousBookedBalance="previousBookedBalance(index)"
v-on="$listeners"
/>
</template>
<template #LINK_SUMMARY>
<transaction-link-summary
v-bind="transactions[index]"
:transactionLinkCount="transactionLinkCount"
@update-transactions="updateTransactions"
/>
</template>
</transaction-list-item>
<template #LINK_SUMMARY>
<transaction-link-summary
v-bind="transactions[index]"
:transactionLinkCount="transactionLinkCount"
@update-transactions="updateTransactions"
/>
</template>
</transaction-list-item>
</div>
</div>
</div>
<b-pagination

View File

@ -50,7 +50,7 @@
</b-col>
<b-col cols="12">
<!-- router-view -->
<div class="main-content mt-3">
<div class="main-content mt-lg-3 mt-0">
<fade-transition :duration="200" origin="center top" mode="out-in">
<router-view
ref="router-view"

View File

@ -1,6 +1,6 @@
<template>
<div>
<gdd-send :currentTransactionStep="currentTransactionStep" class="pt-3 mt--3">
<gdd-send :currentTransactionStep="currentTransactionStep">
<template #transactionForm>
<transaction-form
v-bind="transactionData"