Merge branch 'master' of http://192.168.1.12:3000/S.H.I.E.L.D./Launcher

Conflicts:
	software-buliding.html

css/global.css

@@ -330,7 +330,6 @@ body{
 }
 .software-tab-pane{
   background:#fff;
-  padding:15px;
   overflow-y:auto;
 }
 .software-content .tab-pane{
@@ -376,13 +375,10 @@ body{
   padding:15px;
   border: 2px solid #fff;
   border-radius: 3px;
-  margin:0 0 15px;
+  margin:15px;
   color:#888;
   font-size: 14px;
 }
-.software-tab-pane .details:last-child{
-  margin-bottom: 0;
-}
 .details-title{
   width:85%;
   font-size: 16px;
@@ -593,10 +589,13 @@ body{
 .news-list a:hover{
   text-decoration: none;
 }
-.news-list .software-tab-pane{
+.news-list .news-item{
   border:1px solid #fff;
+  overflow: hidden;
+  padding:20px;
+  background:#fff;
 }
-.news-list .software-tab-pane:hover{
+.news-list .news-item:hover{
   border:1px solid rgba(255,101,5,0.3);
   box-shadow: 0 0 10px #ccc
 }

js/global.js

@@ -15,7 +15,7 @@ function autoFlashHeight(){
 	var softwareDetailTop = $(".software-detail-top").height();
 	$(".autoHeightL1").height($(window).height()-80);
 	$(".autoHeightL2").height($(window).height()-80-198);
-	$(".autoHeightL3").height($(window).height()-80-softwareDetailTop-46);
+	$(".autoHeightL3").height($(window).height()-80-softwareDetailTop);
 	$(".autoHeightL4").height($(window).height()-80-119);
 	// console.log($(window).height());
 	console.log($(document).height());

software-details.html

@@ -154,15 +154,13 @@
       </div>
       <div class="software-wrap">
         <div class="software-detail-top pl-3">
-          <div class="media pt-3">
+          <div class="media pt-3 pb-3">
             <img class="mr-3" src="images/product01.png" width="50" height="50" alt="广东公路造价">
             <div class="media-body">
               <h5 class="mt-0 mb-1">公路造价（增值税）</h5>
               纵横公路工程造价管理系统
             </div>
           </div>
-        </div>
-        <div class="software-detail pt-3">
           <ul class="software-nav nav nav-tabs pl-3" id="myTab" role="tablist">
             <li class="nav-item">
               <a class="nav-link active" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true"><span class="iconbg iconbg-purple rounded"><i class="fas fa-download"></i></span>下载软件</a>
@@ -171,6 +169,8 @@
               <a class="nav-link" id="profile-tab" data-toggle="tab" href="#details" role="tab" aria-controls="profile" aria-selected="false"><span class="iconbg iconbg-green rounded"><i class="fas fa-info"></i></span>软件详情</a>
             </li>
           </ul>
+        </div>
+        <div class="software-detail">
           <div class="tab-content software-content" id="myTabContent">
             <div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab">
               <div class="software-tab-pane autoHeightL3">

software-index.html

@@ -213,15 +213,13 @@
           </div>
           <div class="local-install">
             <div class="software-detail-top pl-3">
-              <div class="media pt-3">
+              <div class="media pt-3 pb-3">
                 <img class="mr-3" src="images/product01.png" width="50" height="50" alt="广东公路造价">
                 <div class="media-body">
                   <h5 class="mt-0 mb-1">公路造价（增值税）</h5>
                   纵横公路工程造价管理系统
                 </div>
               </div>
-            </div>
-            <div class="software-detail pt-3">
               <ul class="software-nav nav nav-tabs pl-3" id="myTab" role="tablist">
                 <li class="nav-item">
                   <a class="nav-link active" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true"><span class="iconbg iconbg-purple rounded"><i class="fas fa-download"></i></span>下载软件</a>
@@ -233,6 +231,8 @@
                   <a class="nav-link" id="profile-tab" data-toggle="tab" href="#videos" role="tab" aria-controls="profile" aria-selected="false"><span class="iconbg iconbg-yellow rounded"><i class="fas fa-video"></i></span>动画教程</a>
                 </li>
               </ul>
+            </div>
+            <div class="software-detail">
               <div class="tab-content software-content" id="myTabContent">
                 <div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab">
                   <div class="software-tab-pane autoHeightL3">

software-news.html

@@ -158,7 +158,7 @@
         </div>
       </div>
       <div class="software-wrap news-content">
-        <div class="software-wrapscroll pt-3 autoHeightL1">
+        <div class="software-wrapscroll autoHeightL1">
           <div class="software-left">
             <div class="local-software mt-4">
               <div class="software media active">
@@ -185,7 +185,7 @@
           </div>
           <div class="local-install">
             <div class="news-list p-3">
-              <div class="software-tab-pane mb-3">
+              <div class="news-item mb-3">
                 <a href="#">
                   <div class="row">
                     <div class="col-4">
@@ -199,7 +199,7 @@
                   </div>
                 </a>
               </div>
-              <div class="software-tab-pane mb-3">
+              <div class="news-item mb-3">
                 <a href="#">
                   <div class="row">
                     <div class="col-4">