Parcourir la Source

wellness logo header

inboxz il y a 4 ans
Parent
commit
688a6f4d2d

+ 0 - 1
config.xml

@@ -101,5 +101,4 @@
101 101
     <plugin name="cordova-plugin-ionic-keyboard" spec="^2.0.5" />
102 102
     <allow-navigation href="http://172.16.112.36:8102" sessionid="56964c11" />
103 103
     <allow-navigation href="http://localhost:8101" sessionid="9c146598" />
104
-    <allow-navigation href="http://localhost:8102" sessionid="e658a7f1" />
105 104
 </widget>

+ 12 - 6
src/app/home/home.page.html

@@ -1,6 +1,9 @@
1 1
 <ion-header>
2 2
   <ion-toolbar class="new-background-color">
3
-    <ion-title>Wellness Route</ion-title>
3
+    <div class="hcs">
4
+      <img src="/assets/images/wellnessbar.svg" height="50" />
5
+      <!-- <ion-title>Wellness Route</ion-title> -->
6
+    </div>
4 7
   </ion-toolbar>
5 8
 </ion-header>
6 9
 <ion-content [fullscreen]="true">
@@ -42,17 +45,19 @@
42 45
       </ion-col> -->
43 46
       <ion-col size="3">
44 47
         <div class="center catshow">
45
-          <a [routerLink]="['/tabs/place/']"><fa-icon [icon]="['fas', 'utensils']" size="2x" class="red"></fa-icon></a>          
48
+          <a [routerLink]="['/tabs/place/']">
49
+            <fa-icon [icon]="['fas', 'utensils']" size="2x" class="red"></fa-icon>
50
+          </a>
46 51
         </div>
47 52
       </ion-col>
48 53
       <ion-col size="3">
49 54
         <div class=" catshow center">
50
-          <fa-icon [icon]="['fas', 'spa']" size="2x"></fa-icon>        
55
+          <fa-icon [icon]="['fas', 'spa']" size="2x"></fa-icon>
51 56
         </div>
52 57
       </ion-col>
53 58
       <ion-col size="3">
54 59
         <div class=" catshow center">
55
-          <fa-icon [icon]="['fas', 'praying-hands']" size="2x"></fa-icon>          
60
+          <fa-icon [icon]="['fas', 'praying-hands']" size="2x"></fa-icon>
56 61
         </div>
57 62
       </ion-col>
58 63
       <ion-col size="3">
@@ -70,8 +75,9 @@
70 75
           <div *ngIf="pldata.better_featured_image == null">
71 76
             <img src="/assets/images/temp.png" />
72 77
           </div>
73
-          <ion-card-header>            
74
-            <a [routerLink]="['/tabs/place/', pldata.id]"><ion-card-title [innerHTML]="pldata.title.rendered"></ion-card-title>
78
+          <ion-card-header>
79
+            <a [routerLink]="['/tabs/place/', pldata.id]">
80
+              <ion-card-title [innerHTML]="pldata.title.rendered"></ion-card-title>
75 81
             </a>
76 82
             <a [routerLink]="['/tabs/province/']">
77 83
               <span [innerHTML]="pldata._embedded['wp:term'][1][0].name"></span>

+ 0 - 31
src/app/tabs/tabs.page copy.html

@@ -1,31 +0,0 @@
1
-<ion-tabs>
2
-  <ion-fab vertical="bottom" horizontal="center" slot="fixed">
3
-    
4
-      <ion-fab-button [routerLink]="['/tabs/nearme/']">
5
-        <ion-icon name="add-outline"></ion-icon>
6
-      </ion-fab-button>
7
-    
8
-  </ion-fab>
9
-
10
-  <ion-tab-bar slot="bottom">
11
-    <ion-tab-button tab="tab1">
12
-      <ion-icon name="home"></ion-icon>
13
-      <ion-label>Tab 1</ion-label>
14
-    </ion-tab-button>
15
-
16
-    <ion-tab-button tab="tab2">
17
-      <ion-icon name="ellipse"></ion-icon>
18
-      <ion-label>Tab 2</ion-label>
19
-    </ion-tab-button>
20
-
21
-    <ion-tab-button tab="tab3">
22
-      <ion-icon name="location"></ion-icon>
23
-      <ion-label>Tab 3</ion-label>
24
-    </ion-tab-button>
25
-
26
-    <ion-tab-button tab="tab4">
27
-      <ion-icon name="location"></ion-icon>
28
-      <ion-label>Tab 4</ion-label>
29
-    </ion-tab-button>
30
-  </ion-tab-bar>
31
-</ion-tabs>

