Merge branch 'master' into 1306-Admin-Logo-font-color

This commit is contained in:
Alexander Friedland 2022-01-19 12:34:50 +01:00 committed by GitHub
commit 9bbaf4751e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,22 +1,11 @@
<template> <template>
<div> <div>
<div class="container-fluid"> <div class="container-fluid">
<b-row> <b-row class="ml-1 mr-1 mb-2">
<b-col class="col-6"> <b-col class="col-6 p-3 g-border">
<b-row> <status class="gdd-status-gdd" :pending="pending" :balance="balance" status-text="GDD" />
<b-col class="col-11 ml-2 p-3 bg-lightgrey">
<status
class="gdd-status-gdd"
:pending="pending"
:balance="balance"
status-text="GDD"
/>
</b-col> </b-col>
</b-row> <b-col class="col-6 p-3 text-right g-border">
</b-col>
<b-col class="col-6 text-right bg-lightgrey">
<b-row>
<b-col class="p-3">
<status <status
class="gdd-status-gdt" class="gdd-status-gdt"
:pending="pending" :pending="pending"
@ -25,9 +14,6 @@
/> />
</b-col> </b-col>
</b-row> </b-row>
</b-col>
</b-row>
<br />
<gdd-transaction-list <gdd-transaction-list
:transactions="transactions" :transactions="transactions"
:pageSize="5" :pageSize="5"
@ -75,3 +61,10 @@ export default {
}, },
} }
</script> </script>
<style>
.g-border {
border: #ffffff 2px;
border-style: inset;
border-radius: 5px;
}
</style>