golf преди 3 години
родител
ревизия
c1b9c54d62

+ 33 - 18
src/app/home/home.page.html

@@ -1,6 +1,6 @@
1 1
 <ion-header>
2 2
   <ion-toolbar class="toolbar-bg-color">
3
-    <img src="../../../assets/icon/logo-fm99.png" class="head-img">
3
+    <img src="../../../assets/icon/fm99-logo-2021-3.svg" class="head-img">
4 4
     <ion-buttons slot="end">
5 5
       <ion-menu-button>
6 6
         <ion-icon src="../assets/icon/menu-svgrepo-com.svg" color="warning"></ion-icon>
@@ -14,27 +14,30 @@
14 14
     <ng-template swiperSlide><img src="../../../assets/img-static/fb-Ad-2.jpeg" alt=""></ng-template>
15 15
     <ng-template swiperSlide><img src="../../../assets/img-static/fb-Ad-3.jpeg" alt=""></ng-template>
16 16
   </swiper>
17
-  <!-- <div id="container">
18
-    <fa-icon [icon]="['fas', 'graduation-cap']"></fa-icon>
19
-    <hr>
20
-    <strong>Ready to create an app?</strong>
21
-    <p>Start with Ionic <a target="_blank" rel="noopener noreferrer"
22
-        href="https://ionicframework.com/docs/components">UI Components</a></p>
23
-  </div> -->
24 17
   <ion-grid class="ion-padding-vertical">
25 18
     <ion-row>
19
+      <ion-col size="8" class="bg-color-2">
20
+      </ion-col>
21
+      <ion-col size="4">
22
+      </ion-col>
23
+    </ion-row>
24
+    <ion-row class="bg-color-1">
26 25
       <ion-col>
27
-        <h2>ข่าวกีฬา</h2>
28
-        <hr>
26
+        <h2 class="color-3">ข่าวกีฬา</h2>
29 27
       </ion-col>
30 28
     </ion-row>
31
-    <ion-row *ngFor="let news of newsdata | slice:0:4">
29
+    <ion-row *ngFor="let news of newsdata | slice:0:4" class="bg-color-1 last-child-pad-bottom">
32 30
       <ion-col size="5">
33 31
         <img [src]="news.better_featured_image.source_url" [style.width]="'100%'" />
34 32
       </ion-col>
35 33
       <ion-col class="ion-align-self-center"><a [routerLink]="['../news-detail' , news.id]"><span
36
-            [innerHTML]="news.title.rendered"></span>
37
-        </a>
34
+            [innerHTML]="news.title.rendered"></span></a>
35
+      </ion-col>
36
+    </ion-row>
37
+    <ion-row>
38
+      <ion-col size="4">
39
+      </ion-col>
40
+      <ion-col size="8" class="bg-color-3">
38 41
       </ion-col>
39 42
     </ion-row>
40 43
   </ion-grid>
@@ -45,17 +48,29 @@
45 48
 
46 49
   <ion-grid class="ion-padding-vertical">
47 50
     <ion-row>
51
+      <ion-col size="8" class="bg-color-2">
52
+      </ion-col>
53
+      <ion-col size="4">
54
+      </ion-col>
55
+    </ion-row>
56
+    <ion-row class="bg-color-1">
48 57
       <ion-col>
49
-        <h2>รายการย้อนหลัง</h2>
50
-        <hr>
58
+        <h2 class="color-3">รายการย้อนหลัง</h2>
51 59
       </ion-col>
52 60
     </ion-row>
53 61
     <div *ngIf="ytalldata">
54
-      <ion-row *ngFor="let ytdata of ytalldata['items']| slice:0:4">
62
+      <ion-row *ngFor="let ytdata of ytalldata['items']| slice:0:4" class="bg-color-1">
55 63
         <ion-col size="5">
56 64
           <img [src]="ytdata.snippet.thumbnails.high.url" [style.width]="'100%'" />
57 65
         </ion-col>
58
-        <ion-col class="ion-align-self-center"><a href="https://www.youtube.com/watch?v={{ytdata.id.videoId}}"><span [innerHTML]="ytdata.snippet.title"></span></a></ion-col>
66
+        <ion-col class="ion-align-self-center"><a href="https://www.youtube.com/watch?v={{ytdata.id.videoId}}"><span
67
+              [innerHTML]="ytdata.snippet.title"></span></a></ion-col>
68
+      </ion-row>
69
+      <ion-row>
70
+        <ion-col size="4">
71
+        </ion-col>
72
+        <ion-col size="8" class="bg-color-3">
73
+        </ion-col>
59 74
       </ion-row>
60 75
     </div>
61 76
   </ion-grid>
@@ -63,4 +78,4 @@
63 78
     <img src="../../../assets/img-static/banner-320x100.jpeg" alt="">
64 79
   </ion-grid>
65 80
 
66
-</ion-content>
81
+</ion-content>

+ 5 - 3
src/app/home/home.page.scss

@@ -21,6 +21,8 @@ ion-content {
21 21
   line-height: 1.3em;
22 22
 }
23 23
 
24
-ion-row {
25
-  background-color: #fcfcfc !important;
26
-}
24
+// ion-row {
25
+//   background-color: #fcfcfce3 !important;
26
+// }
27
+
28
+

+ 14 - 10
src/app/navtabs/navtabs.page.html

@@ -1,23 +1,27 @@
1
-
1
+<!-- <ion-fab vertical="bottom" horizontal="center" translucent="true">
2
+  <ion-fab-button routerLink="/tabs/add-post">
3
+    <ion-icon name="add-outline"></ion-icon>
4
+  </ion-fab-button>
5
+</ion-fab> -->
2 6
 <ion-tabs>
3 7
   <ion-tab-bar slot="bottom">
4
-    <ion-tab-button tab="home">
8
+    <ion-tab-button tab="home" layout="icon-top">
5 9
       <ion-icon name="globe"></ion-icon>
6
-      <!-- <ion-label>Home</ion-label> -->      
10
+      <!-- <ion-label>Home</ion-label> -->
7 11
     </ion-tab-button>
8
-    <ion-tab-button tab="news">
12
+    <ion-tab-button tab="news" layout="icon-top">
9 13
       <ion-icon name="football"></ion-icon>
10 14
       <!-- <ion-label>News</ion-label> -->
11 15
     </ion-tab-button>
12
-    <ion-tab-button tab="#">
13
-      <ion-icon name="play-circle"></ion-icon>
16
+    <ion-tab-button tab="#" layout="icon-top">
17
+      <ion-icon name="play-circle" size="large"></ion-icon>
14 18
       <!-- <ion-label>Audio</ion-label> -->
15
-    </ion-tab-button>  
16
-    <ion-tab-button tab="youtube">
19
+    </ion-tab-button>
20
+    <ion-tab-button tab="youtube" layout="icon-top">
17 21
       <ion-icon name="logo-youtube"></ion-icon>
18 22
       <!-- <ion-label>Youtube</ion-label> -->
19
-    </ion-tab-button>  
20
-    <ion-tab-button tab="#">
23
+    </ion-tab-button>
24
+    <ion-tab-button tab="#" layout="icon-top">
21 25
       <ion-icon name="videocam"></ion-icon>
22 26
       <!-- <ion-label>Video</ion-label> -->
23 27
     </ion-tab-button>

+ 35 - 1
src/app/navtabs/navtabs.page.scss

@@ -95,4 +95,38 @@
95 95
 //   &.tab-selected::before {
96 96
 //     background-color: var(--ion-color-primary);
97 97
 //   }
98
-// }
98
+// }
99
+
100
+// ion-tab-bar {
101
+//     bottom: 20px;
102
+//     position: relative;
103
+//     border-radius: 16px;
104
+//     width: 92%;
105
+//     margin: 0 auto;
106
+    
107
+//   }
108
+
109
+  ion-tab-button {
110
+    --color: var(--ion-color-medium);
111
+    --color-selected: var(--ion-color-primary);
112
+    --background-focused:#ff600d;
113
+    --background-focused-opacity:0.5;
114
+  
115
+    &::before {
116
+      background-color: transparent;
117
+      display: block;
118
+      content: "";
119
+      margin: 0 auto;
120
+      width: 20px;
121
+      height: 2px;
122
+    }
123
+  
124
+    &.tab-selected::before {
125
+      background-color: var(--ion-color-primary);
126
+    }
127
+  } 
128
+
129
+  // ion-tab-button.tab-selected {
130
+  //   --background: var(--ion-color-dark) !important;
131
+  //   --color-selected: var(--ion-color-light);
132
+  // }

