jeter20131220 hace 3 años
padre
commit
ab5ed190f2
Se han modificado 5 ficheros con 76 adiciones y 53 borrados
  1. 6 2
      about/goto2.js
  2. 5 4
      about/index.html
  3. 20 1
      style.css
  4. 0 0
      style.css.map
  5. 45 46
      style.scss

+ 6 - 2
about/goto2.js

@@ -25,8 +25,9 @@ $(document).ready(function () {
                         var aboutImg = '';
                         var aboutViedeo = '';
                         var aboutMethod = '';
-                        aboutIntPhone = '';
+                        var aboutIntPhone = '';
                         var bodyBannerDes = '';
+                        var webtitle='';
                         console.log(msg[i]);
 
                         // var res = msg.length;
@@ -225,6 +226,9 @@ $(document).ready(function () {
                         bodyBannerDes += ' \
                         <img class="banner-img" id="img_id"  src="'+ msg[i].workimg[0].img + '" alt="">\
                        ';
+                       webtitle += ' \
+                       幸福空間::: 2021 觀眾最愛設計師 | 滿足你期待回家的夢想推手|'+ msg[i].DesignerName +'設計師\
+                      ';
 
                         $('.sec03-1').html(aboutViedeo);
                         $('.sec02-1').html(aboutImg);
@@ -233,7 +237,7 @@ $(document).ready(function () {
                         $('.sec04-1').html(aboutMethod);
                         $('.banner-m').html(aboutIntPhone);
                         $('#bannerdes-img').html(bodyBannerDes);
-
+                        $('#webtitle').html(webtitle);
                     }
                 }
 

+ 5 - 4
about/index.html

@@ -9,7 +9,8 @@
     <meta name="keywords" content="幸福空間, 2021, 觀眾最愛, 設計師, 家, 夢想, 滿足">
     <meta property="og:description" content="幸福溫馨氛圍營造、設計創意源源不絕、機能動線超強規劃,為你創造夢想中的居家!" />
     <meta property="og:site_name" content=":::幸福空間::: 2021 觀眾最愛設計師 | 滿足你期待回家的夢想推手" />
-    <title>:::幸福空間::: 2021 觀眾最愛設計師 | 滿足你期待回家的夢想推手</title>
+    <title id="webtitle"></title>
+    
 
 
 
@@ -364,10 +365,10 @@
             </div>
         </div>
     </section>
-    <section style="text-align: center;" class="py-4">
+    <!-- <section style="text-align: center;" class="py-4">
         <img src="../img/about/banner/return.png" alt="">
-    </section>
-    <footer id="footer" class="container-fluid px-0 mx-0">
+    </section> -->
+    <footer id="footer" class="container-fluid px-0 mx-0 py-4">
         <p>幸福空間 版權所有 &copy;Gorgeous Space Go.Ltd. All Rights Reserved.<a href=""><span class="px-2">|</span>聯絡我們<span class="px-2">|</span></a><a href=""> 關於本站 <span class="px-2">|</span></a></p>
     </footer>
 

+ 20 - 1
style.css

@@ -334,7 +334,8 @@ body .arrow:hover {
   }
 }
 
-#banner #banner-container #sec01 .col-lg-2:hover .sec02-p-m, #banner #banner-container #sec01 .col-lg-2:hover .sec03-p-m {
+#banner #banner-container #sec01 .col-lg-2:hover .sec02-p-m,
+#banner #banner-container #sec01 .col-lg-2:hover .sec03-p-m {
   opacity: 1;
 }
 
@@ -386,4 +387,22 @@ body .arrow:hover {
             transform: scale(1);
   }
 }
+
+@-webkit-keyframes Picture2 {
+  0% {
+    opacity: 0.5;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+
+@keyframes Picture2 {
+  0% {
+    opacity: 0.5;
+  }
+  100% {
+    opacity: 1;
+  }
+}
 /*# sourceMappingURL=style.css.map */

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
style.css.map


+ 45 - 46
style.scss

@@ -22,21 +22,18 @@ body {
         background: #363636;
     }
     .arrow {
-       
         position: fixed;
         right: 30px;
         bottom: 150px;
         width: 45px;
         height: 40px;
         z-index: 10;
-        a{
+        a {
             margin: 30px 0px;
         }
-        .icon{
-           
+        .icon {
             @media screen and(max-width:$moblie) {
                 display: none;
-                
             }
         }
         &:hover {
@@ -122,15 +119,14 @@ body {
     }
 }
 // 行動版-預約選單
-#Navigation2{
-    
+#Navigation2 {
     background: rgba(112, 112, 112, 0.75);
     height: 4.5vw;
     width: 100vw !important;
     position: fixed;
-    bottom:0px;
+    bottom: 0px;
     z-index: 10;
-   
+
     @media screen and(min-width:$desktop) {
         display: none;
     }
@@ -141,7 +137,7 @@ body {
         height: 15vw;
         position: fixed;
         z-index: 5;
-     
+
         background: rgba(0, 0, 0, 0.8);
     }
 
@@ -149,7 +145,7 @@ body {
         width: 90vw;
         margin: 0 auto;
         display: grid;
-        grid-template-columns: repeat(5,1fr);
+        grid-template-columns: repeat(5, 1fr);
         text-align: center;
         a {
             text-decoration: none;
@@ -158,7 +154,7 @@ body {
             font-size: 0.9rem;
             font-weight: 600;
             cursor: pointer;
-        
+
             position: relative;
             img {
                 margin: 10px auto;
@@ -168,25 +164,21 @@ body {
     }
 
     //    rwd要注意高度
-   
-
-   
 }
 #banner {
     position: relative;
-    #bannerdes-img{
+    #bannerdes-img {
         position: absolute;
-        z-index:-1;
+        z-index: -1;
         opacity: 1;
-        .banner-img{
+        .banner-img {
             width: 100vw;
             object-fit: cover;
             height: 50vw;
-            animation-name:Picture;
+            animation-name: Picture;
             animation-duration: 1s;
             @media screen and(max-width:$moblie) {
                 height: 80vh;
-            
             }
         }
     }
@@ -194,7 +186,6 @@ body {
         // background-image: url(../img/about/banner/banner-m2.png);
         background-size: 115vw;
         background-repeat: no-repeat;
-    
     }
     #banner-container {
         width: 90vw;
@@ -202,7 +193,6 @@ body {
         @media screen and(max-width:$moblie) {
             padding-top: 0vw;
             width: 95vw;
-        
         }
         // 電腦版
         .banner-des {
@@ -210,7 +200,6 @@ body {
                 display: none;
             }
             .banner-1 {
-                
                 @media screen and(max-width:$moblie) {
                     margin: 0;
                 }
@@ -237,7 +226,6 @@ body {
             }
         }
         #sec01 {
-           
             padding-top: 5vw;
             @media screen and(max-width:$moblie) {
                 padding-top: 0;
@@ -247,30 +235,34 @@ body {
                 position: relative;
                 transition: 0.5s ease-in-out;
                 cursor: pointer;
-                .sec02-p-m{
-                    color:#fff;
+                img{
+                   
+                }
+                .sec02-p-m {
+                    color: #fff;
                     text-align: center;
                     font-size: 14px;
-                   font-weight: 900;
-                   transition: 0.5s;
-                   @media screen and(max-width:$moblie) {
-                    display: none;
-                }
+                    font-weight: 900;
+                    transition: 0.5s;
+                   
+                    @media screen and(max-width:$moblie) {
+                        display: none;
+                    }
                     @media screen and(min-width:$desktop) {
                         width: 100%;
                         position: absolute;
                         top: 70px;
-                        left:0px;
+                        left: 0px;
                         font-size: 16px;
-                       opacity: 0;
+                        opacity: 0;
                     }
                 }
-                &:hover{
-                    
-                    .sec02-p-m,.sec03-p-m{
+                &:hover {
+                    .sec02-p-m,
+                    .sec03-p-m {
                         opacity: 1;
                     }
-                    img{
+                    img {
                         opacity: 0.2;
                         @media screen and(max-width:$moblie) {
                             opacity: 1;
@@ -288,12 +280,10 @@ body {
     text-align: center;
     width: 80vw;
     margin: 0 auto !important;
-   
-    a{
+
+    a {
         text-decoration: none;
-        color:#fff;
-    
-       
+        color: #fff;
     }
     p {
         padding: 15px;
@@ -301,11 +291,20 @@ body {
     }
 }
 
-@keyframes Picture{
-    0%{
+@keyframes Picture {
+    0% {
         transform: scale(1.3);
     }
-    100%{
+    100% {
         transform: scale(1);
     }
-}
+}
+
+@keyframes Picture2 {
+    0% {
+       opacity: 0.5;
+    }
+    100% {
+       opacity: 1;
+    }
+}

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio