milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

get icons, swipebox through bower

Browse source
This commit is contained in:
Luke Pulverenti 2015-06-29 22:52:23 -04:00
parent cc0fd844c3
commit 601e6202e3
77815 changed files with 210644 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

13
dashboard-ui/scripts/site.js
View file

@ -867,15 +867,6 @@ var Dashboard = {
if (icon) {
menuHtml += '<iron-icon icon="' + icon + '" class="sidebarLinkIcon"' + style + '></iron-icon>';
//if (icon.indexOf('fa') == 0) {
// menuHtml += '<span class="fa ' + icon + ' sidebarLinkIcon"' + style + '></span>';
//}
//else if (icon.indexOf('fa') == 0) {
// menuHtml += '<span class="fa ' + icon + ' sidebarLinkIcon"' + style + '></span>';
//}
//else {
// menuHtml += '<i class="material-icons sidebarLinkIcon"' + style + '>' + icon + '</i>';
//}
}
menuHtml += '<span class="sidebarLinkText">';
@ -1568,10 +1559,10 @@ var Dashboard = {
var deferred = DeferredBuilder.Deferred();
Dashboard.importCss('thirdparty/swipebox-master/css/swipebox.min.css');
Dashboard.importCss('bower_components/swipebox/src/css/swipebox.min.css');
require([
'thirdparty/swipebox-master/js/jquery.swipebox.min'
'bower_components/swipebox/src/js/jquery.swipebox.min'
], function () {
deferred.resolve();