Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
typo3
qfq
Commits
c773dbb8
Commit
c773dbb8
authored
Feb 12, 2020
by
bbaer
Browse files
replaced glyphicons with font awesome for fabric
parent
6b97ebf1
Pipeline
#3275
passed with stages
in 3 minutes and 38 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
extension/Resources/Public/Json/fabric.buttons.json
View file @
c773dbb8
...
@@ -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-t
ras
h
"
"icon"
:
"
fa-e
ras
er
"
},
},
{
{
"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"
}
}
],
],
...
...
javascript/src/Plugins/qfq.fabric.js
View file @
c773dbb8
...
@@ -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
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment