Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

website/src/main/resources/templates/css/style.blue.css

@@ -927,16 +927,27 @@ header.nav-holder.sticky {
   margin: 0 20px;
 }
 
+.customers .item  .item-div {
+  display: inline-block;
+  height: 100px;
+  line-height: 100px
+}
+
+.customers .item  .item-div img {
+    display: inline-block !important;
+    max-height: 100px;
+}
+
 .customers .item img {
-  -webkit-filter: grayscale(100%);
-  filter: grayscale(100%);
-  -webkit-transition: all 0.3s;
-  transition: all 0.3s;
+  /*-webkit-filter: grayscale(100%);*/
+  /*filter: grayscale(100%);*/
+  /*-webkit-transition: all 0.3s;*/
+  /*transition: all 0.3s;*/
 }
 
 .customers .item img:hover {
-  -webkit-filter: grayscale(0%);
-  filter: grayscale(0%);
+  /*-webkit-filter: grayscale(0%);*/
+  /*filter: grayscale(0%);*/
 }
 
 .testimonials .item {

website/src/main/resources/templates/index.html

@@ -181,8 +181,11 @@
                 <h2>合作公司</h2>
             </div>
             <ul class="list-unstyled owl-carousel customers no-mb">
-                    <li class="item" th:each="item : ${cooperations}"><img th:src="${{item.imageUrl}}"
-                        src="img/customer-1.png" alt="" class="img-fluid"></li>
+                <li class="item" th:each="item : ${cooperations}">
+                    <div class="item-div">
+                        <img th:src="${{item.imageUrl}}" src="img/customer-1.png" alt="" class="img-fluid">
+                    </div>
+                </li>
             </ul>
         </div>
     </section>