+ 11 - 9
src/app/news-detail/news-detail.page.html

@@ -16,15 +16,17 @@
16 16
       </ion-col>
17 17
     </ion-row>
18 18
   </ion-grid>
19
-  <ion-grid>
20
-    <ion-row>
21
-      <ion-col *ngIf="data">
22
-        <div [innerHTML]="data?.title.rendered" class="title-txt-1"></div>        
23
-          <img [src]="data.better_featured_image.source_url" [style.width]="'100%'" />          
24
-          <div [innerHTML]="data.content.rendered"></div>      
25
-      </ion-col>
26
-    </ion-row>
27
-  </ion-grid>
19
+  <div *ngIf="data">
20
+    <img [src]="data.better_featured_image.source_url" [style.width]="'100%'" />
21
+    <ion-grid >
22
+      <ion-row>
23
+        <ion-col class="bg-color-1">
24
+          <h2 [innerHTML]="data?.title.rendered" class="title-txt-1"></h2>
25
+          <div [innerHTML]="data.content.rendered" class="content-txt-1"></div>
26
+        </ion-col>
27
+      </ion-row>
28
+    </ion-grid>
29
+  </div>
28 30
   <ion-grid>
29 31
     <img src="../../../assets/img-static/banner-320x100.jpeg" alt="">
30 32
   </ion-grid>

+ 9 - 3
src/app/news-detail/news-detail.page.scss

@@ -1,3 +1,9 @@
1
-ion-row {
2
-    background-color: #fcfcfc !important;
3
-}
1
+// ion-row {
2
+//     background-color: #fcfcfc !important;
3
+// }
4
+.content-txt-1 {
5
+    font-family: K2D !important;
6
+    font-size: 1em;
7
+    line-height: 1.3em;
8
+    color: darkslategray;
9
+}

+ 5 - 3
src/app/news/news.page.html

@@ -11,8 +11,10 @@
11 11
 <ion-content>
12 12
   <ion-grid>
13 13
     <ion-row>
14
-      <ion-col>
15
-        <h2>ข่าวกีฬา</h2>
14
+      <ion-col size="10" class="bg-color-4">
15
+        <h2 class="color-1">ข่าวกีฬา</h2>
16
+      </ion-col>
17
+      <ion-col size="2" class="bg-color-3">        
16 18
       </ion-col>
17 19
     </ion-row>
18 20
   </ion-grid>
@@ -24,7 +26,7 @@
24 26
     </ion-row>
25 27
   </ion-grid>
26 28
   <ion-grid>
27
-    <ion-card *ngFor="let news of newsdata" class="list-card-margin">
29
+    <ion-card *ngFor="let news of newsdata" class="list-card-margin bg-color-1">
28 30
       <img src="{{news.better_featured_image.source_url}}" />
29 31
       <ion-card-header>
30 32
         <a [routerLink]="['../news-detail' , news.id]">

+ 7 - 4
src/app/news/news.page.scss

@@ -1,6 +1,6 @@
1
-ion-row {
2
-    background-color: #fcfcfc !important;
3
-}
1
+// ion-row {
2
+//     background-color: #fcfcfc !important;
3
+// }
4 4
 
