andy 2 rokov pred
rodič
commit
558fe56731

+ 1 - 1
content/collection/open_the_blinds_and_meet_the_simple_warmth_of_home/index.md

@@ -7,7 +7,7 @@ draft: false
 type: "collection"
 url: "/collection/open_the_blinds_and_meet_the_simple_warmth_of_home/"
 image: "/img/collection/4646e6a4a20b4a9488f7aa1e517031a9.webp"
-cover_img : "/img/banner/bn_portfolio@2x.png"
+cover_img : "/img/7092849b423442c0afac90e9a06c9098.webp"
 description: "台中 吳工程師|新成屋<br>兩房兩廳|31.6 坪<br>總預算 111.9 萬<br>"
 size: "31.6坪"
 bed_num: "兩房兩廳"

+ 4 - 1
layouts/collection/list.html

@@ -35,6 +35,9 @@
         <a class="bhouseweb_item_type">20-35坪</a>
         <a class="bhouseweb_item_type">36-50坪</a>
         <a class="bhouseweb_item_type">50坪以上</a>
+        <a class="bhouseweb_item_type">50坪以上</a>
+        <a class="bhouseweb_item_type">50坪以上</a>
+        <a class="bhouseweb_item_type">50坪以上</a>        
       </div>
       <div class="bhouseweb_loc_type">
         <a class="fw-bold">預算</a>
@@ -70,7 +73,7 @@
 
   </div>
   <hr class="bhouseweb_loc_line">
-  <div class="bhouseweb_loc_content">
+  <div class="bhouseweb_loc_content" style="overflow-x:hidden">
     <div class="bhouseweb_loc_sec02">
       <div class="row px-0 mx-0">
         {{ $paginator := .Paginate .Data.Pages }}

+ 1 - 1
layouts/collection/single.html

@@ -8,7 +8,7 @@
     <h2 class="style_house_title style_house_text">{{ .Params.collection_title}}</h2>
 </div>
 <section class="style_house_banner container-fluid px-0">
-    <img src="/img/1 2.webp" alt="">
+    <img src="./{{ .Params.cover_img}}" alt="">
 </section>
 <div class="style_house_content">
     <div class="style_house_sec01">

+ 26 - 16
themes/hugo-universal-theme-master/static/css/style.bhouse.css

