From b3fa86638541270002b7a05bce9e0a50c6e41054 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Mon, 8 Sep 2014 14:18:34 +0100 Subject: [PATCH] Remove last remnants of bootstrap icons from core Closes #376 --- nodes/core/logic/10-switch.html | 2 +- public/red/ui/touch/radialMenu.js | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/nodes/core/logic/10-switch.html b/nodes/core/logic/10-switch.html index 4f2518945..4e02f446e 100644 --- a/nodes/core/logic/10-switch.html +++ b/nodes/core/logic/10-switch.html @@ -123,7 +123,7 @@ }); var deleteButton = $('',{href:"#",class:"btn btn-mini", style:"margin-left: 5px;"}).appendTo(finalspan); - $('',{class:"icon-remove"}).appendTo(deleteButton); + $('',{class:"fa fa-remove"}).appendTo(deleteButton); deleteButton.click(function() { container.css({"background":"#fee"}); diff --git a/public/red/ui/touch/radialMenu.js b/public/red/ui/touch/radialMenu.js index 706a89f07..ffb6a71c0 100644 --- a/public/red/ui/touch/radialMenu.js +++ b/public/red/ui/touch/radialMenu.js @@ -74,11 +74,9 @@ RED.touch.radialMenu = (function() { "text-align": "center", "line-height":"50px" }); - if (opt.icon) { - opt.el.append("i").attr("class","icon "+opt.icon) - } else { - opt.el.html(opt.name); - } + + opt.el.html(opt.name); + if (opt.disabled) { opt.el.style({"border-color":"#ccc",color:"#ccc"}); }