Skip to content

Commit b846576

Browse files
dabengdabeng
authored
Merge pull request #543 from dabeng/oc-icons
Remove the dependency of font-awesome
2 parents f3db92a + 45bee67 commit b846576

40 files changed

+705
-226
lines changed

‎demo/ajax-datasource.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="utf-8">
55
<title>Organization Chart Plugin</title>
66
<link rel="icon" href="img/logo.png">
7-
<link rel="stylesheet" href="css/font-awesome.min.css">
87
<link rel="stylesheet" href="css/jquery.orgchart.css">
98
<link rel="stylesheet" href="css/style.css">
109
</head>

‎demo/bottom2top.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="utf-8">
55
<title>Organization Chart Plugin</title>
66
<link rel="icon" href="img/logo.png">
7-
<link rel="stylesheet" href="css/font-awesome.min.css">
87
<link rel="stylesheet" href="css/jquery.orgchart.css">
98
<link rel="stylesheet" href="css/style.css">
109
</head>

‎demo/center-on-selected-node.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<title>Organization Chart Plugin</title>
88
<link rel="icon" href="img/logo.png">
9-
<link rel="stylesheet" href="css/font-awesome.min.css">
109
<link rel="stylesheet" href="css/jquery.orgchart.css">
1110
<link rel="stylesheet" href="css/style.css">
1211
<style type="text/css">

‎demo/color-coded.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="utf-8">
55
<title>Organization Chart Plugin</title>
66
<link rel="icon" href="img/logo.png">
7-
<link rel="stylesheet" href="css/font-awesome.min.css">
87
<link rel="stylesheet" href="css/jquery.orgchart.css">
98
<link rel="stylesheet" href="css/style.css">
109
<style type="text/css">

‎demo/css/style.css‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ html,body {
77

88
body {
99
font-family: Arial;
10-
font-size: 14px;
11-
line-height: 1.428571429;
1210
color: #333333;
1311
}
1412

‎demo/custom-template.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="utf-8">
55
<title>Organization Chart Plugin</title>
66
<link rel="icon" href="img/logo.png">
7-
<link rel="stylesheet" href="css/font-awesome.min.css">
87
<link rel="stylesheet" href="css/jquery.orgchart.css">
98
<link rel="stylesheet" href="css/style.css">
109
</head>

‎demo/default-collapsed.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="utf-8">
55
<title>Organization Chart Plugin</title>
66
<link rel="icon" href="img/logo.png">
7-
<link rel="stylesheet" href="css/font-awesome.min.css">
87
<link rel="stylesheet" href="css/jquery.orgchart.css">
98
<link rel="stylesheet" href="css/style.css">
109
</head>

‎demo/drag-drop.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="utf-8">
55
<title>Organization Chart Plugin</title>
66
<link rel="icon" href="img/logo.png">
7-
<link rel="stylesheet" href="css/font-awesome.min.css">
87
<link rel="stylesheet" href="css/jquery.orgchart.css">
98
<link rel="stylesheet" href="css/style.css">
109
<style type="text/css">

‎demo/edit-chart.html‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,13 @@
44
<meta charset="utf-8">
55
<title>Organization Chart Plugin</title>
66
<link rel="icon" href="img/logo.png">
7-
<link rel="stylesheet" href="css/font-awesome.min.css">
87
<link rel="stylesheet" href="css/jquery.orgchart.css">
98
<link rel="stylesheet" href="css/style.css">
109
<style type="text/css">
1110
#chart-container { background-color: #eee; height: 500px; }
1211
.orgchart { background: #fff; }
1312
.orgchart.edit-state .edge { display: none; }
14-
.orgchart .node { width: 150px; }
1513
.orgchart .node .title { height: 30px; line-height: 30px; }
16-
.orgchart .node .title .symbol { margin-top: 1px; }
1714
#edit-panel {
1815
position: relative;
1916
left: 10px;
@@ -25,7 +22,17 @@
2522
color: #fff;
2623
background-color: #449d44;
2724
}
28-
#edit-panel .btn-inputs { font-size: 24px; }
25+
#edit-panel .btn-inputs::before {
26+
background-color: #fff;
27+
color: #449d44;
28+
width: 1.5rem;
29+
height: 1.5rem;
30+
border-radius: 0.75rem;
31+
font-size: 1.5rem;
32+
}
33+
#edit-panel .btn-inputs { vertical-align: sub; }
34+
#edit-panel.edit-parent-node .btn-inputs { display: none; }
35+
#edit-panel .btn-inputs:hover::before { font-weight: bolder; }
2936
#edit-panel.edit-state>:not(#chart-state-panel) { display: none; }
3037
#edit-panel label { font-weight: bold; }
3138
#edit-panel.edit-parent-node .selected-node-group { display: none; }
@@ -64,9 +71,6 @@
6471
vertical-align: text-top;
6572
}
6673
#new-nodelist>* { padding-bottom: 4px; }
67-
.btn-inputs { vertical-align: sub; }
68-
#edit-panel.edit-parent-node .btn-inputs { display: none; }
69-
.btn-inputs:hover { text-shadow: 0 0 4px #fff; }
7074
.radio-panel input[type='radio'] { display: inline-block;height: 24px;width: 24px;vertical-align: top; }
7175
#edit-panel.view-state .radio-panel input[type='radio']+label { vertical-align: -webkit-baseline-middle; }
7276
#btn-add-nodes { margin-left: 20px; }
@@ -85,8 +89,8 @@
8589
<ul id="new-nodelist">
8690
<li><input type="text" class="new-node"></li>
8791
</ul>
88-
<i class="fa fa-plus-circle btn-inputs" id="btn-add-input"></i>
89-
<i class="fa fa-minus-circle btn-inputs" id="btn-remove-input"></i>
92+
<i class="oci oci-plus-circle btn-inputs" id="btn-add-input"></i>
93+
<i class="oci oci-minus-circle btn-inputs" id="btn-remove-input"></i>
9094
<span id="node-type-panel" class="radio-panel">
9195
<input type="radio" name="node-type" id="rd-parent" value="parent"><label for="rd-parent">Parent(root)</label>
9296
<input type="radio" name="node-type" id="rd-child" value="children"><label for="rd-child">Child</label>
@@ -120,7 +124,6 @@
120124
'chartClass': 'edit-state',
121125
'exportButton': true,
122126
'exportFilename': 'SportsChart',
123-
'parentNodeSymbol': 'fa-th-large',
124127
'createNode': function($node, data) {
125128
$node[0].id = getId();
126129
}
@@ -203,7 +206,6 @@
203206
'data' : { 'name': nodeVals[0] },
204207
'exportButton': true,
205208
'exportFilename': 'SportsChart',
206-
'parentNodeSymbol': 'fa-th-large',
207209
'createNode': function($node, data) {
208210
$node[0].id = getId();
209211
}

‎demo/expand-to-given-depth.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="utf-8">
55
<title>Organization Chart Plugin</title>
66
<link rel="icon" href="img/logo.png">
7-
<link rel="stylesheet" href="css/font-awesome.min.css">
87
<link rel="stylesheet" href="css/jquery.orgchart.css">
98
<link rel="stylesheet" href="css/style.css">
109
<style type="text/css">

0 commit comments

Comments
 (0)