Skip to content

K
kityminder-core
Commit 2084f398 authored by techird's avatar techird
Browse files
Options

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

parents 2407e80b fedca98b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 218 deletions
src/module/layout.bottom.js
View file @ 2084f398
This diff is collapsed.
src/module/layout.default.js
View file @ 2084f398
...@@ -219,7 +219,7 @@ KityMinder.registerModule( "LayoutDefault", function () { ...@@ -219,7 +219,7 @@ KityMinder.registerModule( "LayoutDefault", function () {
} else { } else {
if ( action === "append" || action === "contract" ) { if ( action === "append" || action === "contract" ) {
Layout.branchheight = node.getRenderContainer().getHeight() + nodeStyle.margin[ 0 ] + nodeStyle.margin[ 2 ]; Layout.branchheight = node.getRenderContainer().getHeight() + nodeStyle.margin[ 0 ] + nodeStyle.margin[ 2 ];
} else if ( action === "change" ) { //展开 } else if ( action === "change" ) {
Layout.branchheight = countBranchHeight( node ); Layout.branchheight = countBranchHeight( node );
} }
var parentLayout = parent.getLayout(); var parentLayout = parent.getLayout();
......
themes/default/_css/markers.css
View file @ 2084f398
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
margin: 0; margin: 0;
list-style: none; list-style: none;
cursor: pointer; cursor: pointer;
color: #333 color: #333;
font-family:Arial, "Heiti SC", "Microsoft Yahei";
} }
.icon-list li:hover,.icon-list li.active{ .icon-list li:hover,.icon-list li.active{
background: #cfe0f7 background: #cfe0f7
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment