Skip to content

Commit 2cf0211

Browse files
committed
try nailing glitchy chaotic scroll @ iOS mobile build #106.580
1 parent 69c9e2d commit 2cf0211

13 files changed

Lines changed: 129 additions & 102 deletions

File tree

client/dist/desktop/assets/app.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/dist/desktop/assets/app.js

Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/dist/mobile/assets/app.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/dist/mobile/assets/app.js

Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/src/Mobile.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<div
33
id="wa-app"
44
class="c-mobile-build"
5+
:class="{ 'c-multi-select-mode': $store.state.multiSelectMode }"
56
>
67
<div v-if="!$IsOnline.online">
78
<span

client/src/components/Charts/AmChartPieStickyContainer.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ export default {
4444
top: 4rem;
4545
align-self: flex-start;
4646
47+
.wa-no-header & {
48+
top: 0;
49+
}
50+
4751
&__inner {
4852
margin: 0 auto;
4953
}

client/src/components/TransactionControls.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
{{ $t("unselectAll") }}
3232
</button>
3333
</div>
34-
<div v-else-if="appStateService.isDesktop">
34+
<div v-else>
3535
<button
3636
class="button light-gray smallest nowrap"
3737
@click="toggleMultiSelect"
3838
>
39-
<i class="fas fa-list-ul" />
40-
<span class="custom-ml-8 black">Сразу много</span>
39+
<i class="fas fa-tasks" />
40+
<span class="custom-ml-8 black">{{ $t("selectMany") }}</span>
4141
</button>
4242
</div>
4343
</div>

client/src/components/TransactionControlsSticky.vue

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ onBeforeUnmount(() => {
4949
display: none;
5050
margin-bottom: -60px;
5151
}
52+
53+
.wa-no-header .c-transaction-controls-sticky {
54+
top: 0;
55+
}
56+
5257
.c-transaction-controls-sticky .box.rounded {
5358
border-radius: 0;
5459
}
@@ -58,7 +63,12 @@ onBeforeUnmount(() => {
5863
}
5964
6065
.c-mobile-build .c-transaction-controls-sticky {
66+
display: none;
6167
top: 0;
6268
}
6369
70+
.c-mobile-build.c-multi-select-mode .c-transaction-controls-sticky {
71+
display: block !important;
72+
}
73+
6474
</style>

client/src/components/TransactionList/TransactionListGroup.vue

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,16 @@ export default {
397397
top: 4rem;
398398
}
399399
400+
.wa-no-header .c-sticky-header-group,
401+
.c-mobile-build.c-multi-select-mode .c-sticky-header-group {
402+
top: 60px;
403+
}
404+
405+
.wa-no-header .no-sticky-controls .c-sticky-header-group,
406+
.c-mobile-build .c-sticky-header-group {
407+
top: 0;
408+
}
409+
400410
.c-sticky-header-group:hover {
401411
z-index: 999;
402412
}

client/src/locales/en_US.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@
121121
"bulkMoveWarning": "Please be sure to select the right account and the right category type applicable to all selected transactions to avoid wrong currency conversion effects.",
122122
"dontChange": "Don’t change",
123123
"noCategory": "No category",
124+
"selectMany": "Select many",
124125
"unselectAll": "Unselect all",
125126
"other": "Other",
126127
"transfer": "Transfer",

0 commit comments

Comments
 (0)