grunt

dist/index.html

@@ -7,26 +7,26 @@
     <meta name="description" content="百度脑图，便捷的脑图编辑工具。让您在线上直接创建、保存并分享你的思路。">
 
 
-    <script src="lib/jquery-2.1.0.min.js?_=1399636761167" charset="utf-8"></script>
-    <script src="lib/ZeroClipboard.min.js?_=1399636761167" charset="utf-8"></script>
+    <script src="lib/jquery-2.1.0.min.js?_=1399639052839" charset="utf-8"></script>
+    <script src="lib/ZeroClipboard.min.js?_=1399639052839" charset="utf-8"></script>
     <script type="text/javascript">
         ZeroClipboard.setDefaults( { moviePath: 'lib/ZeroClipboard.swf' } );
     </script>
 
-    <script src="lib/kitygraph.all.min.js?_=1399636761167" charset="utf-8"></script>
-    <script src="kityminder.all.min.js?_=1399636761167" charset="utf-8"></script>
-    <script src="kityminder.config.js?_=1399636761167" charset="utf-8"></script>
-    <script src="lang/zh-cn/zh-cn.js?_=1399636761167" charset="utf-8"></script>
+    <script src="lib/kitygraph.all.min.js?_=1399639052839" charset="utf-8"></script>
+    <script src="kityminder.all.min.js?_=1399639052839" charset="utf-8"></script>
+    <script src="kityminder.config.js?_=1399639052839" charset="utf-8"></script>
+    <script src="lang/zh-cn/zh-cn.js?_=1399639052839" charset="utf-8"></script>
     
-    <script src="lib/zip.js?_=1399636761167" charset="utf-8"></script>
+    <script src="lib/zip.js?_=1399639052839" charset="utf-8"></script>
     <script>
         zip.inflateJSPath = 'lib/inflate.js';
     </script>
 
-    <script src="lib/jquery.xml2json.js?_=1399636761167" charset="utf-8"></script>
-    <script src="lib/baidu-frontia-js-full-1.0.0.js?_=1399636761167" charset="utf-8"></script>
-    <script src="social/draftmanager.js?_=1399636761167" charset="utf-8"></script>
-    <script src="social/social.js?_=1399636761167" charset="utf-8"></script>
+    <script src="lib/jquery.xml2json.js?_=1399639052839" charset="utf-8"></script>
+    <script src="lib/baidu-frontia-js-full-1.0.0.js?_=1399639052839" charset="utf-8"></script>
+    <script src="social/draftmanager.js?_=1399639052839" charset="utf-8"></script>
+    <script src="social/social.js?_=1399639052839" charset="utf-8"></script>
     <link href="social/social.css" rel="stylesheet">
    
     <link href="themes/default/css/import.css" type="text/css" rel="stylesheet" />

dist/kityminder.all.js

@@ -3167,10 +3167,10 @@ KityMinder.registerModule( "LayoutDefault", function () {
 			case "sub":
 				if ( highlight ) {
 					Layout.highlightshape.fill( nodeStyle.highlight ).setOpacity( 1 );
-					node.getTextShape().fill( 'black' );
+					node.getTextShape().fill( node.getData( 'fontcolor' ) || 'black' );
 				} else {
 					Layout.highlightshape.setOpacity( 0 );
-					node.getTextShape().fill( 'white' );
+					node.getTextShape().fill( node.getData( 'fontcolor' ) || 'white' );
 				}
 				break;
 			default:
@@ -5640,7 +5640,7 @@ Minder.Receiver = kity.createClass( 'Receiver', {
     },
     setContainerStyle: function () {
         var textShapeBox = this.getBaseOffset( 'screen' );
-        this.container.style.cssText = ";left:" + textShapeBox.x + 'px;top:' + ( textShapeBox.y - 35 ) + 'px;width:' + textShapeBox.width + 'px;height:' + textShapeBox.height + 'px;';
+        this.container.style.cssText = ";left:" + textShapeBox.x + 'px;top:' + ( textShapeBox.y - 5 ) + 'px;width:' + textShapeBox.width + 'px;height:' + textShapeBox.height + 'px;';
 
         if ( !this.selection.isShow() ) {
             var paperContainer = this.km.getPaper();