5 5
 .list-card-margin {
6 6
     margin: 0 0 10px 0;
@@ -28,4 +28,7 @@ ion-card-content {
28 28
     color: darkslategray;
29 29
 }
30 30
 
31
-
31
+.header-tab {
32
+    background: rgb(2,0,36);
33
+background: linear-gradient(156deg, rgba(2,0,36,1) 0%, rgba(9,9,121,1) 0%, rgba(7,65,158,1) 43%, rgba(4,122,195,1) 82%, rgba(0,212,255,1) 100%);
34
+}

+ 4 - 3
src/app/youtube/youtube.page.html

@@ -11,9 +11,10 @@
11 11
 <ion-content>
12 12
   <ion-grid>
13 13
     <ion-row>
14
-      <ion-col>
15
-        <h2>รายการย้อนหลัง</h2>
16
-        <hr>
14
+      <ion-col size="10" class="bg-color-4">
15
+        <h2 class="color-1">รายการย้อนหลัง</h2>
16
+      </ion-col>
17
+      <ion-col size="2" class="bg-color-6">        
17 18
       </ion-col>
18 19
     </ion-row>
19 20
   </ion-grid>

+ 3 - 3
src/app/youtube/youtube.page.scss

@@ -1,6 +1,6 @@
1
-ion-row {
2
-    background-color: #fcfcfc !important;
3
-}
1
+// ion-row {
2
+//     background-color: #fcfcfc !important;
3
+// }
4 4
 
5 5
 .list-card-margin {
6 6
     margin: 0 0 10px 0;

Файловите разлики са ограничени, защото са твърде много
+ 638 - 0
src/assets/icon/fm99-logo-2021-3.svg


BIN
src/assets/img-static/bg-content-min.jpg


+ 70 - 5
src/global.scss

@@ -86,8 +86,7 @@
86 86
 
87 87
 ion-content {
88 88
   // --ion-background-color: #111D12;
89
-  --background: url('./assets/img-static/bg-content-min.jpg') no-repeat 
90
-center/cover;
89
+  --background: url('./assets/img-static/bg-content-min.jpg') no-repeat center/cover;
91 90
 }
92 91
 
93 92
 
@@ -102,7 +101,7 @@ h2 {
102 101
   font-size: 1.3em;
103 102
   margin-top: 5px;
104 103
   margin-bottom: 0px;
105
-  color: darkorange;
104
+  // color: darkorange;
106 105
 
107 106
 }
108 107
 
@@ -111,7 +110,7 @@ h3 {
111 110
   font-size: 1.3em;
112 111
   margin-top: 5px;
113 112
   margin-bottom: 0px;
114
-  color: darkorange;
113
+  // color: darkorange;
115 114
 }
116 115
 
117 116
 .head-img {
@@ -119,6 +118,8 @@ h3 {
119 118
   display: flex;
120 119
   margin-left: 10px;
121 120
   margin-top: 5px;
121
+  // --box-shadow: 0 0 3px 0 var(--ion-color-medium);
122
+
122 123
 }
123 124
 
124 125
 // ion-toolbar {
@@ -143,4 +144,68 @@ hr {
143 144
 
144 145
 a {
145 146
   text-decoration: none;
146
-}
147
+}
148
+
149
+.bg-white {
150
+  background-color: #fff;
151
+}
152
+
153
+.bg-color-1 {
154
+  background: rgb(2,0,36);
155
+  background: linear-gradient(190deg, rgba(2,0,36,1) 0%, rgba(255,255,255,1) 0%, rgba(233,233,233,1) 61%, rgba(255,255,255,1) 90%, rgba(213,213,213,1) 100%);
156
+}
157
+
158
+.bg-color-2 {
159
+  background-color: rgb(74, 156, 224);
160
+}
161
+
162
+.bg-color-3 {
163
+  background-color: darkorange;
164
+}
165
+
166
+.bg-color-4 {
167
+  background-color: rgba(255, 255, 255, 0.3);
168
+}
169
+
170
+.bg-color-6 {
171
+  background-color:#c32020;
172
+}
173
+
174
+.color-1 {
175
+  color: #fff;
176
+}
177
+
178
+.color-2 {
179
+  color: rgb(74, 156, 224);
180
+}
181
+
182
+.color-3 {
183
+  color: darkorange;
184
+}
185
+
186
+.color-4 {
187
+  color: #0f4c75;
188
+}
189
+
190
+.color-5 {
191
+  color: #3282b8;
192
+}
193
+
194
+.color-6 {
195
+  color: #c32020;
196
+}
197
+
198
+ion-row.last-child-pad-bottom {
199
+
200
+  // padding-bottom: 15px;
201
+  // background: black;
202
+  // heading:last-child
203
+  :last-child {
204
+    // background: black;
205
+    // padding-bottom: 21px;
206
+  }
207
+}
208
+
209
+// ion-row.last-child-pad-bottom:last-child {
210
+//   background: black;
211
+// }