From dbc1e22741fb5342c102dc7dcb949437f2456d43 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 23 Sep 2021 09:05:09 +0200
Subject: [PATCH 1/4] The style of the GDT list has been adapted to the style
 of the GDD list.

---
 frontend/src/components/Transaction.vue       | 20 +++++++++----------
 .../src/components/TransactionCollapse.vue    |  9 ++++++---
 .../AccountOverview/GdtTransactionList.vue    |  2 +-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/Transaction.vue b/frontend/src/components/Transaction.vue
index 03b559463..dd91d2a1e 100644
--- a/frontend/src/components/Transaction.vue
+++ b/frontend/src/components/Transaction.vue
@@ -56,17 +56,17 @@
             {{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
           </div>
         </b-row>
-      </div>
 
-      <!-- collaps trancaction info-->
-      <b-collapse :id="'a' + date + ''" class="pb-4">
-        <transaction-collapse
-          :amount="amount"
-          :gdtEntryType="gdtEntryType"
-          :factor="factor"
-          :gdt="gdt"
-        ></transaction-collapse>
-      </b-collapse>
+        <!-- collaps trancaction info-->
+        <b-collapse :id="'a' + date + ''" class="mt-2 pb-4">
+          <transaction-collapse
+            :amount="amount"
+            :gdtEntryType="gdtEntryType"
+            :factor="factor"
+            :gdt="gdt"
+          ></transaction-collapse>
+        </b-collapse>
+      </div>
     </div>
   </div>
 </template>
diff --git a/frontend/src/components/TransactionCollapse.vue b/frontend/src/components/TransactionCollapse.vue
index 854282a43..444012820 100644
--- a/frontend/src/components/TransactionCollapse.vue
+++ b/frontend/src/components/TransactionCollapse.vue
@@ -1,8 +1,11 @@
 <template>
-  <div class="gdt-transaction-collapse">
+  <div
+    class="gdt-transaction-collapse p-2 pt-4 pb-4 mb-4"
+    style="border: 0px; background-color: #f1f1f1"
+  >
     <b-row class="gdt-list-collapse-header-text text-center pb-3">
-      <div id="collapse-headline" class="col h4">
-        {{ getLinesByType(gdtEntryType).headline }}
+      <div id="collapse-headline" class="col">
+        <b>{{ getLinesByType(gdtEntryType).headline }}</b>
       </div>
     </b-row>
     <b-row class="gdt-list-collapse-box--all">
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
index dde5e31e8..e69e5edec 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="gdt-transaction-list">
-    <div class="list-group">
+    <div class="list-group" style="background-color: #fff">
       <div v-if="transactionGdtCount === 0">
         {{ $t('gdt.no-transactions') }}
       </div>

From 2ac14c460a993354a387166c7e8e473f56b3158f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 23 Sep 2021 13:55:15 +0200
Subject: [PATCH 2/4] fix row and col, remove fixed width

---
 frontend/src/components/DecayInformation.vue | 30 ++++++++++----------
 frontend/src/locales/de.json                 |  2 +-
 frontend/src/locales/en.json                 |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue
index c9ffa9115..f219973bd 100644
--- a/frontend/src/components/DecayInformation.vue
+++ b/frontend/src/components/DecayInformation.vue
@@ -19,11 +19,11 @@
             </div>
           </div>
 
-          <div class="d-flex">
-            <div style="width: 47%" class="text-right pr-3 mr-2">
+          <div class="row">
+            <div class="col-6 text-right pr-3 mr-2">
               <div v-if="!decay.decayStartBlock">{{ $t('decay.last_transaction') }}</div>
             </div>
-            <div style="width: 53%">
+            <div class="col-5">
               <div v-if="decay.decayStartBlock > 0">
                 <div class="display-4">{{ $t('decay.Starting_block_decay') }}</div>
                 <div>
@@ -40,11 +40,11 @@
             </div>
           </div>
 
-          <div class="d-flex">
-            <div style="width: 47%" class="text-right pr-3 mr-2">
+          <div class="row">
+            <div class="col-6 text-right pr-3 mr-2">
               <div v-if="!decay.decayStartBlock">{{ $t('decay.past_time') }}</div>
             </div>
-            <div style="width: 53%">
+            <div class="col-5">
               <div v-if="decay.decayStartBlock > 0">{{ $t('decay.since_introduction') }}</div>
               <span v-if="duration">
                 <span v-if="duration.years > 0">{{ duration.years }} {{ $t('decay.year') }},</span>
@@ -63,30 +63,30 @@
             </div>
           </div>
           <div v-if="decay.balance > 0">
-            <div class="d-flex">
-              <div style="width: 47%" class="text-right pr-3 mr-2">
+            <div class="row">
+              <div class="col-6 text-right pr-3 mr-2">
                 <div v-if="type === 'send'">{{ $t('decay.sent') }}</div>
                 <div v-if="type === 'receive'">{{ $t('decay.received') }}</div>
               </div>
-              <div style="width: 53%">
+              <div class="col-5">
                 <div v-if="type === 'send'">- {{ balance }}</div>
                 <div v-if="type === 'receive'">+ {{ balance }}</div>
               </div>
             </div>
-            <div class="d-flex">
-              <div style="width: 47%" class="text-right pr-3 mr-2">
+            <div class="row">
+              <div class="col-6 text-right pr-3 mr-2">
                 <div>{{ $t('decay.decay') }}</div>
               </div>
-              <div style="width: 53%">
+              <div class="col-5">
                 <div>- {{ decay.balance }}</div>
               </div>
             </div>
             <hr class="mt-2 mb-2" />
-            <div class="d-flex">
-              <div style="width: 47%" class="text-right pr-3 mr-2">
+            <div class="row">
+              <div class="col-6 text-right pr-3 mr-2">
                 <div>{{ $t('decay.total') }}</div>
               </div>
-              <div style="width: 53%">
+              <div class="col-5">
                 <div v-if="type === 'send'">
                   <b>- {{ parseInt(balance) + decay.balance }}</b>
                 </div>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 237eaff8f..af7e19fc5 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -31,7 +31,7 @@
     "since_introduction": "seit Einführung der Vergänglichkeit",
     "Starting_block_decay": "Startblock Vergänglichkeit",
     "toCommunity": "An die Gemeinschaft",
-    "total":"Gesamt",
+    "total": "Gesamt",
     "year": "Jahre"
   },
   "error": {
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 882bca8c8..8bd6aea99 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -31,7 +31,7 @@
     "since_introduction": "Since the introduction of Decay",
     "Starting_block_decay": "Starting Block Decay",
     "toCommunity": "To the community",
-    "total":"Total",
+    "total": "Total",
     "year": "Years"
   },
   "error": {

From 23996c8ec5efd0e4007f2ff709b584834eee16cb Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 24 Sep 2021 10:43:35 +0200
Subject: [PATCH 3/4] change b-row

---
 frontend/src/components/Transaction.vue | 32 ++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/frontend/src/components/Transaction.vue b/frontend/src/components/Transaction.vue
index dd91d2a1e..4358a3596 100644
--- a/frontend/src/components/Transaction.vue
+++ b/frontend/src/components/Transaction.vue
@@ -19,42 +19,42 @@
 
         <!-- type  -->
         <b-row>
-          <div class="col-6 text-right">
+          <b-col col="6" class="text-right">
             {{ getLinesByType(gdtEntryType).description }}
-          </div>
-          <div class="col-6">
+          </b-col>
+          <b-col col="6">
             {{ getLinesByType(gdtEntryType).descriptiontext }}
-          </div>
+          </b-col>
         </b-row>
 
         <!-- credit -->
         <b-row>
-          <div class="col-6 text-right">
+          <b-col col="6" class="text-right">
             {{ $t('gdt.credit') }}
-          </div>
-          <div class="col-6">
+          </b-col>
+          <b-col col="6">
             {{ getLinesByType(gdtEntryType).credittext }}
-          </div>
+          </b-col>
         </b-row>
 
         <!-- Message-->
         <b-row v-if="comment && gdtEntryType !== 7">
-          <div class="col-6 text-right">
+          <b-col col="6" class="text-right">
             {{ $t('form.memo') }}
-          </div>
-          <div class="col-6">
+          </b-col>
+          <b-col col="6">
             {{ comment }}
-          </div>
+          </b-col>
         </b-row>
 
         <!-- date-->
         <b-row class="gdt-list-row text-header">
-          <div class="col-6 text-right">
+          <b-col col="6" class="text-right">
             {{ $t('form.date') }}
-          </div>
-          <div class="col-6">
+          </b-col>
+          <b-col col="6">
             {{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
-          </div>
+          </b-col>
         </b-row>
 
         <!-- collaps trancaction info-->

From d5c1d3bca045bf7ba72998c652810f79cb25f568 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 24 Sep 2021 11:33:49 +0200
Subject: [PATCH 4/4] class clo to element b-col

---
 frontend/src/components/DecayInformation.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue
index f219973bd..e6cbd54bd 100644
--- a/frontend/src/components/DecayInformation.vue
+++ b/frontend/src/components/DecayInformation.vue
@@ -20,10 +20,10 @@
           </div>
 
           <div class="row">
-            <div class="col-6 text-right pr-3 mr-2">
+            <div class="col-6 text-right">
               <div v-if="!decay.decayStartBlock">{{ $t('decay.last_transaction') }}</div>
             </div>
-            <div class="col-5">
+            <div class="col-6">
               <div v-if="decay.decayStartBlock > 0">
                 <div class="display-4">{{ $t('decay.Starting_block_decay') }}</div>
                 <div>
@@ -41,10 +41,10 @@
           </div>
 
           <div class="row">
-            <div class="col-6 text-right pr-3 mr-2">
+            <div class="col-6 text-right">
               <div v-if="!decay.decayStartBlock">{{ $t('decay.past_time') }}</div>
             </div>
-            <div class="col-5">
+            <div class="col-6">
               <div v-if="decay.decayStartBlock > 0">{{ $t('decay.since_introduction') }}</div>
               <span v-if="duration">
                 <span v-if="duration.years > 0">{{ duration.years }} {{ $t('decay.year') }},</span>
@@ -64,29 +64,29 @@
           </div>
           <div v-if="decay.balance > 0">
             <div class="row">
-              <div class="col-6 text-right pr-3 mr-2">
+              <div class="col-6 text-right">
                 <div v-if="type === 'send'">{{ $t('decay.sent') }}</div>
                 <div v-if="type === 'receive'">{{ $t('decay.received') }}</div>
               </div>
-              <div class="col-5">
+              <div class="col-6">
                 <div v-if="type === 'send'">- {{ balance }}</div>
                 <div v-if="type === 'receive'">+ {{ balance }}</div>
               </div>
             </div>
             <div class="row">
-              <div class="col-6 text-right pr-3 mr-2">
+              <div class="col-6 text-right">
                 <div>{{ $t('decay.decay') }}</div>
               </div>
-              <div class="col-5">
+              <div class="col-6">
                 <div>- {{ decay.balance }}</div>
               </div>
             </div>
             <hr class="mt-2 mb-2" />
             <div class="row">
-              <div class="col-6 text-right pr-3 mr-2">
+              <div class="col-6 text-right">
                 <div>{{ $t('decay.total') }}</div>
               </div>
-              <div class="col-5">
+              <div class="col-6">
                 <div v-if="type === 'send'">
                   <b>- {{ parseInt(balance) + decay.balance }}</b>
                 </div>