Merge branch 'feature/home' into developer

src/app/home/home.module.ts

@@ -8,7 +8,7 @@ import { HomePageRoutingModule } from './home-routing.module';
 
 import { HomePage } from './home.page';
 /* import { IonicSelectableModule } from 'ionic-selectable'; */
-
+import { SharedModule } from 'src/app/shared/shared.module';
 
 @NgModule({
   imports: [
@@ -16,6 +16,7 @@ import { HomePage } from './home.page';
     FormsModule,
     IonicModule,
     HomePageRoutingModule,
+    SharedModule
   ],
   declarations: [HomePage]
 })

src/app/home/home.page.html

@@ -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>

src/app/home/home.page.scss

@@ -25,4 +25,12 @@ ion-badge {/*  */
 
   white-space: nowrap;
   vertical-align: baseline; */
+}
+
+
+.tab{
+  .bottoms{
+    display: flex;
+    justify-content: space-around;
+  }
 }