Commit c773dbb8 authored by bbaer's avatar bbaer

replaced glyphicons with font awesome for fabric

parent 6b97ebf1
Pipeline #3275 passed with stages
in 3 minutes and 38 seconds
......@@ -11,7 +11,7 @@
"toggleElement": "",
"disabled": false,
"tooltip": "Draw with a pencil",
"icon": "glyphicon-pencil"
"icon": "fa-pencil"
},
{
"name": "highlight",
......@@ -24,7 +24,7 @@
"toggleElement": "",
"disabled": false,
"tooltip": "Highlighter",
"icon": "glyphicon-pencil"
"icon": "fa-paint-brush"
},
{
......@@ -38,7 +38,7 @@
"toggleElement": "emojiContainer",
"disabled": false,
"tooltip": "Emojis",
"icon": "glyphicon-ice-lolly-tasted"
"icon": "fa-smile-o"
},
{
"name": "rectangle",
......@@ -51,7 +51,7 @@
"toggleElement": "",
"disabled": false,
"tooltip": "Draw a rectangle to highlight areas",
"icon": "glyphicon-stop"
"icon": "fa-square-o"
},
{
"name": "write",
......@@ -64,7 +64,7 @@
"toggleElement": "",
"disabled": false,
"tooltip": "Adds a customizable text to canvas",
"icon": "glyphicon-text-height"
"icon": "fa-i-cursor"
},
{
"name": "move",
......@@ -77,7 +77,7 @@
"toggleElement": "",
"disabled": false,
"tooltip": "Move the viewport, useful if zoomed",
"icon": "glyphicon-move"
"icon": "fa-arrows"
},
{
"name": "delete",
......@@ -90,7 +90,7 @@
"toggleElement": "",
"disabled": false,
"tooltip": "Delete selected object",
"icon": "glyphicon-trash"
"icon": "fa-eraser"
},
{
"name": "zoom",
......@@ -103,7 +103,7 @@
"toggleElement": "",
"disabled": false,
"tooltip": "Zoom viewport",
"icon": "glyphicon-search"
"icon": "fa-search-plus"
},
{
"name": "freeMouse",
......@@ -116,7 +116,7 @@
"toggleElement": "",
"disabled": false,
"tooltip": "Normal mouse to select objects in canvas",
"icon": "glyphicon-hand-up"
"icon": "fa-mouse-pointer"
},
{
"name": "undo",
......@@ -129,7 +129,7 @@
"toggleElement": "",
"disabled": true,
"tooltip": "Undo",
"icon": "glyphicon-repeat icon-flipped"
"icon": "fa-undo"
},
{
"name": "redo",
......@@ -142,7 +142,7 @@
"toggleElement": "",
"disabled": true,
"tooltip": "Redo",
"icon": "glyphicon-repeat"
"icon": "fa-repeat"
}
],
......
......@@ -98,8 +98,8 @@ $(function (n) {
id: o.selector,
class: 'btn btn-default'
});
var $symbol = $("<span>", {
class: 'glyphicon ' + o.icon
var $symbol = $("<i>", {
class: 'fa ' + o.icon
});
$button.append($symbol);
if (o.name === that.myModes.currentMode) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment