合并分支

css/global.css

@@ -681,7 +681,7 @@ li.search .topSerach input[type=submit]:active{
 }
 .trainItem{
   margin:1px 0 0 0;
-  padding:0 20px 0 20px
+  padding:30px 20px 0 20px
 }
 .trainItem .tLeft,.trainItem .tRight{
   width:470px
@@ -694,7 +694,7 @@ li.search .topSerach input[type=submit]:active{
   float:left;
   background:#ededed;
   height:50px;
-  margin:0 20px 10px 0;
+  margin:0 0 10px 0;
   padding:0 20px
 } 
 .trainEntry a{
@@ -1969,95 +1969,95 @@ border:none
 .mainContent_con{
 }
 .security_h{
-	text-align:center;
-	margin:45px 0 20px;
-	font-size:30px;
-	color:#666;
+  text-align:center;
+  margin:45px 0 20px;
+  font-size:30px;
+  color:#666;
 }
 .security_con{
-	position:relative;
-	text-align:center;
-	background:url(securityBg.png) no-repeat 255px 0;
-	margin:15px 0 35px 0;
+  position:relative;
+  text-align:center;
+  background:url(securityBg.png) no-repeat 255px 0;
+  margin:15px 0 35px 0;
 }
 .security_inputLock{
-	text-align:center;
-	padding:45px 0;
+  text-align:center;
+  padding:45px 0;
 }
 .security_inputLock span{
-	position:relative;
-	font-size:30px;
+  position:relative;
+  font-size:30px;
 }
 .security_input{
-	width:240px;
-	font-size:30px;
-	border:none;
-	background:#f3f3f3;
-	color:#ff6501;
-	padding:3px 0 3px 10px;
+  width:240px;
+  font-size:30px;
+  border:none;
+  background:#f3f3f3;
+  color:#ff6501;
+  padding:3px 0 3px 10px;
 }
 .security_inputLock .tips{
-	position:absolute;
-	left:15px;
-	top:5px;
+  position:absolute;
+  left:15px;
+  top:5px;
 }
 .security_Lock{
-	position:absolute;
-	z-index:99;
-	left:350px;
-	top:90px;
-	display:none;
+  position:absolute;
+  z-index:99;
+  left:350px;
+  top:90px;
+  display:none;
 }
 .security_btn{
-	margin:50px 0;
-	text-align:center;
+  margin:50px 0;
+  text-align:center;
 }
 .security_btn a{
-	text-decoration:none;
+  text-decoration:none;
 }
 .btn_security{
-	font-size:30px;
-	color:#fff;
-	background:#ff6501;
-	border-radius:5px;
-	-moz-border-radius:5px;
+  font-size:30px;
+  color:#fff;
+  background:#ff6501;
+  border-radius:5px;
+  -moz-border-radius:5px;
     -webkit-border-radius:5px;
-	padding:10px 100px;
+  padding:10px 100px;
   border:none
 }
 .btn_security:hover{
-	color:#fff;
-	background:#ec5d00;
+  color:#fff;
+  background:#ec5d00;
   border:none
 }
 .btn_security:active{
-	color:#fff;
-	background:#ff6501;
+  color:#fff;
+  background:#ff6501;
   border:none
 }
 .piracy_con{ 
     text-align:center;
-	margin:65px 0;
-	text-align:center;
-	font-size:20px;
-	color:#ff6501;
+  margin:65px 0;
+  text-align:center;
+  font-size:20px;
+  color:#ff6501;
 }
 .genuine_con{
-	margin:45px 0;
-	color:#666;
+  margin:45px 0;
+  color:#666;
 }
 .genuine_con h2{
-	text-align:center;
-	height:45px;
-	line-height:45px;
-	font-size:20px;
+  text-align:center;
+  height:45px;
+  line-height:45px;
+  font-size:20px;
 }
 .genuine_con ul{
-	margin:0 0 0 326px;
+  margin:0 0 0 326px;
 }
 .genuine_con ul li{
-	font-size:16px;
-	padding:3px 0;
+  font-size:16px;
+  padding:3px 0;
 }
 .trainingCon ul li{
   float:left;
@@ -3052,44 +3052,6 @@ border:none
 .download-select .downSelect{
   margin:20px 0 0;
 }
-<<<<<<< HEAD
-.province .nav li{
-  float:left;
-  /*width:80px;*/
-  height:50px;
-}
-.province .nav li a{
-  display: inline-block;
-  /*width: 80px;*/
-  padding:0 8px;
-  border-left: 1px solid #ccc;
-  text-align: center;
-  font-size: 16px;
-  height: 18px;
-  line-height: 18px;
-  margin-top: 32px;
-  margin-left: -1px;
-  font-weight: 600;
-  color: #666;
-  cursor: pointer; 
-}
-.province .nav li a:hover{
-  text-decoration: none;
-  color:#333;
-}
-.province .nav li:first-child a{
-  border-left: none;
-}
-.province .nav li.active a{
-  color:#B2005E;
-  cursor:default;
-}
-.province.provinceTwo ul li a{
-  padding:0 20px;
-}
-.province.provinceTwo ul li:first-child a{
-  padding:0 8px;
-=======
 /*联系我们*/
 .contact-tab{
   padding:0 0 20px 0
@@ -3239,7 +3201,6 @@ border:none
   text-align:left;
   font-size:18px;
   padding-bottom:10px
->>>>>>> 联系我们改版
 }
 /* 2016年春节彩蛋
 .warp-body {
@@ -3304,25 +3265,4 @@ border:none
   0%,100%{transform:translateY(0);}
   10%,30%,50%,70%,90%{transform:translateY(-5px);}
   20%,40%,60%,80%{transform:translateY(8px);}
-  }*/
-.downCont{
-  font-size: 16px;
-  padding:25px 0;
-}
-.btndown{
-  display: inline-block;
-  font-size: 14px;
-  font-weight: bold;
-  border: 1px solid #10D25F;
-  padding: 12px 26px;
-  margin: 0 0 0 25px;
-  background: #10D25F;
-  color: #fff;
-  border-radius: 5px;
-}
-.btndown:hover{
-  color:#fff;
-  background:#0db451;
-  border: 1px solid #0db451;
-  text-decoration: none;
-}
+  }*/