Commit e7a38727 authored by Marc Egger's avatar Marc Egger
Browse files

Merge branch 'B10117TypeAheadAfterSaveJSONIsShown' into F9517TagInput

parents 221ee74e a0d1a575
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"toggleElement": "", "toggleElement": "",
"disabled": false, "disabled": false,
"tooltip": "Draw with a pencil", "tooltip": "Draw with a pencil",
"icon": "glyphicon-pencil" "icon": "fa-pencil"
}, },
{ {
"name": "highlight", "name": "highlight",
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
"toggleElement": "", "toggleElement": "",
"disabled": false, "disabled": false,
"tooltip": "Highlighter", "tooltip": "Highlighter",
"icon": "glyphicon-pencil" "icon": "fa-paint-brush"
}, },
{ {
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
"toggleElement": "emojiContainer", "toggleElement": "emojiContainer",
"disabled": false, "disabled": false,
"tooltip": "Emojis", "tooltip": "Emojis",
"icon": "glyphicon-ice-lolly-tasted" "icon": "fa-smile-o"
}, },
{ {
"name": "rectangle", "name": "rectangle",
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
"toggleElement": "", "toggleElement": "",
"disabled": false, "disabled": false,
"tooltip": "Draw a rectangle to highlight areas", "tooltip": "Draw a rectangle to highlight areas",
"icon": "glyphicon-stop" "icon": "fa-square-o"
}, },
{ {
"name": "write", "name": "write",
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"toggleElement": "", "toggleElement": "",
"disabled": false, "disabled": false,
"tooltip": "Adds a customizable text to canvas", "tooltip": "Adds a customizable text to canvas",
"icon": "glyphicon-text-height" "icon": "fa-i-cursor"
}, },
{ {
"name": "move", "name": "move",
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
"toggleElement": "", "toggleElement": "",
"disabled": false, "disabled": false,
"tooltip": "Move the viewport, useful if zoomed", "tooltip": "Move the viewport, useful if zoomed",
"icon": "glyphicon-move" "icon": "fa-arrows"
}, },
{ {
"name": "delete", "name": "delete",
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
"toggleElement": "", "toggleElement": "",
"disabled": false, "disabled": false,
"tooltip": "Delete selected object", "tooltip": "Delete selected object",
"icon": "glyphicon-trash" "icon": "fa-eraser"
}, },
{ {
"name": "zoom", "name": "zoom",
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
"toggleElement": "", "toggleElement": "",
"disabled": false, "disabled": false,
"tooltip": "Zoom viewport", "tooltip": "Zoom viewport",
"icon": "glyphicon-search" "icon": "fa-search-plus"
}, },
{ {
"name": "freeMouse", "name": "freeMouse",
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
"toggleElement": "", "toggleElement": "",
"disabled": false, "disabled": false,
"tooltip": "Normal mouse to select objects in canvas", "tooltip": "Normal mouse to select objects in canvas",
"icon": "glyphicon-hand-up" "icon": "fa-mouse-pointer"
}, },
{ {
"name": "undo", "name": "undo",
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
"toggleElement": "", "toggleElement": "",
"disabled": true, "disabled": true,
"tooltip": "Undo", "tooltip": "Undo",
"icon": "glyphicon-repeat icon-flipped" "icon": "fa-undo"
}, },
{ {
"name": "redo", "name": "redo",
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
"toggleElement": "", "toggleElement": "",
"disabled": true, "disabled": true,
"tooltip": "Redo", "tooltip": "Redo",
"icon": "glyphicon-repeat" "icon": "fa-repeat"
} }
], ],
......
...@@ -98,8 +98,8 @@ $(function (n) { ...@@ -98,8 +98,8 @@ $(function (n) {
id: o.selector, id: o.selector,
class: 'btn btn-default' class: 'btn btn-default'
}); });
var $symbol = $("<span>", { var $symbol = $("<i>", {
class: 'glyphicon ' + o.icon class: 'fa ' + o.icon
}); });
$button.append($symbol); $button.append($symbol);
if (o.name === that.myModes.currentMode) { if (o.name === that.myModes.currentMode) {
......
Supports Markdown
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