Parcourir la source

fix scroll issue & css

Sherry il y a 1 an
Parent
révision
22225e51b3

+ 4
- 4
src/fe/healthpassport/css/all.css Voir le fichier

10890
 }
10890
 }
10891
 .form__item-agree {
10891
 .form__item-agree {
10892
   background: none;
10892
   background: none;
10893
-  margin-bottom: 0.5em;
10893
+  margin-bottom: 1em;
10894
 }
10894
 }
10895
 .form__item-agree::before {
10895
 .form__item-agree::before {
10896
   display: none;
10896
   display: none;
10906
 }
10906
 }
10907
 .form__item-agree .label p {
10907
 .form__item-agree .label p {
10908
   display: inline-block;
10908
   display: inline-block;
10909
-  font-size: 1.3em;
10909
+  font-size: 1.5em;
10910
   margin-bottom: 0;
10910
   margin-bottom: 0;
10911
 }
10911
 }
10912
 .form__item-agree .label__checkbox {
10912
 .form__item-agree .label__checkbox {
10913
   display: inline-block;
10913
   display: inline-block;
10914
-  width: 1em;
10915
-  height: 1em;
10914
+  width: 1.5em;
10915
+  height: 1.5em;
10916
   border: 1px solid #1E2846;
10916
   border: 1px solid #1E2846;
10917
   margin-right: 0.5em;
10917
   margin-right: 0.5em;
10918
   display: flex;
10918
   display: flex;

+ 4
- 4
src/fe/healthpassport/css/component/_form.scss Voir le fichier

39
         }
39
         }
40
         &-agree {
40
         &-agree {
41
             background: none;
41
             background: none;
42
-            margin-bottom: 0.5em;
42
+            margin-bottom: 1em;
43
             &::before {
43
             &::before {
44
                 display: none;
44
                 display: none;
45
             }
45
             }
53
                 align-items: center;
53
                 align-items: center;
54
                 p {
54
                 p {
55
                     display: inline-block;
55
                     display: inline-block;
56
-                    font-size: 1.3em;
56
+                    font-size: 1.5em;
57
                     margin-bottom: 0;
57
                     margin-bottom: 0;
58
                 }
58
                 }
59
                 &__checkbox {
59
                 &__checkbox {
60
                     display: inline-block;
60
                     display: inline-block;
61
-                    width: 1em;
62
-                    height: 1em;
61
+                    width: 1.5em;
62
+                    height: 1.5em;
63
                     border: 1px solid $c-black;
63
                     border: 1px solid $c-black;
64
                     margin-right: 0.5em;
64
                     margin-right: 0.5em;
65
                     display: flex;
65
                     display: flex;

+ 5
- 7
src/fe/healthpassport/index.html Voir le fichier

35
     </div>
35
     </div>
36
     <!-- Loading End -->
36
     <!-- Loading End -->
37
   </div>
37
   </div>
38
-  <div class="wrapper">
39
-    <div class="wrapper__line-scroll-fixed">
38
+  <div class="wrapper"> 
40
       <main class="main">
39
       <main class="main">
41
         <!-- 表單 form -->
40
         <!-- 表單 form -->
42
         <section class="section register">
41
         <section class="section register">
371
           </div>
370
           </div>
372
         </section>
371
         </section>
373
         <!-- 活動辦法 methods -->
372
         <!-- 活動辦法 methods -->
374
-        <section class="section methods">
373
+        <section class="section methods wrapper__line-scroll-fixed">
375
           <div class="backform"><span><</span><p>回上一頁</p></div>
374
           <div class="backform"><span><</span><p>回上一頁</p></div>
376
           <div class="section__container methods__container">
375
           <div class="section__container methods__container">
377
             <p>
376
             <p>
397
           </div>
396
           </div>
398
         </section>
397
         </section>
399
         <!-- 護照 passport -->
398
         <!-- 護照 passport -->
400
-        <section class="section passport">
399
+        <section class="section passport wrapper__line-scroll-fixed">
401
           <div class="section__container passport__container">
400
           <div class="section__container passport__container">
402
             <div class="passport__intro">
401
             <div class="passport__intro">
403
               <div class="passport__intro__bg">
402
               <div class="passport__intro__bg">
413
                 </div>
412
                 </div>
414
                 <div class="passport__intro__content">
413
                 <div class="passport__intro__content">
415
                   <div class="passport__intro__nickname">
414
                   <div class="passport__intro__nickname">
416
-                    <h2>王小美</h2>
415
+                    <h2></h2>
417
                   </div>
416
                   </div>
418
                   <div class="passport__intro__info">
417
                   <div class="passport__intro__info">
419
-                    <p><span class="introGender">女性</span> / <span class="introAge">30-39歲 </span></p>
418
+                    <p><span class="introGender"></span> / <span class="introAge"></span></p>
420
                   </div>
419
                   </div>
421
                 </div>
420
                 </div>
422
               </div>
421
               </div>
442
       </main>
441
       </main>
443
       <footer class="footer">
442
       <footer class="footer">
444
       </footer>
443
       </footer>
445
-    </div>
446
   </div>
444
   </div>
447
   <!-- Alert Modal -->
445
   <!-- Alert Modal -->
448
   <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
446
   <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"

+ 20
- 3
src/fe/healthpassport/js/base.js Voir le fichier

39
 					if(userData === null) {
39
 					if(userData === null) {
40
 						register.LinePicHandler(profile.pictureUrl)
40
 						register.LinePicHandler(profile.pictureUrl)
41
 						sectionFadeIn(".register");
41
 						sectionFadeIn(".register");
42
+						sectionFadeOut(".passport");
43
+						sectionFadeOut(".methods");
42
 					}else {
44
 					}else {
43
 						sectionFadeIn(".passport");
45
 						sectionFadeIn(".passport");
46
+						sectionFadeOut(".methods");
47
+						sectionFadeOut(".register");
44
 						passport.buildPassportHandler(userData)
48
 						passport.buildPassportHandler(userData)
45
 					}
49
 					}
50
+
51
+					// 測試用
52
+					// sectionFadeIn(".passport");
53
+					// sectionFadeOut(".methods");
54
+					// sectionFadeOut(".register");
55
+					// passport.buildPassportHandler(userData)
56
+
57
+					// register.LinePicHandler(profile.pictureUrl)
58
+					// sectionFadeIn(".register");
59
+					// sectionFadeOut(".passport");
60
+					// sectionFadeOut(".methods");
46
 				})
61
 				})
47
 		})
62
 		})
48
 
63
 
96
 
111
 
97
 	// page進入動態
112
 	// page進入動態
98
 	function sectionFadeIn(el) {
113
 	function sectionFadeIn(el) {
99
-		// $(el).fadeIn();
114
+		$(el).show();
100
 		gsap.to(el, {
115
 		gsap.to(el, {
101
 			duration: 0.3,
116
 			duration: 0.3,
102
 			autoAlpha: 1
117
 			autoAlpha: 1
105
 
120
 
106
 	// page離開動態
121
 	// page離開動態
107
 	function sectionFadeOut(el) {
122
 	function sectionFadeOut(el) {
108
-		// $(el).fadeOut();
109
 		gsap.to(el, {
123
 		gsap.to(el, {
110
 			duration: 0.3,
124
 			duration: 0.3,
111
-			autoAlpha: 0
125
+			autoAlpha: 0,
126
+			onComplete: function() {
127
+				$(el).hide();
128
+			}
112
 		})
129
 		})
113
 	}
130
 	}
114
 
131