@@ -859,7 +859,7 @@ img {
 /* Banner end */
 /* 成家故事作品集-collection start */
 .select {
-  text-decoration: underline !important;
+  border-bottom: 1.5px solid #565656 !important;
 }
 
 .bhouseweb_item_type {
@@ -895,7 +895,7 @@ img {
 }
 
 .bhouseweb_loc_sec01 {
-  width: 80%;
+  width: auto;
   margin-top: 180px;
   color: #656565;
   font-size: 0.9rem;
@@ -903,8 +903,9 @@ img {
 
 @media screen and (max-width: 767px) {
   .bhouseweb_loc_sec01 {
-    width: 95%;
+    width: auto;
     margin-top: 150px;
+    overflow-x: auto;
   }
 }
 
@@ -915,6 +916,24 @@ img {
   margin: 10px;
 }
 
+.bhouseweb_loc_type {
+  width: auto;
+  white-space: nowrap;
+}
+
+@media screen and (max-width: 767px) {
+  .bhouseweb_loc_type {
+    width: auto;
+    white-space: nowrap;
+  }
+}
+
+@media screen and (max-width: 767px) {
+  .bhouseweb_item_type {
+    display: inline-block;
+  }
+}
+
 @media screen and (max-width: 767px) {
   .bhouseweb_loc_sec01 .bhouseweb_loc_type,
   .bhouseweb_loc_sec01 .bhouseweb_loc_pattern,
@@ -930,7 +949,7 @@ img {
 .bhouseweb_loc_sec01 .bhouseweb_loc_size a {
   text-decoration: none;
   color: #565656;
-  padding: 5px 15px;
+  padding: 3px 15px;
 }
 
 @media screen and (max-width: 767px) {
@@ -938,7 +957,7 @@ img {
   .bhouseweb_loc_sec01 .bhouseweb_loc_pattern a,
   .bhouseweb_loc_sec01 .bhouseweb_loc_budget a,
   .bhouseweb_loc_sec01 .bhouseweb_loc_size a {
-    padding: 5px 5px;
+    padding: 3px 5px;
   }
 }
 
@@ -970,7 +989,7 @@ img {
   width: 70%;
   background: #565656 !important;
   border: none;
-  font-size: 1rem;
+  font-size: 14.4px;
   font-weight: 400;
   line-height: 1.5;
   outline: none;
@@ -980,7 +999,7 @@ img {
 @media screen and (max-width: 767px) {
   .bhouseweb_loc_search_box #bhouseweb_search {
     width: 86%;
-    font-size: 1rem;
+    font-size: 14.4px;
   }
 }
 
@@ -1101,15 +1120,6 @@ img {
   background: #fff;
 }
 
-<<<<<<< HEAD
-=======
-@media screen and (max-width: 991px) {
-  .style_house_ads {
-    padding-top: 13px;
-  }
-}
-
->>>>>>> 1c609b02ee19bc3828a818bc1da2ad8aaf04e8d3
 .style_house_ads .style_house_text {
   width: 80.5%;
   margin: 0 auto;

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 1
themes/hugo-universal-theme-master/static/css/style.bhouse.css.map


+ 25 - 13
themes/hugo-universal-theme-master/static/css/style.bhouse.scss

@@ -879,7 +879,8 @@ img {
 /* Banner end */
 /* 成家故事作品集-collection start */
 .select {
-  text-decoration: underline !important;
+  // text-decoration: underline !important;
+  border-bottom: 1.5px solid #565656 !important;
 }
 
 .bhouseweb_item_type {
@@ -915,7 +916,7 @@ img {
 }
 
 .bhouseweb_loc_sec01 {
-  width: 80%;
+  width: auto;
   margin-top: 180px;
   color: #656565;
   font-size: 0.9rem;
@@ -923,8 +924,12 @@ img {
 
 @media screen and (max-width: 767px) {
   .bhouseweb_loc_sec01 {
-    width: 95%;
+    // overflow-x: scroll;
+   width: auto;
     margin-top: 150px;
+    overflow-x: auto;
+
+  
   }
 }
 
@@ -934,6 +939,19 @@ img {
 .bhouseweb_loc_sec01 .bhouseweb_loc_size {
   margin: 10px;
 }
+.bhouseweb_loc_type{
+  width: auto;
+  white-space: nowrap;
+  @media screen and (max-width: 767px) {
+    width: auto;
+    white-space: nowrap;
+  }
+}
+.bhouseweb_item_type{
+  @media screen and (max-width: 767px) {
+    display: inline-block;
+  }
+}
 
 @media screen and (max-width: 767px) {
   .bhouseweb_loc_sec01 .bhouseweb_loc_type,
@@ -950,7 +968,7 @@ img {
 .bhouseweb_loc_sec01 .bhouseweb_loc_size a {
   text-decoration: none;
   color: #565656;
-  padding: 5px 15px;
+  padding: 3px 15px;
 }
 
 @media screen and (max-width: 767px) {
@@ -958,7 +976,7 @@ img {
   .bhouseweb_loc_sec01 .bhouseweb_loc_pattern a,
   .bhouseweb_loc_sec01 .bhouseweb_loc_budget a,
   .bhouseweb_loc_sec01 .bhouseweb_loc_size a {
-    padding: 5px 5px;
+    padding: 3px 5px;
   }
 }
 
@@ -990,7 +1008,7 @@ img {
   width: 70%;
   background: #565656 !important;
   border: none;
-  font-size: 1rem;
+  font-size: 14.4px;
   font-weight: 400;
   line-height: 1.5;
   outline: none;
@@ -1000,7 +1018,7 @@ img {
 @media screen and (max-width: 767px) {
   .bhouseweb_loc_search_box #bhouseweb_search {
     width: 86%;
-    font-size: 1rem;
+    font-size: 14.4px;
   }
 }
 
@@ -1118,15 +1136,9 @@ img {
 .style_house_ads {
   padding: 15px;
   background: #fff;
-<<<<<<< HEAD
   // @media screen and (max-width: 991px) {
   //   padding-top: 100px;
   // }
-=======
-  @media screen and (max-width: 991px) {
-    padding-top: 13px;
-  }
->>>>>>> 1c609b02ee19bc3828a818bc1da2ad8aaf04e8d3
 }
 
 .style_house_ads .style_house_text {

+ 0 - 4
themes/hugo-universal-theme-master/static/js/bhouse.js

@@ -92,12 +92,8 @@ $('.style_house_sec02 .slider-nav').slick({
   slidesToScroll: 3,
   asNavFor: '.slider-for',
   dots: false,
-<<<<<<< Updated upstream
   arrows: false,
   // centerMode: true,
-=======
-  centerMode: true,
->>>>>>> Stashed changes
   focusOnSelect: true
 });
 

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov