Skip to content

Remove the dependency of font-awesome #543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 20, 2020
Merged

Remove the dependency of font-awesome #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f44deb8
remove the font-awesome dependency
dabeng Jan 15, 2020
571fc97
WIP: refactor all the demos
dabeng Jan 19, 2020
ccc4e25
WIP: add oci icon
dabeng Jan 19, 2020
89df488
WIP: refactor the styles of oci
dabeng Jan 19, 2020
163e083
WIP: add oci
dabeng Jan 20, 2020
45bee67
add oci icons
dabeng Jan 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion demo/ajax-datasource.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
</head>
Expand Down
1 change: 0 additions & 1 deletion demo/bottom2top.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
</head>
Expand Down
1 change: 0 additions & 1 deletion demo/center-on-selected-node.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
<style type="text/css">
Expand Down
1 change: 0 additions & 1 deletion demo/color-coded.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
<style type="text/css">
Expand Down
2 changes: 0 additions & 2 deletions demo/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ html,body {

body {
font-family: Arial;
font-size: 14px;
line-height: 1.428571429;
color: #333333;
}

Expand Down
1 change: 0 additions & 1 deletion demo/custom-template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
</head>
Expand Down
1 change: 0 additions & 1 deletion demo/default-collapsed.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
</head>
Expand Down
1 change: 0 additions & 1 deletion demo/drag-drop.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
<style type="text/css">
Expand Down
24 changes: 13 additions & 11 deletions demo/edit-chart.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,13 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
<style type="text/css">
#chart-container { background-color: #eee; height: 500px; }
.orgchart { background: #fff; }
.orgchart.edit-state .edge { display: none; }
.orgchart .node { width: 150px; }
.orgchart .node .title { height: 30px; line-height: 30px; }
.orgchart .node .title .symbol { margin-top: 1px; }
#edit-panel {
position: relative;
left: 10px;
Expand All @@ -25,7 +22,17 @@
color: #fff;
background-color: #449d44;
}
#edit-panel .btn-inputs { font-size: 24px; }
#edit-panel .btn-inputs::before {
background-color: #fff;
color: #449d44;
width: 1.5rem;
height: 1.5rem;
border-radius: 0.75rem;
font-size: 1.5rem;
}
#edit-panel .btn-inputs { vertical-align: sub; }
#edit-panel.edit-parent-node .btn-inputs { display: none; }
#edit-panel .btn-inputs:hover::before { font-weight: bolder; }
#edit-panel.edit-state>:not(#chart-state-panel) { display: none; }
#edit-panel label { font-weight: bold; }
#edit-panel.edit-parent-node .selected-node-group { display: none; }
Expand Down Expand Up @@ -64,9 +71,6 @@
vertical-align: text-top;
}
#new-nodelist>* { padding-bottom: 4px; }
.btn-inputs { vertical-align: sub; }
#edit-panel.edit-parent-node .btn-inputs { display: none; }
.btn-inputs:hover { text-shadow: 0 0 4px #fff; }
.radio-panel input[type='radio'] { display: inline-block;height: 24px;width: 24px;vertical-align: top; }
#edit-panel.view-state .radio-panel input[type='radio']+label { vertical-align: -webkit-baseline-middle; }
#btn-add-nodes { margin-left: 20px; }
Expand All @@ -85,8 +89,8 @@
<ul id="new-nodelist">
<li><input type="text" class="new-node"></li>
</ul>
<i class="fa fa-plus-circle btn-inputs" id="btn-add-input"></i>
<i class="fa fa-minus-circle btn-inputs" id="btn-remove-input"></i>
<i class="oci oci-plus-circle btn-inputs" id="btn-add-input"></i>
<i class="oci oci-minus-circle btn-inputs" id="btn-remove-input"></i>
<span id="node-type-panel" class="radio-panel">
<input type="radio" name="node-type" id="rd-parent" value="parent"><label for="rd-parent">Parent(root)</label>
<input type="radio" name="node-type" id="rd-child" value="children"><label for="rd-child">Child</label>
Expand Down Expand Up @@ -120,7 +124,6 @@
'chartClass': 'edit-state',
'exportButton': true,
'exportFilename': 'SportsChart',
'parentNodeSymbol': 'fa-th-large',
'createNode': function($node, data) {
$node[0].id = getId();
}
Expand Down Expand Up @@ -203,7 +206,6 @@
'data' : { 'name': nodeVals[0] },
'exportButton': true,
'exportFilename': 'SportsChart',
'parentNodeSymbol': 'fa-th-large',
'createNode': function($node, data) {
$node[0].id = getId();
}
Expand Down
1 change: 0 additions & 1 deletion demo/expand-to-given-depth.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
<style type="text/css">
Expand Down
3 changes: 1 addition & 2 deletions demo/export-chart-pdf.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
<style type="text/css">
Expand All @@ -17,7 +16,7 @@

<script src="js/jquery.min.js"></script>
<!-- the following reference is specific for IE -->
<script type="text/javascript" src="https://cdn.rawgit.com/stefanpenner/es6-promise/master/dist/es6-promise.auto.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/es6-promise/4.1.1/es6-promise.auto.min.js"></script>
<script type="text/javascript" src="js/html2canvas.min.js"></script>
<script type="text/javascript" src="js/jspdf.min.js"></script>
<script type="text/javascript" src="js/jquery.orgchart.js"></script>
Expand Down
3 changes: 1 addition & 2 deletions demo/export-chart.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
<style type="text/css">
Expand All @@ -17,7 +16,7 @@

<script src="js/jquery.min.js"></script>
<!-- the following reference is specific for IE -->
<script type="text/javascript" src="https://cdn.rawgit.com/stefanpenner/es6-promise/master/dist/es6-promise.auto.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/es6-promise/4.1.1/es6-promise.auto.min.js"></script>
<script type="text/javascript" src="js/html2canvas.min.js"></script>
<script type="text/javascript" src="js/jspdf.min.js"></script>
<script type="text/javascript" src="js/jquery.orgchart.js"></script>
Expand Down
1 change: 0 additions & 1 deletion demo/filter-node.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
<style type="text/css">
Expand Down
1 change: 0 additions & 1 deletion demo/get-hierarchy.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
<style type="text/css">
Expand Down
1 change: 0 additions & 1 deletion demo/integrate-map.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ol3/3.18.2/ol.css">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
<style type="text/css">
Expand Down
1 change: 0 additions & 1 deletion demo/left2right.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
<style type="text/css">
Expand Down
1 change: 0 additions & 1 deletion demo/link-node.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
<style type="text/css">
Expand Down
1 change: 0 additions & 1 deletion demo/local-datasource.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
</head>
Expand Down
12 changes: 6 additions & 6 deletions demo/multiple-layers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
<style type="text/css">
Expand All @@ -15,11 +14,12 @@
right: -10px;
top: -10px;
z-index: 2;
color: rgba(68, 157, 68, 0.5);
font-size: 24px;
position: absolute;
}
.orgchart .drill-icon:hover { color: #449d44; }
.orgchart .drill-icon::before {
background-color: rgba(68, 157, 68, 0.5);
}
.orgchart .drill-icon:hover::before { background-color: #449d44; }
.orgchart .node:hover .drill-icon { opacity: 1; }
</style>
</head>
Expand Down Expand Up @@ -92,7 +92,7 @@
if ($node.is('.drill-down')) {
var assoClass = data.className.match(/asso-\w+/)[0];
var drillDownIcon = $('<i>', {
'class': 'fa fa-arrow-circle-down drill-icon',
'class': 'oci oci-arrow-circle-down drill-icon',
'click': function() {
$('#chart-container').find('.orgchart:visible').addClass('hidden');
if (!$('#chart-container').find('.orgchart.' + assoClass).length) {
Expand All @@ -106,7 +106,7 @@
} else if ($node.is('.drill-up')) {
var assoClass = data.className.match(/asso-\w+/)[0];
var drillUpIcon = $('<i>', {
'class': 'fa fa-arrow-circle-up drill-icon',
'class': 'oci oci-arrow-circle-up drill-icon',
'click': function() {
$('#chart-container').find('.orgchart:visible').addClass('hidden').end()
.find('.drill-down.' + assoClass).closest('.orgchart').removeClass('hidden');
Expand Down
1 change: 0 additions & 1 deletion demo/ondemand-loading-data.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
</head>
Expand Down
8 changes: 3 additions & 5 deletions demo/option-createNode.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
<style type="text/css">
Expand All @@ -14,11 +13,10 @@
right: -5px;
top: -5px;
z-index: 2;
color: rgba(68, 157, 68, 0.5);
font-size: 18px;
position: absolute;
}
.orgchart .second-menu-icon:hover { color: #449d44; }
.orgchart .second-menu-icon::before { background-color: rgba(68, 157, 68, 0.5); }
.orgchart .second-menu-icon:hover::before { background-color: #449d44; }
.orgchart .node:hover .second-menu-icon { opacity: 1; }
.orgchart .node .second-menu {
display: none;
Expand Down Expand Up @@ -80,7 +78,7 @@
'nodeID': 'id',
'createNode': function($node, data) {
var secondMenuIcon = $('<i>', {
'class': 'fa fa-info-circle second-menu-icon',
'class': 'oci oci-info-circle second-menu-icon',
click: function() {
$(this).siblings('.second-menu').toggle();
}
Expand Down
1 change: 0 additions & 1 deletion demo/pan-zoom.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
</head>
Expand Down
1 change: 0 additions & 1 deletion demo/reload-data.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
</head>
Expand Down
1 change: 0 additions & 1 deletion demo/report-path.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
<style type="text/css">
Expand Down
1 change: 0 additions & 1 deletion demo/responsive-design.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
<style type="text/css">
Expand Down
1 change: 0 additions & 1 deletion demo/right2left.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
<style type="text/css">
Expand Down
1 change: 0 additions & 1 deletion demo/toggle-sibs-resp.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
</head>
Expand Down
1 change: 0 additions & 1 deletion demo/ul-datasource.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
<style type="text/css">
Expand Down
1 change: 0 additions & 1 deletion demo/vertical-level.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="utf-8">
<title>Organization Chart Plugin</title>
<link rel="icon" href="img/logo.png">
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/jquery.orgchart.css">
<link rel="stylesheet" href="css/style.css">
<style type="text/css">
Expand Down
Loading