Merge branch 'master' into zxt

.project

@@ -20,12 +20,38 @@
 			<arguments>
 			<arguments>
 			</arguments>
 			</arguments>
 		</buildCommand>
 		</buildCommand>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	</buildSpec>
 	<natures>
 	<natures>
+		<nature>com.aptana.projects.webnature</nature>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1514875987450</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1514875987498</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
 </projectDescription>

WebContent/WEB-INF/res/css/basic.css

@@ -188,9 +188,5 @@
 	margin-left: 90px;
 	margin-left: 90px;
 }
 }
 
 
-.popupbos .layui-form-mid {
-	padding: 0!important;
-}
-
 
 
 /*-------------弹出框  end-------------*/
 /*-------------弹出框  end-------------*/
\ No newline at end of file