Merge remote-tracking branch 'origin/release-201802-wangcz' into release-201802-wangcz

src/main/webapp/resources/css/index.css

@@ -739,6 +739,7 @@ ul>li.item-link>a {
 }
 
 #home-search input {
+	padding-left: 10px;
 	width: 310px;
 	height: 30px;
 	background-color: #ffffff;
@@ -767,17 +768,17 @@ ul>li.item-link>a {
 	outline: none;
 }
 /** placeholder 格式 **/
-#home-search input::-webkit-input-placeholder{ /*WebKit browsers*/
-	padding-left: 10px;
-}
+/*#home-search input::-webkit-input-placeholder{ !*WebKit browsers*!*/
+	/*padding-left: 10px;*/
+/*}*/
 
-#home-search input::-moz-input-placeholder{ /*Mozilla Firefox*/
-	padding-left: 10px;
-}
+/*#home-search input::-moz-input-placeholder{ !*Mozilla Firefox*!*/
+	/*padding-left: 10px;*/
+/*}*/
 
-#home-search input::-ms-input-placeholder{ /*Internet Explorer*/
-	padding-left: 10px;
-}
+/*#home-search input::-ms-input-placeholder{ !*Internet Explorer*!*/
+	/*padding-left: 10px;*/
+/*}*/
 
 #home-headerName{
 	position: absolute;
@@ -3020,7 +3021,7 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 	float: right;
 }
 .pub-com_head  .p-right a{
-	color: #fff;
+	color: #fff !important ;
 	font-size: 14px;
 	margin-right: 20px;
 }