+ 0 - 1
src/app/tabs/tabs.page copy.scss

@@ -1 +0,0 @@
1
-

+ 6 - 9
src/app/tabs/tabs.page.html

@@ -5,23 +5,20 @@
5 5
     </ion-fab-button>
6 6
   </ion-fab> -->
7 7
   <ion-tab-bar slot="bottom">
8
-    <ion-tab-button tab="home">
8
+    <ion-tab-button tab="home" layout="icon-top">
9 9
       <ion-icon name="home"></ion-icon>
10 10
       <ion-label>หน้าแรก</ion-label>
11 11
     </ion-tab-button>
12 12
 
13
-    <ion-tab-button tab="nearme">
14
-      <ion-icon name="location"></ion-icon>
15
-      <ion-label>ใกล้ฉัน</ion-label>
13
+    <ion-tab-button tab="nearme" layout="icon-top">
14
+      <ion-icon name="location" color="danger"></ion-icon>
15
+      <ion-label color="danger">ใกล้ฉัน</ion-label>
16 16
     </ion-tab-button>
17 17
 
18
-    <ion-tab-button tab="login">
18
+    <ion-tab-button tab="login" layout="icon-top">
19 19
       <ion-icon name="person"></ion-icon>
20 20
       <ion-label>ฉัน</ion-label>
21 21
     </ion-tab-button>
22
-    <ion-tab-button tab="register-form">
23
-      <ion-icon name="person"></ion-icon>
24
-      <ion-label>ลงทะเบียน</ion-label>
25
-    </ion-tab-button>
22
+    
26 23
   </ion-tab-bar>
27 24
 </ion-tabs>

+ 31 - 1
src/app/tabs/tabs.page.scss

@@ -1,4 +1,34 @@
1 1
 ion-label {
2 2
     font-family: "IBM Plex Sans Thai", sans-serif !important;
3 3
     font-weight: 400;
4
-}
4
+}
5
+
6
+ion-tab-bar {
7
+    height: 70px;
8
+  }
9
+  
10
+// ion-tab-bar {
11
+//     bottom: 20px;
12
+//     position: relative;
13
+//     border-radius: 16px;
14
+//     width: 92%;
15
+//     margin: 0 auto;
16
+//   }
17
+  
18
+//   ion-tab-button {
19
+//     --color: var(--ion-color-medium);
20
+//     --color-selected: var(--ion-color-primary);
21
+  
22
+//     &::before {
23
+//       background-color: transparent;
24
+//       display: block;
25
+//       content: "";
26
+//       margin: 0 auto;
27
+//       width: 20px;
28
+//       height: 2px;
29
+//     }
30
+  
31
+//     &.tab-selected::before {
32
+//       background-color: var(--ion-color-primary);
33
+//     }
34
+//   }

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
src/assets/images/wellness-logo.svg


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
src/assets/images/wellnessbar.svg


+ 8 - 0
src/global.scss

@@ -78,6 +78,14 @@
78 78
   font-family: "IBM Plex Sans Thai", sans-serif !important;
79 79
 }
80 80
 
81
+.hcs {
82
+  display: flex;
83
+  justify-content: center;
84
+  align-items: center;
85
+  padding-bottom: 5px;
86
+  padding-top: 5px;
87
+}
88
+
81 89
 .new-background-color {
82 90
   --background: rgb(103, 143, 221);
83 91
   --background: -moz-linear-gradient(