diff --git a/package.json b/package.json index abb859f0..9dac7de1 100644 --- a/package.json +++ b/package.json @@ -112,5 +112,6 @@ "node": ">= 10.18.1", "npm": ">= 6.13.4", "yarn": ">= 1.21.1" - } + }, + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" } diff --git a/src/layouts/CscLayoutMain.vue b/src/layouts/CscLayoutMain.vue index 69bcca44..91d09790 100644 --- a/src/layouts/CscLayoutMain.vue +++ b/src/layouts/CscLayoutMain.vue @@ -140,6 +140,7 @@ /> <q-scroll-area class="absolute-top main-menu-container" + :style="{ bottom: mainMenuBottom }" > <csc-main-menu-top id="csc-main-menu-top" @@ -152,11 +153,15 @@ :is-pbx-configuration="isPbxConfiguration" /> </q-scroll-area> - <aui-mobile-app-badges /> - <div class="absolute-bottom-left absolute-bottom-right bottom-text"> - <div - v-if="!menuMinimized && platformInfo.type === 'spce'" - > + <aui-mobile-app-badges + class="app-mobile-badge-height" + :style="{ bottom: appBadgeBottom }" + /> + <div + v-if="!menuMinimized && platformInfo.type === 'spce'" + class="absolute-bottom-left absolute-bottom-right bottom-text" + > + <div> <div class="row justify-center content-center"> <span class="no-wrap q-mr-xs" @@ -450,6 +455,26 @@ export default { }, callEndedReasonFormatted () { return startCase(this.endedReason) + }, + mainMenuBottom () { + const appUrlApple = this.platformInfo?.app?.apple?.url + const appUrlAndroid = this.platformInfo?.app?.android?.url + const copyrightIsDisplayed = !this.menuMinimized && this.platformInfo?.type === 'spce' + if ((appUrlApple || appUrlAndroid) && copyrightIsDisplayed) { + return '205px' + } else if (appUrlApple || appUrlAndroid) { + return '160px' + } else if (copyrightIsDisplayed) { + return '45px' + } + return '0px' + }, + appBadgeBottom () { + const copyrightIsDisplayed = !this.menuMinimized && this.platformInfo?.type === 'spce' + if (copyrightIsDisplayed) { + return '45px' + } + return '0px' } }, watch: { @@ -802,5 +827,7 @@ $copyright-height: 45px .main-menu-container top: $toolbar-min-height - bottom: $copyright-height + +.app-mobile-badge-height + height: 160px </style>