Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2018-05-01 22:59:51 +0300
committerBenaka <diosmosis@users.noreply.github.com>2018-05-01 22:59:51 +0300
commita44d94e18ef764e7af2840274ee1c87d37ec7b05 (patch)
treeed6a33c495ba3297b3664b30d66e06e0ecdf9a93
parent993bfa631bc182e17b0093cda047ecc3b69da3ce (diff)
Add new embed icon (#12802)
* Add new embed icon * fix icon name * fix embed icon
-rw-r--r--LEGALNOTICE4
-rw-r--r--plugins/Morpheus/fonts/matomo.svg1
-rw-r--r--plugins/Morpheus/fonts/matomo.ttfbin26032 -> 26128 bytes
-rw-r--r--plugins/Morpheus/fonts/matomo.woffbin26108 -> 26204 bytes
-rw-r--r--plugins/Morpheus/fonts/selection.json263
-rw-r--r--plugins/Morpheus/stylesheets/base/icons.css4
-rw-r--r--plugins/Morpheus/templates/demo.twig5
-rw-r--r--plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png4
8 files changed, 159 insertions, 122 deletions
diff --git a/LEGALNOTICE b/LEGALNOTICE
index 04dd645e14..6135c0a079 100644
--- a/LEGALNOTICE
+++ b/LEGALNOTICE
@@ -270,11 +270,11 @@ THIRD-PARTY CONTENT
License: GPL
By: Alessandro Rei - http://www.kde-look.org/usermanager/search.php?username=mentalrey
- Name: Material icons ("icon-info2", "icon-outline", "icon-settings", "icon-form", "icon-play", "icon-pause", "icon-replay", "icon-skip-next", "icon-skip-forward", "icon-stop", "icon-fast-forward", "icon-fast-rewind", "bug", "upload") in plugins/Morpheus/fonts
+ Name: Material icons ("icon-info2", "icon-outline", "icon-settings", "icon-form", "icon-play", "icon-pause", "icon-replay", "icon-skip-next", "icon-skip-forward", "icon-stop", "icon-fast-forward", "icon-fast-rewind", "icon-bug", "icon-upload") in plugins/Morpheus/fonts
Link: https://design.google.com/icons/
License: Apache License Version 2.0
- Name: IcoMoon - Free icons ("icon-funnel", "icon-lab", "icon-archive", "rocket") in plugins/Morpheus/fonts
+ Name: IcoMoon - Free icons ("icon-funnel", "icon-lab", "icon-archive", "icon-rocket", "icon-embed") in plugins/Morpheus/fonts
Link: https://icomoon.io/#icons-icomoon
License: GPL
diff --git a/plugins/Morpheus/fonts/matomo.svg b/plugins/Morpheus/fonts/matomo.svg
index 4b01300e5b..9a161e396c 100644
--- a/plugins/Morpheus/fonts/matomo.svg
+++ b/plugins/Morpheus/fonts/matomo.svg
@@ -135,6 +135,7 @@
<glyph unicode="&#xe9aa;" glyph-name="lab" data-tags="lab, beta, beaker, test, experiment" d="M956.29 155.518l-316.29 527.024v213.458h32c17.6 0 32 14.4 32 32s-14.4 32-32 32h-320c-17.6 0-32-14.4-32-32s14.4-32 32-32h32v-213.458l-316.288-527.024c-72.442-120.734-16.512-219.518 124.288-219.518h640c140.8 0 196.73 98.784 124.29 219.518zM241.038 320l206.962 344.938v231.062h128v-231.062l206.964-344.938h-541.926z" />
<glyph unicode="&#xea30;" glyph-name="transition" data-tags="shuffle, random, player" d="M768 256h-101.49l-160 160 160 160h101.49v-160l224 224-224 224v-160h-128c-16.974 0-33.252-6.744-45.254-18.746l-178.746-178.744-178.746 178.746c-12 12-28.28 18.744-45.254 18.744h-192v-128h165.49l160-160-160-160h-165.49v-128h192c16.974 0 33.252 6.742 45.254 18.746l178.746 178.744 178.746-178.744c12.002-12.004 28.28-18.746 45.254-18.746h128v-160l224 224-224 224v-160z" />
<glyph unicode="&#xea5b;" glyph-name="funnel" data-tags="filter, funnel" d="M512 960c-282.77 0-512-71.634-512-160v-96l384-384v-320c0-35.346 57.306-64 128-64 70.692 0 128 28.654 128 64v320l384 384v96c0 88.366-229.23 160-512 160zM94.384 821.176c23.944 13.658 57.582 26.62 97.278 37.488 87.944 24.076 201.708 37.336 320.338 37.336 118.628 0 232.394-13.26 320.338-37.336 39.696-10.868 73.334-23.83 97.28-37.488 15.792-9.006 24.324-16.624 28.296-21.176-3.972-4.552-12.506-12.168-28.296-21.176-23.946-13.658-57.584-26.62-97.28-37.488-87.942-24.076-201.708-37.336-320.338-37.336s-232.394 13.26-320.338 37.336c-39.696 10.868-73.334 23.83-97.278 37.488-15.792 9.008-24.324 16.624-28.298 21.176 3.974 4.552 12.506 12.168 28.298 21.176z" />
+<glyph unicode="&#xea80;" glyph-name="embed" data-tags="embed, code, html, xml" horiz-adv-x="1280" d="M832 224l96-96 320 320-320 320-96-96 224-224zM448 672l-96 96-320-320 320-320 96 96-224 224zM701.298 809.481l69.468-18.944-191.987-704.026-69.468 18.944 191.987 704.026z" />
<glyph unicode="&#xf102;" glyph-name="angle-double-up" data-tags="angle-double-up" horiz-adv-x="658" d="M614.286 201.143c0-4.571-2.286-9.714-5.714-13.143l-28.571-28.571c-3.429-3.429-8-5.714-13.143-5.714-4.571 0-9.714 2.286-13.143 5.714l-224.571 224.571-224.571-224.571c-3.429-3.429-8.571-5.714-13.143-5.714s-9.714 2.286-13.143 5.714l-28.571 28.571c-3.429 3.429-5.714 8.571-5.714 13.143s2.286 9.714 5.714 13.143l266.286 266.286c3.429 3.429 8.571 5.714 13.143 5.714s9.714-2.286 13.143-5.714l266.286-266.286c3.429-3.429 5.714-8.571 5.714-13.143zM614.286 420.571c0-4.571-2.286-9.714-5.714-13.143l-28.571-28.571c-3.429-3.429-8-5.714-13.143-5.714-4.571 0-9.714 2.286-13.143 5.714l-224.571 224.571-224.571-224.571c-3.429-3.429-8.571-5.714-13.143-5.714s-9.714 2.286-13.143 5.714l-28.571 28.571c-3.429 3.429-5.714 8.571-5.714 13.143s2.286 9.714 5.714 13.143l266.286 266.286c3.429 3.429 8.571 5.714 13.143 5.714s9.714-2.286 13.143-5.714l266.286-266.286c3.429-3.429 5.714-8.571 5.714-13.143z" />
<glyph unicode="&#xf103;" glyph-name="angle-double-down" data-tags="angle-double-down" horiz-adv-x="658" d="M614.286 457.143c0-4.571-2.286-9.714-5.714-13.143l-266.286-266.286c-3.429-3.429-8.571-5.714-13.143-5.714s-9.714 2.286-13.143 5.714l-266.286 266.286c-3.429 3.429-5.714 8.571-5.714 13.143s2.286 9.714 5.714 13.143l28.571 28.571c3.429 3.429 8 5.714 13.143 5.714 4.571 0 9.714-2.286 13.143-5.714l224.571-224.571 224.571 224.571c3.429 3.429 8.571 5.714 13.143 5.714s9.714-2.286 13.143-5.714l28.571-28.571c3.429-3.429 5.714-8.571 5.714-13.143zM614.286 676.571c0-4.571-2.286-9.714-5.714-13.143l-266.286-266.286c-3.429-3.429-8.571-5.714-13.143-5.714s-9.714 2.286-13.143 5.714l-266.286 266.286c-3.429 3.429-5.714 8.571-5.714 13.143s2.286 9.714 5.714 13.143l28.571 28.571c3.429 3.429 8 5.714 13.143 5.714 4.571 0 9.714-2.286 13.143-5.714l224.571-224.571 224.571 224.571c3.429 3.429 8.571 5.714 13.143 5.714s9.714-2.286 13.143-5.714l28.571-28.571c3.429-3.429 5.714-8.571 5.714-13.143z" />
</font></defs></svg> \ No newline at end of file
diff --git a/plugins/Morpheus/fonts/matomo.ttf b/plugins/Morpheus/fonts/matomo.ttf
index 4e4cc18526..5d08bcb0a7 100644
--- a/plugins/Morpheus/fonts/matomo.ttf
+++ b/plugins/Morpheus/fonts/matomo.ttf
Binary files differ
diff --git a/plugins/Morpheus/fonts/matomo.woff b/plugins/Morpheus/fonts/matomo.woff
index 2807655632..9d85a8c314 100644
--- a/plugins/Morpheus/fonts/matomo.woff
+++ b/plugins/Morpheus/fonts/matomo.woff
Binary files differ
diff --git a/plugins/Morpheus/fonts/selection.json b/plugins/Morpheus/fonts/selection.json
index 0aa945bd3d..b4563aa93a 100644
--- a/plugins/Morpheus/fonts/selection.json
+++ b/plugins/Morpheus/fonts/selection.json
@@ -26,7 +26,7 @@
"name": "alien"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 0
},
{
@@ -54,7 +54,7 @@
"name": "annotation"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 1
},
{
@@ -79,7 +79,7 @@
"name": "arrow-left"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 2
},
{
@@ -104,7 +104,7 @@
"name": "arrow-right"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 3
},
{
@@ -131,7 +131,7 @@
"name": "business"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 4
},
{
@@ -162,7 +162,7 @@
"name": "calendar"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 5
},
{
@@ -189,7 +189,7 @@
"name": "chart-bar"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 6
},
{
@@ -214,7 +214,7 @@
"name": "chart-line-details"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 7
},
{
@@ -239,7 +239,7 @@
"name": "chart-line"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 8
},
{
@@ -265,7 +265,7 @@
"name": "chart-pie"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 9
},
{
@@ -291,7 +291,7 @@
"name": "close"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 10
},
{
@@ -317,7 +317,7 @@
"name": "collapsed-arrows"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 11
},
{
@@ -343,7 +343,7 @@
"name": "configure"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 12
},
{
@@ -368,7 +368,7 @@
"name": "datepicker-arr-l"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 13
},
{
@@ -393,7 +393,7 @@
"name": "datepicker-arr-r"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 14
},
{
@@ -419,7 +419,7 @@
"name": "delete"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 15
},
{
@@ -450,7 +450,7 @@
"name": "document"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 16
},
{
@@ -478,7 +478,7 @@
"name": "download"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 17
},
{
@@ -504,7 +504,7 @@
"name": "drop"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 18
},
{
@@ -530,7 +530,7 @@
"name": "ecommerce-abandoned"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 19
},
{
@@ -556,7 +556,7 @@
"name": "ecommerce-order"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 20
},
{
@@ -581,7 +581,7 @@
"name": "email"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 21
},
{
@@ -606,7 +606,7 @@
"name": "error"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 22
},
{
@@ -632,7 +632,7 @@
"name": "export"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 23
},
{
@@ -657,7 +657,7 @@
"name": "feed"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 24
},
{
@@ -683,7 +683,7 @@
"name": "finance"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 25
},
{
@@ -708,7 +708,7 @@
"name": "folder-charts"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 26
},
{
@@ -733,7 +733,7 @@
"name": "folder"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 27
},
{
@@ -761,7 +761,7 @@
"name": "fullscreen"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 28
},
{
@@ -788,7 +788,7 @@
"name": "goal"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 29
},
{
@@ -813,7 +813,7 @@
"name": "help-alt"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 30
},
{
@@ -838,7 +838,7 @@
"name": "help"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 31
},
{
@@ -866,7 +866,7 @@
"name": "code"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 32
},
{
@@ -891,7 +891,7 @@
"name": "alert"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 33
},
{
@@ -918,7 +918,7 @@
"name": "edit"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 34
},
{
@@ -945,7 +945,7 @@
"name": "image"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 35
},
{
@@ -973,7 +973,7 @@
"name": "info"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 36
},
{
@@ -999,7 +999,7 @@
"name": "insights"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 37
},
{
@@ -1031,7 +1031,7 @@
"name": "locked-2"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 38
},
{
@@ -1056,7 +1056,7 @@
"name": "locked"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 39
},
{
@@ -1081,7 +1081,7 @@
"name": "locked-3"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 40
},
{
@@ -1106,7 +1106,7 @@
"name": "locked-4"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 41
},
{
@@ -1134,7 +1134,7 @@
"name": "maximise"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 42
},
{
@@ -1159,7 +1159,7 @@
"name": "minimise"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 43
},
{
@@ -1184,7 +1184,7 @@
"name": "minus"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 44
},
{
@@ -1209,7 +1209,7 @@
"name": "newtab"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 45
},
{
@@ -1234,7 +1234,7 @@
"name": "ok"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 46
},
{
@@ -1259,7 +1259,7 @@
"name": "open-source"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 47
},
{
@@ -1284,7 +1284,7 @@
"name": "add"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 48
},
{
@@ -1309,7 +1309,7 @@
"name": "puzzle"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 49
},
{
@@ -1334,7 +1334,7 @@
"name": "refresh"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 50
},
{
@@ -1360,7 +1360,7 @@
"name": "reload"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 51
},
{
@@ -1386,7 +1386,7 @@
"name": "search"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 52
},
{
@@ -1416,7 +1416,7 @@
"name": "users"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 53
},
{
@@ -1445,7 +1445,7 @@
"name": "server-alt"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 54
},
{
@@ -1474,7 +1474,7 @@
"name": "server"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 55
},
{
@@ -1499,7 +1499,7 @@
"name": "hide"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 56
},
{
@@ -1525,7 +1525,7 @@
"name": "show"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 57
},
{
@@ -1550,7 +1550,7 @@
"name": "arrow-top"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 58
},
{
@@ -1575,7 +1575,7 @@
"name": "arrow-bottom"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 59
},
{
@@ -1600,7 +1600,7 @@
"name": "star"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 60
},
{
@@ -1625,7 +1625,7 @@
"name": "success"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 61
},
{
@@ -1658,7 +1658,7 @@
"name": "table-more"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 62
},
{
@@ -1689,7 +1689,7 @@
"name": "table"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 63
},
{
@@ -1715,7 +1715,7 @@
"name": "tag-cloud"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 64
},
{
@@ -1740,7 +1740,7 @@
"name": "user"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 65
},
{
@@ -1768,7 +1768,7 @@
"name": "user-add"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 66
},
{
@@ -1798,7 +1798,7 @@
"name": "visitor-profile"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 67
},
{
@@ -1826,7 +1826,7 @@
"name": "zoom-in"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 68
},
{
@@ -1853,7 +1853,7 @@
"name": "zoom-out"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 69
},
{
@@ -1881,7 +1881,7 @@
"name": "sign-out"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 70
},
{
@@ -1908,7 +1908,7 @@
"name": "sign-in"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 71
},
{
@@ -1935,7 +1935,7 @@
"name": "menu-hamburger"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 72
},
{
@@ -1962,7 +1962,7 @@
"name": "menu-horiz"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 73
},
{
@@ -1989,7 +1989,7 @@
"name": "menu-verti"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 74
},
{
@@ -2016,7 +2016,7 @@
"name": "admin-administration"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 75
},
{
@@ -2043,7 +2043,7 @@
"name": "admin-development"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 76
},
{
@@ -2070,7 +2070,7 @@
"name": "admin-diagnostic"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 77
},
{
@@ -2097,7 +2097,7 @@
"name": "admin-platform"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 78
},
{
@@ -2124,7 +2124,7 @@
"name": "admin-settings"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 79
},
{
@@ -2151,7 +2151,7 @@
"name": "reporting-actions"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 80
},
{
@@ -2178,7 +2178,7 @@
"name": "reporting-dashboard"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 81
},
{
@@ -2205,7 +2205,7 @@
"name": "reporting-ecommerce"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 82
},
{
@@ -2232,7 +2232,7 @@
"name": "reporting-goal"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 83
},
{
@@ -2259,7 +2259,7 @@
"name": "reporting-referer"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 84
},
{
@@ -2286,7 +2286,7 @@
"name": "reporting-visitors"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 85
},
{
@@ -2313,7 +2313,7 @@
"name": "user-manage"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 86
},
{
@@ -2340,7 +2340,7 @@
"name": "user-personal"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 87
},
{
@@ -2367,7 +2367,7 @@
"name": "user-platform"
},
"setIdx": 0,
- "setId": 14,
+ "setId": 21,
"iconIdx": 88
},
{
@@ -2394,7 +2394,7 @@
"name": "assignment"
},
"setIdx": 1,
- "setId": 13,
+ "setId": 20,
"iconIdx": 0
},
{
@@ -2421,7 +2421,7 @@
"name": "overlay"
},
"setIdx": 2,
- "setId": 12,
+ "setId": 19,
"iconIdx": 0
},
{
@@ -2448,7 +2448,7 @@
"name": "fast-forward"
},
"setIdx": 2,
- "setId": 12,
+ "setId": 19,
"iconIdx": 1
},
{
@@ -2475,7 +2475,7 @@
"name": "fast-rewind"
},
"setIdx": 2,
- "setId": 12,
+ "setId": 19,
"iconIdx": 2
},
{
@@ -2502,7 +2502,7 @@
"name": "pause"
},
"setIdx": 2,
- "setId": 12,
+ "setId": 19,
"iconIdx": 3
},
{
@@ -2529,7 +2529,7 @@
"name": "play"
},
"setIdx": 2,
- "setId": 12,
+ "setId": 19,
"iconIdx": 4
},
{
@@ -2556,7 +2556,7 @@
"name": "replay"
},
"setIdx": 2,
- "setId": 12,
+ "setId": 19,
"iconIdx": 5
},
{
@@ -2583,7 +2583,7 @@
"name": "skip-next"
},
"setIdx": 2,
- "setId": 12,
+ "setId": 19,
"iconIdx": 6
},
{
@@ -2610,7 +2610,7 @@
"name": "skip-previous"
},
"setIdx": 2,
- "setId": 12,
+ "setId": 19,
"iconIdx": 7
},
{
@@ -2637,7 +2637,7 @@
"name": "stop"
},
"setIdx": 2,
- "setId": 12,
+ "setId": 19,
"iconIdx": 8
},
{
@@ -2664,7 +2664,7 @@
"name": "audio"
},
"setIdx": 2,
- "setId": 12,
+ "setId": 19,
"iconIdx": 9
},
{
@@ -2691,7 +2691,7 @@
"name": "info2"
},
"setIdx": 2,
- "setId": 12,
+ "setId": 19,
"iconIdx": 10
},
{
@@ -2718,7 +2718,7 @@
"name": "info_outline"
},
"setIdx": 2,
- "setId": 12,
+ "setId": 19,
"iconIdx": 11
},
{
@@ -2745,7 +2745,7 @@
"name": "settings"
},
"setIdx": 2,
- "setId": 12,
+ "setId": 19,
"iconIdx": 12
},
{
@@ -2772,7 +2772,7 @@
"name": "evolution"
},
"setIdx": 2,
- "setId": 12,
+ "setId": 19,
"iconIdx": 13
},
{
@@ -2799,7 +2799,7 @@
"name": "bug"
},
"setIdx": 2,
- "setId": 12,
+ "setId": 19,
"iconIdx": 14
},
{
@@ -2819,15 +2819,15 @@
"attrs": [],
"properties": {
"ligatures": "file_upload",
- "id": 280,
+ "id": 15,
"order": 236,
"prevSize": 24,
"code": 58054,
"name": "upload"
},
- "setIdx": 11,
- "setId": 3,
- "iconIdx": 280
+ "setIdx": 2,
+ "setId": 19,
+ "iconIdx": 15
},
{
"icon": {
@@ -2858,7 +2858,7 @@
"code": 59742
},
"setIdx": 3,
- "setId": 11,
+ "setId": 18,
"iconIdx": 0
},
{
@@ -2889,7 +2889,7 @@
"code": 59818
},
"setIdx": 3,
- "setId": 11,
+ "setId": 18,
"iconIdx": 1
},
{
@@ -2918,7 +2918,7 @@
"code": 59952
},
"setIdx": 3,
- "setId": 11,
+ "setId": 18,
"iconIdx": 2
},
{
@@ -2946,7 +2946,7 @@
"code": 59995
},
"setIdx": 3,
- "setId": 11,
+ "setId": 18,
"iconIdx": 3
},
{
@@ -2977,11 +2977,42 @@
"code": 59813
},
"setIdx": 3,
- "setId": 11,
+ "setId": 18,
"iconIdx": 4
},
{
"icon": {
+ "width": 1280,
+ "paths": [
+ "M832 736l96 96 320-320-320-320-96 96 224 224z",
+ "M448 288l-96-96-320 320 320 320 96-96-224-224z",
+ "M701.298 150.519l69.468 18.944-191.987 704.026-69.468-18.944 191.987-704.026z"
+ ],
+ "tags": [
+ "embed",
+ "code",
+ "html",
+ "xml"
+ ],
+ "defaultCode": 60032,
+ "grid": 16,
+ "attrs": []
+ },
+ "attrs": [],
+ "properties": {
+ "ligatures": "embed2, code2",
+ "name": "embed",
+ "order": 262,
+ "id": 385,
+ "prevSize": 32,
+ "code": 60032
+ },
+ "setIdx": 20,
+ "setId": 1,
+ "iconIdx": 384
+ },
+ {
+ "icon": {
"paths": [
"M614.286 749.714c0 4.571-2.286 9.714-5.714 13.143l-28.571 28.571c-3.429 3.429-8 5.714-13.143 5.714-4.571 0-9.714-2.286-13.143-5.714l-224.571-224.571-224.571 224.571c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-28.571-28.571c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l266.286-266.286c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l266.286 266.286c3.429 3.429 5.714 8.571 5.714 13.143zM614.286 530.286c0 4.571-2.286 9.714-5.714 13.143l-28.571 28.571c-3.429 3.429-8 5.714-13.143 5.714-4.571 0-9.714-2.286-13.143-5.714l-224.571-224.571-224.571 224.571c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-28.571-28.571c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l266.286-266.286c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l266.286 266.286c3.429 3.429 5.714 8.571 5.714 13.143z"
],
@@ -3004,7 +3035,7 @@
"code": 61698
},
"setIdx": 4,
- "setId": 10,
+ "setId": 17,
"iconIdx": 0
},
{
@@ -3031,7 +3062,7 @@
"code": 61699
},
"setIdx": 4,
- "setId": 10,
+ "setId": 17,
"iconIdx": 1
}
],
diff --git a/plugins/Morpheus/stylesheets/base/icons.css b/plugins/Morpheus/stylesheets/base/icons.css
index 9f20909508..860cdf072c 100644
--- a/plugins/Morpheus/stylesheets/base/icons.css
+++ b/plugins/Morpheus/stylesheets/base/icons.css
@@ -490,4 +490,8 @@
.icon-upload:before {
content: "\e2c6";
+}
+
+.icon-embed:before {
+ content: "\ea80";
} \ No newline at end of file
diff --git a/plugins/Morpheus/templates/demo.twig b/plugins/Morpheus/templates/demo.twig
index 174c7b930c..4daa42317e 100644
--- a/plugins/Morpheus/templates/demo.twig
+++ b/plugins/Morpheus/templates/demo.twig
@@ -745,8 +745,9 @@
'sign-out',
'settings',
'rocket',
- "bug",
- "upload"
+ 'bug',
+ 'upload',
+ 'embed'
]
};
diff --git a/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png b/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png
index 251ed659cc..d70381b7ff 100644
--- a/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png
+++ b/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:00769251de253590391d75436c1e794d2f795823c45813a085bb2a9af5cce1b0
-size 1246526
+oid sha256:7cadd9e8469077931a77e1add01d53a743c84876306ced09bb58fddae4ab69b1
+size 1247856