Merge branch 'feature/home' into developer

This commit is contained in:
tiago.kayaya
2021-01-15 16:05:37 +01:00
23 changed files with 1066 additions and 304 deletions
+10 -3
View File
@@ -1,5 +1,7 @@
<ion-tabs>
<ion-tab-bar slot="bottom">
<ion-tabs class="tab">
<ion-tab-bar class="bottoms" slot="bottom">
<ion-tab-button tab="events">
<!-- <ion-icon name="home"></ion-icon> -->
<ion-icon class="nav-icon" src="assets/images/icons-nav-home.svg"></ion-icon>
@@ -22,11 +24,16 @@
<ion-icon class="nav-icon" src="assets/images/icons-nav-actions.svg"></ion-icon>
<ion-label>Acções</ion-label>
</ion-tab-button>
<!-- <ion-tab-button tab="search">
<ion-tab-button tab="search">
<ion-icon name="search"></ion-icon>
<ion-label>Pesquisa</ion-label>
<<<<<<< HEAD
</ion-tab-button> -->
<ion-tab-button hidden tab="chat">
=======
</ion-tab-button>
<!-- <ion-tab-button tab="chat">
>>>>>>> feature/home
<ion-icon class="nav-icon" src="assets/images/icons-nav-chat-inactive.svg"></ion-icon>
<ion-label>Chat</ion-label>
</ion-tab-button>