From 9c846310495350c1f1b2615947a87c07f933a9f1 Mon Sep 17 00:00:00 2001
From: Evandre Silva <47608734+evandresilva@users.noreply.github.com>
Date: Fri, 8 Apr 2022 12:31:23 +0100
Subject: [PATCH] fix: change menu postion based on platform
---
src/app/home/home.page.html | 5 +++++
src/app/home/home.page.scss | 10 +++++-----
src/app/home/home.page.ts | 4 ++--
src/app/shared/header/header.page.html | 3 ++-
src/app/shared/header/header.page.scss | 22 ++++++++++++++--------
src/app/shared/header/header.page.ts | 2 +-
6 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html
index 7bb431e4b..75227f2c7 100644
--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
@@ -1,5 +1,7 @@
+
+
= 2 || (p.userPermission([permissionList.Agenda.access]) && loggeduser.OwnerCalendars.length != 0) || p.userPermission([permissionList.Gabinete.access])" class="bottoms" slot="bottom">
= 1 || p.userPermission([permissionList.Gabinete.access])" tab="events" [class.active]="pathname === '/home/events'">
@@ -39,5 +41,8 @@
+
+
+
diff --git a/src/app/home/home.page.scss b/src/app/home/home.page.scss
index 2126a0282..a000a1538 100644
--- a/src/app/home/home.page.scss
+++ b/src/app/home/home.page.scss
@@ -40,12 +40,12 @@ ion-badge {/* */
}
-@media only screen and (min-width: 1366px) {
+// @media only screen and (min-width: 1366px) {
- ion-tabs.tab .bottoms{
- display: none;
- }
-}
+// ion-tabs.tab .bottoms{
+// display: none;
+// }
+// }
ion-tab-button.active{
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index cdf65323c..c1d02bdab 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -87,13 +87,13 @@ export class HomePage implements OnInit {
public user: UserSession;
permissionList = new PermissionList();
loggeduser: LoginUserRespose;
-
+
constructor(
private router: Router,
public modalCtrl: AlertController,
private notificationsService: NotificationsService,
- private platform: Platform,
+ public platform: Platform,
private activeroute: ActivatedRoute,
/* private webnotification: WebNotificationsService, */
public p: PermissionService,
diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html
index 94a3add96..e27af24a8 100644
--- a/src/app/shared/header/header.page.html
+++ b/src/app/shared/header/header.page.html
@@ -47,7 +47,7 @@
-
+
diff --git a/src/app/shared/header/header.page.scss b/src/app/shared/header/header.page.scss
index 3265696a1..fe999aaa4 100644
--- a/src/app/shared/header/header.page.scss
+++ b/src/app/shared/header/header.page.scss
@@ -121,16 +121,22 @@
display: none;
}
-@media only screen and (min-width: 1366px) {
+// @media only screen and (min-width: 1366px) {
- .mobile{
- display: none !important;
- }
- .desktop{
- display: block;
- }
+// .mobile{
+// display: none !important;
+// }
+// .desktop{
+// display: block;
+// }
-}
+// }
+.mobile{
+ display: none !important;
+ }
+ .desktop{
+ display: block;
+ }
.tab{
height: 65px;
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts
index b91aa2d7a..e61de5c6c 100644
--- a/src/app/shared/header/header.page.ts
+++ b/src/app/shared/header/header.page.ts
@@ -39,7 +39,7 @@ export class HeaderPage implements OnInit {
private modalController: ModalController,
private animationController: AnimationController,
private storageservice: StorageService,
- private platform: Platform,
+ public platform: Platform,
//private notificationsService: NotificationsService,
private eventrigger: EventTrigger,
public ThemeService: ThemeService,