Merge remote-tracking branch 'origin/exhibition1209' into exhibition1209

# Conflicts:
#	src/css/qaPage.less

src/css/qaPage.less

@@ -13,7 +13,6 @@
     border-radius: 2px;
   }
 }
-
 .contentTitle{
   font-size: 16px;
   height: 44px;
@@ -62,6 +61,9 @@
   -moz-box-shadow: #58a6e7 0px 0px 2px;
   box-shadow: #58a6e7 0px 0px 2px;
 }
+.infoTxt::-webkit-input-placeholder{
+	color: #6794A8;
+}
 .loading{
   color: #aaa;
   text-align: center;

src/html/knowledgeGraph.html

@@ -22,7 +22,7 @@
 		</div>
 		<div class="content clearfix">
 			<div class="left">
-				<div id="main" class="mapWrapper" style="width: 796px;height:600px;cursor: pointer;"></div>
+				<div id="main" class="mapWrapper" style="width: 796px;height:600px;cursor: pointer;background-color: #00193D"></div>
 				<div class="legendIcon">
 					<div class="legendIconImg"></div>
 				</div>