html save

Author: Hugo Troonbeeckx

mobile/src/app/tab1/tab1.page.html

@@ -12,7 +12,11 @@
       <ion-title size="large" class="ion-text-center">Mes événements</ion-title>
     </ion-toolbar>
 
+<<<<<<< HEAD
     <ion-card *ngFor="let event of events" class="ion-text-center">
+=======
+    <ion-card *ngFor="let event of events">
+>>>>>>> a55d4d5 (Test accueil)
       <ion-card-header>
         <ion-card-title>{{ event.nom }}</ion-card-title>
         <ion-card-subtitle>{{ event.date }}</ion-card-subtitle>

mobile/src/app/tabs/tabs.page.html

@@ -1,16 +1,29 @@
 <ion-tabs>
   <ion-tab-bar slot="bottom">
     <ion-tab-button tab="tab1" href="/tabs/tab1">
+<<<<<<< HEAD
       <ion-icon aria-hiden="true" name="calendar-outline"></ion-icon>
+=======
+      <ion-icon aria-hidden="true" name="triangle"></ion-icon>
+>>>>>>> a55d4d5 (Test accueil)
       <ion-label id="Izi">Izi</ion-label>
     </ion-tab-button>
 
     <ion-tab-button tab="tab2" href="/tabs/tab2">
       <ion-fab>
         <ion-fab-button size="small">
+<<<<<<< HEAD
           <ion-icon aria-hiden="true" name="add"></ion-icon>
         </ion-fab-button>
       </ion-fab>
+=======
+          <ion-icon name="add"></ion-icon>
+        </ion-fab-button>
+      </ion-fab>
+      <ion-label>
+        Tab2
+      </ion-label>
+>>>>>>> a55d4d5 (Test accueil)
     </ion-tab-button>
 
     <ion-tab-button tab="tab3" href="/tabs/tab3">

mobile/src/app/tabs/tabs.page.scss

@@ -1,7 +1,13 @@
 ion-fab-button {
+<<<<<<< HEAD
     --background: #F9E6AC;
     --background-activated: #fbf3db;
     --background-hover: #fef8e5;
+=======
+    --background: #b7f399;
+    --background-activated: #87d361;
+    --background-hover: #a3e681;
+>>>>>>> a55d4d5 (Test accueil)
     --border-radius: 15px;
     --box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.3), 0px 1px 3px 1px rgba(0, 0, 0, 0.15);
     --color: black;