From 7164b53407cfdde48d42e8f35dfbb6a9d03d2312 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 24 Sep 2021 14:24:18 +0200
Subject: [PATCH] fix bug col to cols on <b-col>

---
 frontend/src/components/DecayInformation.vue  | 208 +++++++++---------
 frontend/src/components/Transaction.vue       |  16 +-
 .../AccountOverview/GddTransactionList.vue    |   6 +-
 3 files changed, 112 insertions(+), 118 deletions(-)

diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue
index 470f45dc7..04a850040 100644
--- a/frontend/src/components/DecayInformation.vue
+++ b/frontend/src/components/DecayInformation.vue
@@ -1,120 +1,114 @@
 <template>
-  <div>
+  <div class="decayinformation">
     <span v-if="decaytyp === 'short'">
-      <div v-if="decay.balance > 0">
+      <span v-if="decay.balance > 0">
         {{ decay ? ' -' + decay.balance + ' ' + decayStartBlockTextShort : '' }}
-      </div>
-      <div v-else>
+      </span>
+      <span v-else>
         {{ $t('decay.noDecay') }}
-      </div>
+      </span>
     </span>
 
     <div v-if="decaytyp === 'new'">
-      <b-list-group style="border: 0px">
-        <b-list-group-item style="border: 0px; background-color: #f1f1f1">
-          <div class="d-flex" v-if="!decay.decayStartBlock">
-            <div style="width: 100%" class="text-center pb-3">
-              <b-icon icon="droplet-half" height="12" class="mb-2" />
-              <b>{{ $t('decay.calculation_decay') }}</b>
+      <div class="d-flex" v-if="!decay.decayStartBlock">
+        <div style="width: 100%" class="text-center pb-3">
+          <b-icon icon="droplet-half" height="12" class="mb-2" />
+          <b>{{ $t('decay.calculation_decay') }}</b>
+        </div>
+      </div>
+
+      <b-row>
+        <b-col cols="6" class="text-right">
+          <div v-if="!decay.decayStartBlock">{{ $t('decay.last_transaction') }}</div>
+        </b-col>
+        <b-col cols="6">
+          <div v-if="decay.decayStartBlock > 0">
+            <div class="display-4">{{ $t('decay.Starting_block_decay') }}</div>
+            <div>
+              {{ $t('decay.decay_introduced') }} :
+              {{ $d($moment.unix(decay.decayStart), 'long') }}
             </div>
           </div>
