Skip to content

Commit c40d358

Browse files
Merge pull request #837 from Adamant-im/fix/revert-samsung-changes
Fix: style height issuies
2 parents a4e2639 + 039cf37 commit c40d358

File tree

10 files changed

+49
-22
lines changed

10 files changed

+49
-22
lines changed

src/App.vue

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<UploadAttachmentExitPrompt />
44
<warning-on-addresses-dialog v-model="showWarningOnAddressesDialog" />
55

6-
<v-main class="application--main">
6+
<v-main>
77
<router-view />
88
</v-main>
99
</v-app>
@@ -83,18 +83,7 @@ setLocale()
8383
</script>
8484

8585
<style lang="scss" scoped>
86-
@use 'sass:map';
8786
@use '@/assets/styles/themes/adamant/_mixins.scss';
88-
@use '@/assets/styles/generic/_variables.scss';
89-
90-
.application--main {
91-
flex: none;
92-
position: relative;
93-
height: calc(100vh - env(safe-area-inset-bottom) - env(safe-area-inset-top));
94-
height: calc(100dvh - env(safe-area-inset-bottom) - env(safe-area-inset-top));
95-
margin-top: env(safe-area-inset-top);
96-
overflow-y: scroll;
97-
}
9887
9988
.v-theme--light.application--linear-gradient {
10089
@include mixins.linear-gradient-light();

src/assets/styles/components/_chat.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,19 @@ $scroll-bar-width: 4px;
2323
.a-chat {
2424
display: block;
2525
text-decoration: none;
26-
height: 100%;
26+
height: 100%; // <-- Fallback for Chrome < v108
27+
// Chrome supports `dvh, lvh...` units starting with v108.
28+
// See https://caniuse.com/viewport-unit-variants
29+
height: calc(100dvh - var(--v-layout-bottom));
2730
position: relative;
2831

2932
@media (max-width: map.get(variables.$breakpoints, 'mobile')) {
3033
position: fixed;
3134
left: 0;
3235
right: 0;
3336
bottom: env(safe-area-inset-bottom);
37+
top: env(safe-area-inset-top);
38+
height: calc(100dvh - var(--v-layout-bottom) - env(safe-area-inset-bottom) - env(safe-area-inset-top));
3439
}
3540

3641
&__content {

src/components/AppNavigation.vue

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ onMounted(() => {
9191
@use 'sass:map';
9292
@use '@/assets/styles/settings/_colors.scss';
9393
@use 'vuetify/settings';
94+
@use '@/assets/styles/generic/_variables.scss';
9495
9596
/**
9697
* 1. Navigation Button.
@@ -101,6 +102,10 @@ onMounted(() => {
101102
&.v-bottom-navigation {
102103
transform: unset !important;
103104
overflow: visible;
105+
106+
@media (max-width: map.get(variables.$breakpoints, 'mobile')) {
107+
bottom: calc(0px + env(safe-area-inset-bottom)) !important;
108+
}
104109
}
105110
&.v-bottom-navigation .v-btn {
106111
font-weight: 300;

src/components/Chat/Chat.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -949,7 +949,7 @@ const onKeyPress = (e: KeyboardEvent) => {
949949
margin-right: 8px;
950950
}
951951
.chat {
952-
height: 100%;
952+
height: calc(100vh - var(--v-layout-bottom));
953953
box-shadow: none;
954954
background-color: transparent !important;
955955
}

src/components/Chat/Chats.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,10 @@ const markAllAsRead = () => {
291291
@use 'sass:map';
292292
@use '@/assets/styles/settings/_colors.scss';
293293
@use 'vuetify/settings';
294+
@use '@/assets/styles/generic/_variables.scss';
294295
295296
.chats-view {
297+
margin-top: env(safe-area-inset-top);
296298
height: 100%;
297299
298300
&.a-container,
@@ -331,6 +333,10 @@ const markAllAsRead = () => {
331333
}
332334
&__messages {
333335
&.chats-view__messages--chat {
336+
@media (max-width: map.get(variables.$breakpoints, 'mobile')) {
337+
max-height: calc(100vh - 56px - var(--v-layout-bottom) - env(safe-area-inset-bottom) - env(safe-area-inset-top));
338+
}
339+
334340
max-height: calc(100vh - 56px - var(--v-layout-bottom));
335341
overflow-y: auto;
336342
}

src/components/transactions/TransactionTemplate.vue

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,13 @@ const formatAmount = (amount: number, decimals = CryptosInfo[props.crypto].decim
369369
@use '@/assets/styles/settings/_colors.scss';
370370
371371
.transaction-view {
372+
position: relative;
373+
374+
&__content {
375+
overflow-y: auto;
376+
height: calc(100vh - var(--v-layout-bottom) - var(--toolbar-height));
377+
padding-top: var(--toolbar-height);
378+
}
372379
373380
&__titlecontent {
374381
flex: 1 0 auto;

src/layouts/no-container.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<slot />
33

44
<app-snackbar />
5-
<app-navigation v-if="showNavigation" absolute />
5+
<app-navigation v-if="showNavigation" />
66
</template>
77

88
<script setup lang="ts">

src/layouts/toolbar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<slot />
1010
</v-container>
1111
<app-snackbar />
12-
<app-navigation v-if="showNavigation" absolute />
12+
<app-navigation v-if="showNavigation" />
1313
</template>
1414

1515
<script setup lang="ts">

src/views/AppSidebar.vue

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,6 @@ onBeforeUnmount(() => {
222222
223223
&__with-aside {
224224
max-width: 1512px;
225-
height: 100%;
226-
227225
@media (min-width: 1513px) {
228226
border-right: 2px solid black;
229227
border-left: 2px solid black;
@@ -233,17 +231,19 @@ onBeforeUnmount(() => {
233231
&__aside {
234232
width: var(--asideWidth);
235233
min-height: 100%;
236-
height: calc(100% - var(--v-layout-bottom));
234+
height: calc(100vh - var(--v-layout-bottom));
237235
border-right: 2px solid black;
238236
position: relative;
239237
max-width: 75%;
240238
user-select: none;
241239
242240
@media (max-width: map.get(variables.$breakpoints, 'mobile')) {
241+
margin-top: env(safe-area-inset-top);
242+
height: calc(100vh - var(--v-layout-bottom) - env(safe-area-inset-bottom) - env(safe-area-inset-top));
243243
border-right: none;
244244
}
245245
246-
&::after {
246+
&::after {
247247
content: '';
248248
position: absolute;
249249
right: 0;
@@ -271,10 +271,15 @@ onBeforeUnmount(() => {
271271
}
272272
273273
&__layout {
274+
@media (max-width: map.get(variables.$breakpoints, 'mobile')) {
275+
margin-top: env(safe-area-inset-top);
276+
height: calc(100vh - var(--v-layout-bottom) - env(safe-area-inset-bottom) - env(safe-area-inset-top));
277+
}
278+
274279
flex: 1 1 auto;
275280
overflow-y: auto;
276281
overflow-x: hidden;
277-
height: calc(100vh - var(--v-layout-bottom) - env(safe-area-inset-bottom) - env(safe-area-inset-top));
282+
height: calc(100vh - var(--v-layout-bottom));
278283
width: calc(100% - var(--asideWidth));
279284
280285
&:deep(> .v-container) {

src/views/SendFunds.vue

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,4 +128,14 @@ const onError = (message: string) => {
128128
})
129129
}
130130
</script>
131-
131+
<style scoped lang="scss">
132+
.send-funds {
133+
position: relative;
134+
135+
&__content {
136+
overflow-y: auto;
137+
height: calc(100vh - var(--v-layout-bottom) - var(--toolbar-height));
138+
padding-top: var(--toolbar-height);
139+
}
140+
}
141+
</style>

0 commit comments

Comments
 (0)