瀏覽代碼

修正主行動版選單bug

jeter20131220 3 年之前
父節點
當前提交
08272f1227
共有 8 個文件被更改,包括 41 次插入27 次删除
  1. 3 2
      desktop11/index.html
  2. 7 3
      desktop11/style.css
  3. 0 0
      desktop11/style.css.map
  4. 14 12
      desktop11/style.scss
  5. 7 6
      mobile/script/goto.js
  6. 4 2
      mobile/style.css
  7. 0 0
      mobile/style.css.map
  8. 6 2
      mobile/style.scss

+ 3 - 2
desktop11/index.html

@@ -382,7 +382,7 @@
                             <select name="bed_num" id="rooms" required style="margin-right:1.5vw">
                                 <option class="option" value="1">1房</option>
                                 <option class="option" value="2" selected>2房</option>
-                                <option class="option" value="3" >3房</option>
+                                <option class="option" value="3">3房</option>
                                 <option class="option" value="4">4房</option>
                                 <option class="option" value="5">5房</option>
                                 <option class="option" value="6">6房</option>
@@ -423,10 +423,11 @@
                             <input name="prefer_date" type="text" id="date" placeholder="預選裝修日期" required>
                         </div>
                         <hr>
+
                         <div id="form-right">
                             <div id="fb_login">
                                 <fb:login-button id="fb-button" scope="public_profile,email"
-                                    onlogin="checkLoginState();">使用FB填入信箱與姓名
+                                    onlogin="checkLoginState();" style="padding-right: 20px;" data-size="large">使用FB填入信箱與姓名
                                 </fb:login-button>
                                 <div id="status"></div>
                             </div>

+ 7 - 3
desktop11/style.css

@@ -43,7 +43,7 @@ body .btn .btn-main:hover {
 
 body .title {
   font-weight: 900;
-  font-family: 'Noto Serif TC', serif;
+  font-family: "Noto Serif TC", serif;
   padding: 15px;
   font-size: 45px;
   color: #4b515e;
@@ -57,7 +57,7 @@ body .arrow {
   width: 45px;
   height: 40px;
   z-index: 10;
-  background-color: #E06649;
+  background-color: #e06649;
 }
 
 body .arrow:hover {
@@ -269,7 +269,7 @@ body .arrow:hover {
   margin-bottom: 50px;
   font-weight: 900;
   font-size: 45px;
-  font-family: 'Noto Serif TC', serif;
+  font-family: "Noto Serif TC", serif;
   color: #4b515e;
   padding-left: 5vw;
 }
@@ -626,6 +626,10 @@ body .arrow:hover {
   padding: 30px;
 }
 
+#contact-us #contact-form #form-right #fb-button ._4z_6 {
+  font-size: 20px !important;
+}
+
 #contact-us #contact-form #form-right #111 {
   margin-top: 12px;
   width: 29vw;

文件差異過大導致無法顯示
+ 0 - 0
desktop11/style.css.map


+ 14 - 12
desktop11/style.scss

@@ -5,7 +5,7 @@ $Font-color: #fff;
 $title-color: #4b515e;
 $toggle: #9c857b;
 $process: #6f645a;
-@import url('https://fonts.googleapis.com/css2?family=Noto+Serif+TC:wght@300;600&display=swap');
+@import url("https://fonts.googleapis.com/css2?family=Noto+Serif+TC:wght@300;600&display=swap");
 @font-face {
     font-family: 追奇手寫體;
     src: url(./drechifont-proportional.ttf);
@@ -42,7 +42,7 @@ body {
     }
     .title {
         font-weight: 900;
-        font-family: 'Noto Serif TC', serif;
+        font-family: "Noto Serif TC", serif;
         padding: 15px;
         font-size: 45px;
         color: $title-color;
@@ -55,8 +55,8 @@ body {
         width: 45px;
         height: 40px;
         z-index: 10;
-        background-color: #E06649;
-        &:hover{
+        background-color: #e06649;
+        &:hover {
             box-shadow: 1px 3px 13px -2px rgba(0, 0, 0, 0.35);
         }
     }
@@ -169,9 +169,8 @@ body {
                     opacity: 1;
                 }
             }
-
         }
-        .socail-link{
+        .socail-link {
             text-align: right;
             padding: 1.5vw 30px;
 
@@ -242,7 +241,7 @@ body {
             margin-bottom: 50px;
             font-weight: 900;
             font-size: 45px;
-            font-family: 'Noto Serif TC', serif;
+            font-family: "Noto Serif TC", serif;
             color: $title-color;
             padding-left: 5vw;
         }
@@ -532,7 +531,7 @@ body {
                 background-color: #fff;
             }
             #square,
-            #date{
+            #date {
                 background: none;
                 background-color: #fff;
             }
@@ -540,15 +539,19 @@ body {
         #form-right {
             width: 29vw;
             margin-left: 5vw;
-            #fb_login{
-                #fb-button{
+            #fb_login {
+                #fb-button {
                     font-size: 16px;
                     width: 29vw;
                     height: 50px;
                     padding: 30px;
                 }
             }
-
+            #fb-button {
+                ._4z_6 {
+                    font-size: 20px !important;
+                }
+            }
             #111 {
                 margin-top: 12px;
                 width: 29vw;
@@ -584,7 +587,6 @@ body {
                 font-weight: 900;
             }
             #checkbox {
-              
             }
             #email,
             #name,

+ 7 - 6
mobile/script/goto.js

@@ -4,10 +4,16 @@ $("#menu-box2").hide();
 $("#menu-box").hide();
 
 $("#menu-btn1").click(function () {
-  $("#menu-box").fadeToggle("slow");
+  $("#menu-box").slideToggle("slow");
   $("#menu-box2").slideToggle("slow");
 
 });
+$(".link").click(function () {
+  $("#menu-box").slideUp("slow", function () {
+    $("#menu-box2").slideUp("slow");
+    // Animation complete.
+  });
+});
 
 $(".feedback-slider1").slick({
   dots: true,
@@ -23,11 +29,6 @@ $(".banner-slider").slick({
   swipe: true,
 });
 
-$(".link").click(function () {
-  $("#menu-box2").fadeOut("slow", function () {
-    // Animation complete.
-  });
-});
 
 $.fn.serializeObject = function () {
   var o = {};

+ 4 - 2
mobile/style.css

@@ -88,12 +88,14 @@ body .arrow:hover {
 }
 
 .navigation {
-  width: auto;
+  width: 100vw;
   height: 60px;
+  background: #fff;
   -webkit-box-shadow: 0 5px 9px rgba(0, 0, 0, 0.3);
           box-shadow: 0 5px 9px rgba(0, 0, 0, 0.3);
-  position: relative;
   z-index: 5;
+  position: fixed;
+  overflow: hidden;
 }
 
 .navigation .logo {

文件差異過大導致無法顯示
+ 0 - 0
mobile/style.css.map


+ 6 - 2
mobile/style.scss

@@ -78,11 +78,15 @@ body {
     }
 }
 .navigation {
-    width: auto;
+    width: 100vw;
     height: 60px;
+    background: #fff;
     box-shadow: 0 5px 9px rgba(0, 0, 0, 0.3);
-    position: relative;
+    // position: relative;
     z-index: 5;
+    position: fixed;
+    overflow: hidden;
+
     .logo {
         padding: 10px;
         margin-bottom: 5px;

部分文件因文件數量過多而無法顯示