-
-          <b-row>
-            <b-col col="6" class="text-right">
-              <div v-if="!decay.decayStartBlock">{{ $t('decay.last_transaction') }}</div>
-            </b-col>
-            <b-col col="6">
-              <div v-if="decay.decayStartBlock > 0">
-                <div class="display-4">{{ $t('decay.Starting_block_decay') }}</div>
-                <div>
-                  {{ $t('decay.decay_introduced') }} :
-                  {{ $d($moment.unix(decay.decayStart), 'long') }}
-                </div>
-              </div>
-              <div>
-                <span v-if="decay.decayStart">
-                  {{ $d($moment.unix(decay.decayStart), 'long') }}
-                  {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
-                </span>
-              </div>
-            </b-col>
-          </b-row>
-          <b-row>
-            <b-col col="6" class="text-right">
-              <div v-if="!decay.decayStartBlock">{{ $t('decay.past_time') }}</div>
-            </b-col>
-            <b-col 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>
-                <span v-if="duration.months > 0">
-                  {{ duration.months }} {{ $t('decay.months') }},
-                </span>
-                <span v-if="duration.days > 0">{{ duration.days }} {{ $t('decay.days') }},</span>
-                <span v-if="duration.hours > 0">{{ duration.hours }} {{ $t('decay.hours') }},</span>
-                <span v-if="duration.minutes > 0">
-                  {{ duration.minutes }} {{ $t('decay.minutes') }},
-                </span>
-                <span v-if="duration.seconds > 0">
-                  {{ duration.seconds }} {{ $t('decay.seconds') }}
-                </span>
-              </span>
-            </b-col>
-          </b-row>
-
-          <div v-if="decay.balance > 0">
-            <!-- Decay-->
-            <b-row>
-              <b-col col="6" class="text-right">
-                <div>{{ $t('decay.decay') }}</div>
-              </b-col>
-              <b-col col="6">
-                <div>- {{ decay.balance }}</div>
-              </b-col>
-            </b-row>
-            <hr class="mt-2 mb-2" />
-            <b-row>
-              <b-col class="text-center pt-3 pb-2">
-                <b>{{ $t('decay.calculation_total') }}</b>
-              </b-col>
-            </b-row>
-            <!-- Type-->
-            <b-row>
-              <b-col col="6" class="text-right">
-                <div v-if="type === 'send'">{{ $t('decay.sent') }}</div>
-                <div v-if="type === 'receive'">{{ $t('decay.received') }}</div>
-              </b-col>
-              <b-col col="6">
-                <div v-if="type === 'send'">- {{ balance }}</div>
-                <div v-if="type === 'receive'">+ {{ balance }}</div>
-              </b-col>
-            </b-row>
-            <!-- Decay-->
-            <b-row>
-              <b-col col="6" class="text-right">
-                <div>{{ $t('decay.decay') }}</div>
-              </b-col>
-              <b-col col="6">
-                <div>- {{ decay.balance }}</div>
-              </b-col>
-            </b-row>
-            <!-- Total-->
-            <b-row>
-              <b-col col="6" class="text-right">
-                <div>{{ $t('decay.total') }}</div>
-              </b-col>
-              <b-col col="6">
-                <div v-if="type === 'send'">
-                  <b>- {{ parseInt(balance) + decay.balance }}</b>
-                </div>
-                <div v-if="type === 'receive'">
-                  <b>{{ parseInt(balance) - decay.balance }}</b>
-                </div>
-              </b-col>
-            </b-row>
+          <div>
+            <span v-if="decay.decayStart">
+              {{ $d($moment.unix(decay.decayStart), 'long') }}
+              {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
+            </span>
           </div>
-        </b-list-group-item>
-      </b-list-group>
+        </b-col>
+      </b-row>
+      <b-row>
+        <b-col cols="6" class="text-right">
+          <div v-if="!decay.decayStartBlock">{{ $t('decay.past_time') }}</div>
+        </b-col>
+        <b-col cols="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>
+            <span v-if="duration.months > 0">{{ duration.months }} {{ $t('decay.months') }},</span>
+            <span v-if="duration.days > 0">{{ duration.days }} {{ $t('decay.days') }},</span>
+            <span v-if="duration.hours > 0">{{ duration.hours }} {{ $t('decay.hours') }},</span>
+            <span v-if="duration.minutes > 0">
+              {{ duration.minutes }} {{ $t('decay.minutes') }},
+            </span>
+            <span v-if="duration.seconds > 0">
+              {{ duration.seconds }} {{ $t('decay.seconds') }}
+            </span>
+          </span>
+        </b-col>
+      </b-row>
+
+      <div v-if="decay.balance > 0">
+        <!-- Decay-->
+        <b-row>
+          <b-col cols="6" class="text-right">
+            <div>{{ $t('decay.decay') }}</div>
+          </b-col>
+          <b-col cols="6">
+            <div>- {{ decay.balance }}</div>
+          </b-col>
+        </b-row>
+        <hr class="mt-2 mb-2" />
+        <b-row>
+          <b-col class="text-center pt-3 pb-2">
+            <b>{{ $t('decay.calculation_total') }}</b>
+          </b-col>
+        </b-row>
+        <!-- Type-->
+        <b-row>
+          <b-col cols="6" class="text-right">
+            <div v-if="type === 'send'">{{ $t('decay.sent') }}</div>
+            <div v-if="type === 'receive'">{{ $t('decay.received') }}</div>
+          </b-col>
+          <b-col cols="6">
+            <div v-if="type === 'send'">- {{ balance }}</div>
+            <div v-if="type === 'receive'">+ {{ balance }}</div>
+          </b-col>
+        </b-row>
+        <!-- Decay-->
+        <b-row>
+          <b-col cols="6" class="text-right">
+            <div>{{ $t('decay.decay') }}</div>
+          </b-col>
+          <b-col cols="6">
+            <div>- {{ decay.balance }}</div>
+          </b-col>
+        </b-row>
+        <!-- Total-->
+        <b-row>
+          <b-col cols="6" class="text-right">
+            <div>{{ $t('decay.total') }}</div>
+          </b-col>
+          <b-col cols="6">
+            <div v-if="type === 'send'">
+              <b>- {{ parseInt(balance) + decay.balance }}</b>
+            </div>
+            <div v-if="type === 'receive'">
+              <b>{{ parseInt(balance) - decay.balance }}</b>
+            </div>
+          </b-col>
+        </b-row>
+      </div>
     </div>
   </div>
 </template>
diff --git a/frontend/src/components/Transaction.vue b/frontend/src/components/Transaction.vue
index 4358a3596..4071e809d 100644
--- a/frontend/src/components/Transaction.vue
+++ b/frontend/src/components/Transaction.vue
@@ -19,40 +19,40 @@
 
         <!-- type  -->
         <b-row>
-          <b-col col="6" class="text-right">
+          <b-col cols="6" class="text-right">
             {{ getLinesByType(gdtEntryType).description }}
           </b-col>
-          <b-col col="6">
+          <b-col cols="6">
             {{ getLinesByType(gdtEntryType).descriptiontext }}
           </b-col>
         </b-row>
 
         <!-- credit -->
         <b-row>
-          <b-col col="6" class="text-right">
+          <b-col cols="6" class="text-right">
             {{ $t('gdt.credit') }}
           </b-col>
-          <b-col col="6">
+          <b-col cols="6">
             {{ getLinesByType(gdtEntryType).credittext }}
           </b-col>
         </b-row>
 
         <!-- Message-->
         <b-row v-if="comment && gdtEntryType !== 7">
-          <b-col col="6" class="text-right">
+          <b-col cols="6" class="text-right">
             {{ $t('form.memo') }}
           </b-col>
-          <b-col col="6">
+          <b-col cols="6">
             {{ comment }}
           </b-col>
         </b-row>
 
         <!-- date-->
         <b-row class="gdt-list-row text-header">
-          <b-col col="6" class="text-right">
+          <b-col cols="6" class="text-right">
             {{ $t('form.date') }}
           </b-col>
-          <b-col col="6">
+          <b-col cols="6">
             {{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
           </b-col>
         </b-row>
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index bdf4199f3..7348f96de 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -18,13 +18,13 @@
             </b-button>
           </div>
 
-          <b-row>
+          <div>
             <!-- ICON  -->
             <div class="col-1 gdd-transaction-list-item-icon">
               <b-icon :icon="getProperties(type).icon" :class="getProperties(type).class" />
             </div>
 
-            <div class="col col-11">
+            <div>
               <!-- Betrag / Name Email -->
               <b-row>
                 <div class="col-5 text-right">
@@ -70,7 +70,7 @@
                 </div>
               </b-row>
             </div>
-          </b-row>
+          </div>
 
           <!-- Collaps Start -->