Skip to content

Commit 1cb2b6c

Browse files
committed
update css file
1 parent 07b5cfa commit 1cb2b6c

File tree

4 files changed

+18
-16
lines changed

4 files changed

+18
-16
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "orgchart",
3-
"version": "1.2.4",
3+
"version": "1.2.5",
44
"homepage": "https://github.com/dabeng/OrgChart",
55
"authors": [
66
"dabeng <dabeng413@gmail.com>"

dist/css/jquery.orgchart.css

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,21 +101,23 @@
101101
padding: 0;
102102
}
103103

104-
.orgchart td.top {
104+
.orgchart tr.lines td.topLine {
105105
border-top: 2px solid rgba(217, 83, 79, 0.8);
106106
}
107107

108-
.orgchart td.right {
108+
.orgchart tr.lines td.rightLine {
109109
border-right: 1px solid rgba(217, 83, 79, 0.8);
110110
float: none;
111+
border-radius: 0px;
111112
}
112113

113-
.orgchart td.left {
114+
.orgchart tr.lines td.leftLine {
114115
border-left: 1px solid rgba(217, 83, 79, 0.8);
115116
float: none;
117+
border-radius: 0px;
116118
}
117119

118-
.orgchart td>.down {
120+
.orgchart tr.lines .downLine {
119121
background-color: rgba(217, 83, 79, 0.8);
120122
margin: 0px auto;
121123
height: 20px;

dist/js/jquery.orgchart.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -863,8 +863,8 @@
863863
if (!$dropZone.closest('tr').siblings().length) { // if the drop zone is a leaf node
864864
$dropZone.append('<i class="edge verticalEdge bottomEdge fa"></i>')
865865
.parent().attr('colspan', 2)
866-
.parent().after('<tr class="lines"><td colspan="2"><div class="down"></div></td></tr>'
867-
+ '<tr class="lines"><td class="right">&nbsp;</td><td class="left">&nbsp;</td></tr>'
866+
.parent().after('<tr class="lines"><td colspan="2"><div class="downLine"></div></td></tr>'
867+
+ '<tr class="lines"><td class="rightLine">&nbsp;</td><td class="leftLine">&nbsp;</td></tr>'
868868
+ '<tr class="nodes"></tr>')
869869
.siblings(':last').append($dragged.find('.horizontalEdge').remove().end().closest('table').parent());
870870
} else {
@@ -874,7 +874,7 @@
874874
if (!$dragged.find('.horizontalEdge').length) {
875875
$dragged.append(horizontalEdges);
876876
}
877-
$dropZone.closest('tr').siblings().eq(1).children(':last').before('<td class="left top">&nbsp;</td><td class="right top">&nbsp;</td>')
877+
$dropZone.closest('tr').siblings().eq(1).children(':last').before('<td class="leftLine topLine">&nbsp;</td><td class="rightLine topLine">&nbsp;</td>')
878878
.end().next().append($dragged.closest('table').parent());
879879
var $dropSibs = $dragged.closest('table').parent().siblings().find('.node:first');
880880
if ($dropSibs.length === 1) {
@@ -943,14 +943,14 @@
943943

944944
// draw the line close to parent node
945945
if (!isVerticalLayer) {
946-
$nodeWrapper.append('<tr class="lines' + isHidden + '"><td colspan="' + $childNodes.length * 2 + '"><div class="down"></div></td></tr>');
946+
$nodeWrapper.append('<tr class="lines' + isHidden + '"><td colspan="' + $childNodes.length * 2 + '"><div class="downLine"></div></td></tr>');
947947
}
948948
// draw the lines close to children nodes
949-
var lineLayer = '<tr class="lines' + isHidden + '"><td class="right">&nbsp;</td>';
949+
var lineLayer = '<tr class="lines' + isHidden + '"><td class="rightLine">&nbsp;</td>';
950950
for (var i=1; i<$childNodes.length; i++) {
951-
lineLayer += '<td class="left top">&nbsp;</td><td class="right top">&nbsp;</td>';
951+
lineLayer += '<td class="leftLine topLine">&nbsp;</td><td class="rightLine topLine">&nbsp;</td>';
952952
}
953-
lineLayer += '<td class="left">&nbsp;</td></tr>';
953+
lineLayer += '<td class="leftLine">&nbsp;</td></tr>';
954954
var $nodeLayer;
955955
if (isVerticalLayer) {
956956
$nodeLayer = $('<ul>');
@@ -1005,8 +1005,8 @@
10051005
$.when(createNode(nodeData, 0, opts || $currentRoot.closest('.orgchart').data('options')))
10061006
.done(function($nodeDiv) {
10071007
$table.append($nodeDiv.removeClass('slide-up').addClass('slide-down').wrap('<tr class="hidden"><td colspan="2"></td></tr>').closest('tr'));
1008-
$table.append('<tr class="lines hidden"><td colspan="2"><div class="down"></div></td></tr>');
1009-
var linesRow = '<td class="right">&nbsp;</td><td class="left">&nbsp;</td>';
1008+
$table.append('<tr class="lines hidden"><td colspan="2"><div class="downLine"></div></td></tr>');
1009+
var linesRow = '<td class="rightLine">&nbsp;</td><td class="leftLine">&nbsp;</td>';
10101010
$table.append('<tr class="lines hidden">' + linesRow + '</tr>');
10111011
var $oc = that.children('.orgchart');
10121012
$oc.prepend($table)
@@ -1033,7 +1033,7 @@
10331033
function complementLine($oneSibling, siblingCount, existingSibligCount) {
10341034
var lines = '';
10351035
for (var i = 0; i < existingSibligCount; i++) {
1036-
lines += '<td class="left top">&nbsp;</td><td class="right top">&nbsp;</td>';
1036+
lines += '<td class="leftLine topLine">&nbsp;</td><td class="rightLine topLine">&nbsp;</td>';
10371037
}
10381038
$oneSibling.parent().prevAll('tr:gt(0)').children().attr('colspan', siblingCount * 2)
10391039
.end().next().children(':first').after(lines);

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "orgchart",
3-
"version": "1.2.4",
3+
"version": "1.2.5",
44
"description": "Simple and direct organization chart(tree-like hierarchy) plugin based on pure DOM and jQuery.",
55
"main": "./dist/js/jquery.orgchart.js",
66
"style": [

0 commit comments

Comments
 (0)