Page MenuHomePhorge
Files F117738963

D1474.1775157060.diff
No OneTemporary
Actions

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

D1474.1775157060.diff
View Options

diff --git a/src/resources/sass/app.scss b/src/resources/sass/app.scss
--- a/src/resources/sass/app.scss
+++ b/src/resources/sass/app.scss
@@ -111,6 +111,7 @@
td {
vertical-align: middle;
height: 8em;
+ border: 0;
}
tbody:not(:empty) + & {
@@ -284,6 +285,16 @@
margin-bottom: 0.5rem;
}
+ .nav-tabs {
+ flex-wrap: nowrap;
+ overflow-x: auto;
+
+ .nav-link {
+ white-space: nowrap;
+ padding: 0.5rem 0.75rem;
+ }
+ }
+
.tab-content {
margin-top: 0.5rem;
}
@@ -308,6 +319,7 @@
#app > div.container {
margin-bottom: 1rem;
margin-top: 1rem;
+ max-width: 100%;
}
#header-menu-navbar {
@@ -332,4 +344,55 @@
}
}
}
+
+ .table.transactions {
+ thead {
+ display: none;
+ }
+
+ tbody {
+ tr {
+ position: relative;
+ display: flex;
+ flex-wrap: wrap;
+ }
+
+ td {
+ width: auto;
+ border: 0;
+ padding: 0.5rem;
+
+ &.datetime {
+ width: 50%;
+ padding-left: 0;
+ }
+
+ &.description {
+ order: 3;
+ width: 100%;
+ border-bottom: 1px solid $border-color;
+ color: $secondary;
+ padding: 0 1.5em 0.5rem 0;
+ margin-top: -0.25em;
+ }
+
+ &.selection {
+ position: absolute;
+ right: 0;
+ border: 0;
+ top: 1.7em;
+ padding-right: 0;
+ }
+
+ &.price {
+ width: 50%;
+ padding-right: 0;
+ }
+
+ &.email {
+ display: none;
+ }
+ }
+ }
+ }
}
diff --git a/src/resources/sass/menu.scss b/src/resources/sass/menu.scss
--- a/src/resources/sass/menu.scss
+++ b/src/resources/sass/menu.scss
@@ -76,16 +76,16 @@
}
}
- #footer-menu {
+ .navbar {
.navbar {
- flex-direction: column;
- align-items: flex-end;
+ justify-content: flex-end;
}
}
- .navbar {
+ #footer-menu {
.navbar {
- justify-content: flex-end;
+ flex-direction: column;
+ align-items: flex-end;
}
}
}
diff --git a/src/resources/vue/Widgets/TransactionLog.vue b/src/resources/vue/Widgets/TransactionLog.vue
--- a/src/resources/vue/Widgets/TransactionLog.vue
+++ b/src/resources/vue/Widgets/TransactionLog.vue
@@ -15,7 +15,7 @@
<td class="datetime">{{ transaction.createdAt }}</td>
<td class="email" v-if="isAdmin">{{ transaction.user }}</td>
<td class="selection">
- <button class="btn btn-lg btn-link btn-action" title="Details"
+ <button class="btn btn-lg btn-link btn-action" title="Details" type="button"
v-if="transaction.hasDetails"
@click="loadTransaction(transaction.id)"
>
diff --git a/src/tests/Browser/Admin/UserFinancesTest.php b/src/tests/Browser/Admin/UserFinancesTest.php
--- a/src/tests/Browser/Admin/UserFinancesTest.php
+++ b/src/tests/Browser/Admin/UserFinancesTest.php
@@ -110,8 +110,11 @@
->assertSeeIn('h2:nth-of-type(2)', 'Transactions')
->with('table', function (Browser $browser) {
$browser->assertElementsCount('tbody tr', 2)
- ->assertMissing('tfoot')
- ->assertSeeIn('tbody tr:last-child td.email', 'jeroen@jeroen.jeroen');
+ ->assertMissing('tfoot');
+
+ if (!$browser->isPhone()) {
+ $browser->assertSeeIn('tbody tr:last-child td.email', 'jeroen@jeroen.jeroen');
+ }
});
});
});
@@ -262,8 +265,11 @@
$browser->assertElementsCount('tbody tr', 3)
->assertMissing('tfoot')
->assertSeeIn('tbody tr:first-child td.description', 'Bonus: Test bonus')
- ->assertSeeIn('tbody tr:first-child td.email', 'jeroen@jeroen.jeroen')
->assertSeeIn('tbody tr:first-child td.price', '12,34 CHF');
+
+ if (!$browser->isPhone()) {
+ $browser->assertSeeIn('tbody tr:first-child td.email', 'jeroen@jeroen.jeroen');
+ }
});
$this->assertSame(1234, $john->wallets()->first()->balance);

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 2, 7:11 PM (16 h, 22 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18820424
Default Alt Text
D1474.1775157060.diff (4 KB)

Event Timeline