develop_Yu 2 rokov pred
rodič
commit
be76e75cf8

+ 1 - 1
layouts/collection/single.html

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

+ 2 - 3
themes/hugo-universal-theme-master/static/css/style.bhouse.css

@@ -1101,15 +1101,12 @@ 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;
@@ -1798,6 +1795,7 @@ img {
 }
 
 .blog_article p {
+  margin-bottom: 0;
   line-height: 32px;
   letter-spacing: 1px;
   font-family: NSJP-400;
@@ -1839,6 +1837,7 @@ img {
   -ms-flex-direction: column;
   flex-direction: column;
   border: 2px solid var(--second-color);
+  margin-bottom: 50px;
 }
 
 .blog_article .question-box ul {

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


+ 2 - 6
themes/hugo-universal-theme-master/static/css/style.bhouse.scss

@@ -1118,15 +1118,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 {
@@ -1830,6 +1824,7 @@ img {
 }
 
 .blog_article p {
+  margin-bottom: 0;
   line-height: 32px;
   letter-spacing: 1px;
   font-family: NSJP-400;
@@ -1871,6 +1866,7 @@ img {
   -ms-flex-direction: column;
   flex-direction: column;
   border: 2px solid var(--second-color);
+  margin-bottom: 50px;
 }
 
 .blog_article .question-box ul {

+ 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