合并分支 'dev-fix/#20' 到 'dev'

更换logo和轮播图图片 #20

查看合并请求 QJMIS-CPD/CPD_company_site/web_company_site!37

css/index.css

@@ -19,11 +19,15 @@
 }
 
 /* logo */
+#top_nav .main_body {
+    width: 1400px;
+}
+
 #top_nav .logo {
     cursor: pointer;
-    width: 238px;
+    width: 453px;
     height: 50px;
-    background: url("../images/logo-02.svg") no-repeat;
+    background: url("../images/logo-03.png") center center no-repeat;
 }
 
 
@@ -111,12 +115,13 @@
 }
 
 #header .banner .banner_box1 {
-    background: url('../images/banner1.jpg') no-repeat;
+    background: url('../images/banner1_1.png') no-repeat;
 }
 
 #header .banner_box1 .banner_text {
-    top: 607px;
-    text-align: center;
+    top: 468px;
+    width: 500px;
+    text-align: left;
 }
 
 #header .banner_box1 .banner_text p {
@@ -124,7 +129,12 @@
 }
 
 #header .banner_box1 .text1_top {
-    font: 500 50px/50px 'Microsoft';
+    font: 500 62px/62px 'Microsoft';
+    color: #000;
+}
+#header .banner_box1 .text1_top span{
+    color: #ffb11d;
+    font-size: 73px;
 }
 
 #header .banner_box1 .text1_center {
@@ -135,13 +145,15 @@
 
 #header .banner_box1 .text1_bottom {
     margin-top: 20px;
-    font: 100 20PX/20PX 'calibril';
+    font: 100 14PX/14PX 'calibril';
     letter-spacing: 2px;
+    text-align: center;
+    color: #000;
 }
 
 /* 第二屏轮播 */
 #header .banner .banner_box2 {
-    background: url('../images/banner2.jpg') no-repeat;
+    background: url('../images/banner2_2.jpg') no-repeat;
 }
 
 #header .banner_box2 .banner_text {

index.html

@@ -49,16 +49,15 @@
                 <ul class="carousel-indicators">
                     <li data-target="#carouselExampleIndicators" data-slide-to="0" class="active"></li>
                     <li data-target="#carouselExampleIndicators" data-slide-to="1"></li>
-                    <li data-target="#carouselExampleIndicators" data-slide-to="2"></li>
+                    <!-- <li data-target="#carouselExampleIndicators" data-slide-to="2"></li> -->
                 </ul>
                 <div class="carousel-inner">
                     <div class="carousel-item active">
                         <div class="banner_child banner_box1">
                             <div class="shade"></div>
                             <div class="banner_text">
-                                <p class="text1_top">「与千家同行」</p>
-                                <p class="text1_center">加入我们 成为我们</p>
-                                <p class="text1_bottom">JOIN US AND BECOME US</p>
+                                <p class="text1_top">科技助力 <span>新平台</span></p>
+                                <p class="text1_bottom">New Platform of Science and Technology Help</p>
                             </div>
                         </div>
                     </div>
@@ -66,12 +65,12 @@
                         <div class="banner_child banner_box2">
                             <div class="shade"></div>
                             <div class="banner_text">
-                                <p class="text2_top">助天下人&nbsp;&nbsp;人有其居</p>
-                                <p class="text2_bottom">HELP EVERYONE TO LIVE IN THE WORLE</p>
+                                <!-- <p class="text2_top">助天下人&nbsp;&nbsp;人有其居</p>
+                                <p class="text2_bottom">HELP EVERYONE TO LIVE IN THE WORLE</p> -->
                             </div>
                         </div>
                     </div>
-                    <div class="carousel-item">
+                    <!-- <div class="carousel-item">
                         <div class="banner_child banner_box3">
                             <div class="shade"></div>
                             <div class="banner_text">
@@ -84,7 +83,7 @@
                                 </p>
                             </div>
                         </div>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             </a>