Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

src/module/layout.default.js

@@ -219,7 +219,7 @@ KityMinder.registerModule( "LayoutDefault", function () {
 		} else {
 			if ( action === "append" || action === "contract" ) {
 				Layout.branchheight = node.getRenderContainer().getHeight() + nodeStyle.margin[ 0 ] + nodeStyle.margin[ 2 ];
-			} else if ( action === "change" ) { //展开
+			} else if ( action === "change" ) {
 				Layout.branchheight = countBranchHeight( node );
 			}
 			var parentLayout = parent.getLayout();

themes/default/_css/markers.css

@@ -13,7 +13,8 @@
     margin: 0;
     list-style: none;
     cursor: pointer;
-    color: #333
+    color: #333;
+    font-family:Arial, "Heiti SC", "Microsoft Yahei";
 }
 .icon-list li:hover,.icon-list li.active{
     background: #cfe0f7