diff options
35 files changed, 930 insertions, 733 deletions
diff --git a/plugins/CoreHome/javascripts/dataTable_rowactions.js b/plugins/CoreHome/javascripts/dataTable_rowactions.js index b90ec1a780..f8dfaefb2d 100644 --- a/plugins/CoreHome/javascripts/dataTable_rowactions.js +++ b/plugins/CoreHome/javascripts/dataTable_rowactions.js @@ -59,8 +59,7 @@ DataTable_RowActions_Registry.register({ name: 'RowEvolution', - dataTableIcon: 'plugins/Morpheus/images/row_evolution.png', - dataTableIconHover: 'plugins/Morpheus/images/row_evolution_hover.png', + dataTableIcon: 'icon-evolution', order: 50, diff --git a/plugins/Live/javascripts/rowaction.js b/plugins/Live/javascripts/rowaction.js index 473b774609..ea81e070c6 100644 --- a/plugins/Live/javascripts/rowaction.js +++ b/plugins/Live/javascripts/rowaction.js @@ -111,8 +111,7 @@ name: actionName, - dataTableIcon: 'plugins/Live/images/visitorlog.png', - dataTableIconHover: 'plugins/Live/images/visitorlog-hover.png', + dataTableIcon: 'icon-visitor-profile', order: 30, diff --git a/plugins/Morpheus/fonts/matomo.svg b/plugins/Morpheus/fonts/matomo.svg index 05ba25176a..2b1b8ad6d4 100644 --- a/plugins/Morpheus/fonts/matomo.svg +++ b/plugins/Morpheus/fonts/matomo.svg @@ -30,9 +30,10 @@ <glyph unicode="" glyph-name="play" data-tags="play_circle_filled" d="M408.639 195.907l307.681 230.76-307.681 230.76v-461.521zM512 938.667c283.643 0 512-228.357 512-512s-228.357-512-512-512-512 228.357-512 512 228.357 512 512 512z" /> <glyph unicode="" glyph-name="replay" data-tags="replay" d="M512 709.515c206.638 0 375.906-167.070 375.906-373.708s-169.268-375.906-375.906-375.906-375.906 169.268-375.906 375.906h94.525c0-156.079 125.3-281.38 281.38-281.38s281.38 125.3 281.38 281.38-125.3 281.38-281.38 281.38v-189.053l-235.216 235.216 235.216 235.216v-189.053z" /> <glyph unicode="" glyph-name="skip-next" data-tags="skip_next" d="M710.334 725.333h100.334v-597.334h-100.334v597.334zM213.334 128.001v597.334l422.334-298.666z" /> -<glyph unicode="" glyph-name="skip_previous" data-tags="skip_previous" d="M388.332 426.667l422.33 298.668v-597.33zM213.332 725.335h100.331v-597.33h-100.331v597.33z" /> +<glyph unicode="" glyph-name="skip-previous" data-tags="skip_previous" d="M388.332 426.667l422.33 298.668v-597.33zM213.332 725.335h100.331v-597.33h-100.331v597.33z" /> <glyph unicode="" glyph-name="stop" data-tags="stop" d="M213.334 725.333h597.334v-597.334h-597.334v597.334z" /> <glyph unicode="" glyph-name="audio" data-tags="volume_up" d="M598 800.667c172-38 298-192 298-374s-126-336-298-374v88c124 36 212 150 212 286s-88 250-212 286v88zM704 426.667c0-76-42-140-106-172v344c64-32 106-96 106-172zM128 554.667h170l214 214v-684l-214 214h-170v256z" /> +<glyph unicode="" glyph-name="overlay" data-tags="chat_bubble_outline" d="M854 256.667v512h-684v-598l86 86h598zM854 852.667c46 0 84-38 84-84v-512c0-46-38-86-84-86h-598l-170-170v768c0 46 38 84 84 84h684z" /> <glyph unicode="" glyph-name="alien" data-tags="ico-alien" d="M576 896c0-35.346-28.654-64-64-64s-64 28.654-64 64c0 35.346 28.654 64 64 64s64-28.654 64-64zM480 864h64v-128h-64v128zM897.024-64h-770.048c-70.144 0-126.976 56.832-126.976 126.976v0c0 70.144 56.832 126.976 126.976 126.976h769.984c70.144 0 126.976-56.832 126.976-126.976v0c0.064-70.144-56.768-126.976-126.912-126.976zM512 768c-194.432 0-352-157.568-352-352v-160h704v160c0 194.432-157.568 352-352 352zM384 352c-52.992 0-96 43.008-96 96s43.008 96 96 96 96-43.008 96-96-43.008-96-96-96zM640 352c-52.992 0-96 43.008-96 96s43.008 96 96 96 96-43.008 96-96-43.008-96-96-96z" /> <glyph unicode="" glyph-name="annotation" data-tags="ico-annotation" d="M736 704h-448c-17.664 0-32-14.336-32-32s14.336-32 32-32h448c17.664 0 32 14.336 32 32s-14.336 32-32 32zM736 576h-448c-17.664 0-32-14.336-32-32s14.336-32 32-32h448c17.664 0 32 14.336 32 32s-14.336 32-32 32zM608 448h-320c-17.664 0-32-14.336-32-32s14.336-32 32-32h320c17.664 0 32 14.336 32 32s-14.336 32-32 32zM832 960h-640c-106.048 0-192-85.952-192-192v-448c0-106.048 85.952-192 192-192h320l195.2-184.32c25.024-18.816 60.8-0.896 60.8 30.4v153.92h64c106.048 0 192 85.952 192 192v448c0 106.048-85.952 192-192 192zM896 320c0-35.264-28.736-64-64-64h-640c-35.264 0-64 28.736-64 64v448c0 35.264 28.736 64 64 64h640c35.264 0 64-28.736 64-64v-448z" /> <glyph unicode="" glyph-name="arrow-left" data-tags="ico-arrow-left" d="M704 736v-576l-321.024 286.976z" /> @@ -126,8 +127,10 @@ <glyph unicode="" glyph-name="info2" data-tags="info" d="M562.479 580.507v103.361h-100.958v-103.361h100.958zM562.479 169.465v307.681h-100.958v-307.681h100.958zM512 938.667c283.643 0 512-228.357 512-512s-228.357-512-512-512-512 228.357-512 512 228.357 512 512 512z" /> <glyph unicode="" glyph-name="info_outline" data-tags="info_outline" d="M461.521 580.507v103.361h100.958v-103.361h-100.958zM512 15.625c225.953 0 411.042 185.089 411.042 411.042s-185.089 411.042-411.042 411.042-411.042-185.089-411.042-411.042 185.089-411.042 411.042-411.042zM512 938.667c283.643 0 512-228.357 512-512s-228.357-512-512-512-512 228.357-512 512 228.357 512 512 512zM461.521 169.465v307.681h100.958v-307.681h-100.958z" /> <glyph unicode="" glyph-name="settings" data-tags="settings" d="M512 246.385c98.554 0 180.282 81.728 180.282 180.282s-81.728 180.282-180.282 180.282-180.282-81.728-180.282-180.282 81.728-180.282 180.282-180.282zM894.197 376.188l108.169-84.131c9.615-7.211 12.019-21.634 4.808-33.653l-103.361-177.878c-7.211-12.019-19.23-14.423-31.249-9.615l-127.399 50.479c-26.441-19.23-55.286-38.46-86.535-50.479l-19.23-134.61c-2.404-12.019-12.019-21.634-24.038-21.634h-206.723c-12.019 0-21.634 9.615-24.038 21.634l-19.23 134.61c-31.249 12.019-60.094 28.845-86.535 50.479l-127.399-50.479c-12.019-4.808-24.038-2.404-31.249 9.615l-103.361 177.878c-7.211 12.019-4.808 26.441 4.808 33.653l108.169 84.131c-2.404 16.826-2.404 33.653-2.404 50.479s0 33.653 2.404 50.479l-108.169 84.131c-9.615 7.211-12.019 21.634-4.808 33.653l103.361 177.878c7.211 12.019 19.23 14.423 31.249 9.615l127.399-50.479c26.441 19.23 55.286 38.46 86.535 50.479l19.23 134.61c2.404 12.019 12.019 21.634 24.038 21.634h206.723c12.019 0 21.634-9.615 24.038-21.634l19.23-134.61c31.249-12.019 60.094-28.845 86.535-50.479l127.399 50.479c12.019 4.808 24.038 2.404 31.249-9.615l103.361-177.878c7.211-12.019 4.808-26.441-4.808-33.653l-108.169-84.131c2.404-16.826 2.404-33.653 2.404-50.479s0-33.653-2.404-50.479z" /> +<glyph unicode="" glyph-name="evolution" data-tags="timeline" d="M982 596.667c0-46-40-84-86-84-8 0-16 0-22 2l-152-152c2-6 4-14 4-22 0-46-40-84-86-84s-86 38-86 84c0 8 2 16 4 22l-110 110c-6-2-14-4-22-4s-16 2-22 4l-194-194c2-6 4-14 4-22 0-46-40-86-86-86s-86 40-86 86 40 84 86 84c8 0 16 0 22-2l194 194c-2 6-2 14-2 22 0 46 38 86 84 86s86-40 86-86c0-8 0-16-2-22l108-108c6 2 14 2 22 2s16 0 22-2l152 150c-2 6-4 14-4 22 0 46 40 86 86 86s86-40 86-86z" /> <glyph unicode="" glyph-name="archive" data-tags="box-add, box, download, storage, inbox, archive" d="M832 896h-640l-192-192v-672c0-17.674 14.326-32 32-32h960c17.672 0 32 14.326 32 32v672l-192 192zM512 128l-320 256h192v192h256v-192h192l-320-256zM154.51 768l64 64h586.978l64-64h-714.978z" /> <glyph unicode="" 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="" 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="" 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="" 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="" 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" /> diff --git a/plugins/Morpheus/fonts/matomo.ttf b/plugins/Morpheus/fonts/matomo.ttf Binary files differindex f6e85ba0d5..1217dc36ac 100644 --- a/plugins/Morpheus/fonts/matomo.ttf +++ b/plugins/Morpheus/fonts/matomo.ttf diff --git a/plugins/Morpheus/fonts/matomo.woff b/plugins/Morpheus/fonts/matomo.woff Binary files differindex d0f148a097..fb1974ad68 100644 --- a/plugins/Morpheus/fonts/matomo.woff +++ b/plugins/Morpheus/fonts/matomo.woff diff --git a/plugins/Morpheus/fonts/selection.json b/plugins/Morpheus/fonts/selection.json index 8a71d5cfe2..635d56e2ce 100644 --- a/plugins/Morpheus/fonts/selection.json +++ b/plugins/Morpheus/fonts/selection.json @@ -4,6 +4,384 @@ { "icon": { "paths": [ + "M854 682v-512h-684v598l86-86h598zM854 86c46 0 84 38 84 84v512c0 46-38 86-84 86h-598l-170 170v-768c0-46 38-84 84-84h684z" + ], + "attrs": [], + "isMulticolor": false, + "isMulticolor2": false, + "tags": [ + "chat_bubble_outline" + ], + "defaultCode": 57547, + "grid": 24 + }, + "attrs": [], + "properties": { + "ligatures": "chat_bubble_outline", + "id": 147, + "order": 5, + "prevSize": 24, + "code": 57547, + "name": "overlay" + }, + "setIdx": 1, + "setId": 5, + "iconIdx": 147 + }, + { + "icon": { + "paths": [ + "M557.5 234.667l394.333 277.333-394.333 277.333v-554.667zM141.5 789.333v-554.667l394.333 277.333z" + ], + "attrs": [], + "isMulticolor": false, + "isMulticolor2": false, + "tags": [ + "fast_forward" + ], + "defaultCode": 57375, + "grid": 24 + }, + "attrs": [], + "properties": { + "order": 122, + "ligatures": "fast_forward", + "id": 0, + "prevSize": 24, + "code": 57375, + "name": "fast-forward" + }, + "setIdx": 4, + "setId": 2, + "iconIdx": 0 + }, + { + "icon": { + "paths": [ + "M488.167 512l394.333-277.333v554.667zM466.5 789.333l-394.333-277.333 394.333-277.333v554.667z" + ], + "attrs": [], + "isMulticolor": false, + "isMulticolor2": false, + "tags": [ + "fast_rewind" + ], + "defaultCode": 57376, + "grid": 24 + }, + "attrs": [], + "properties": { + "order": 123, + "ligatures": "fast_rewind", + "id": 1, + "prevSize": 24, + "code": 57376, + "name": "fast-rewind" + }, + "setIdx": 4, + "setId": 2, + "iconIdx": 1 + }, + { + "icon": { + "paths": [ + "M665.84 716.319v-408.639h-103.362v408.639h103.362zM461.521 716.319v-408.639h-103.362v408.639h103.362zM512 0c283.643 0 512 228.357 512 512s-228.357 512-512 512-512-228.357-512-512 228.357-512 512-512z" + ], + "attrs": [], + "isMulticolor": false, + "isMulticolor2": false, + "tags": [ + "pause_circle_filled" + ], + "defaultCode": 57397, + "grid": 24 + }, + "attrs": [], + "properties": { + "order": 124, + "ligatures": "pause_circle_filled", + "id": 2, + "prevSize": 24, + "code": 57397, + "name": "pause" + }, + "setIdx": 4, + "setId": 2, + "iconIdx": 2 + }, + { + "icon": { + "paths": [ + "M408.639 742.76l307.681-230.76-307.681-230.76v461.521zM512 0c283.643 0 512 228.357 512 512s-228.357 512-512 512-512-228.357-512-512 228.357-512 512-512z" + ], + "attrs": [], + "isMulticolor": false, + "isMulticolor2": false, + "tags": [ + "play_circle_filled" + ], + "defaultCode": 57400, + "grid": 24 + }, + "attrs": [], + "properties": { + "order": 125, + "ligatures": "play_circle_filled", + "id": 3, + "prevSize": 24, + "code": 57400, + "name": "play" + }, + "setIdx": 4, + "setId": 2, + "iconIdx": 3 + }, + { + "icon": { + "paths": [ + "M512 229.152c206.638 0 375.906 167.070 375.906 373.708s-169.268 375.906-375.906 375.906-375.906-169.268-375.906-375.906h94.525c0 156.079 125.3 281.38 281.38 281.38s281.38-125.3 281.38-281.38-125.3-281.38-281.38-281.38v189.053l-235.216-235.216 235.216-235.216v189.053z" + ], + "attrs": [], + "isMulticolor": false, + "isMulticolor2": false, + "tags": [ + "replay" + ], + "defaultCode": 57410, + "grid": 24 + }, + "attrs": [], + "properties": { + "order": 126, + "ligatures": "replay", + "id": 4, + "prevSize": 24, + "code": 57410, + "name": "replay" + }, + "setIdx": 4, + "setId": 2, + "iconIdx": 4 + }, + { + "icon": { + "paths": [ + "M710.334 213.334h100.334v597.334h-100.334v-597.334zM213.334 810.666v-597.334l422.334 298.666z" + ], + "attrs": [], + "isMulticolor": false, + "isMulticolor2": false, + "tags": [ + "skip_next" + ], + "defaultCode": 57412, + "grid": 24 + }, + "attrs": [], + "properties": { + "order": 127, + "ligatures": "skip_next", + "id": 5, + "prevSize": 24, + "code": 57412, + "name": "skip-next" + }, + "setIdx": 4, + "setId": 2, + "iconIdx": 5 + }, + { + "icon": { + "paths": [ + "M388.332 512l422.33-298.668v597.33zM213.332 213.332h100.331v597.33h-100.331v-597.33z" + ], + "attrs": [], + "isMulticolor": false, + "isMulticolor2": false, + "tags": [ + "skip_previous" + ], + "defaultCode": 57413, + "grid": 24 + }, + "attrs": [], + "properties": { + "order": 128, + "ligatures": "skip_previous", + "id": 6, + "prevSize": 24, + "code": 57413, + "name": "skip-previous" + }, + "setIdx": 4, + "setId": 2, + "iconIdx": 6 + }, + { + "icon": { + "paths": [ + "M213.334 213.334h597.334v597.334h-597.334v-597.334z" + ], + "attrs": [], + "isMulticolor": false, + "isMulticolor2": false, + "tags": [ + "stop" + ], + "defaultCode": 57415, + "grid": 24 + }, + "attrs": [], + "properties": { + "order": 129, + "ligatures": "stop", + "id": 7, + "prevSize": 24, + "code": 57415, + "name": "stop" + }, + "setIdx": 4, + "setId": 2, + "iconIdx": 7 + }, + { + "icon": { + "paths": [ + "M598 138c172 38 298 192 298 374s-126 336-298 374v-88c124-36 212-150 212-286s-88-250-212-286v-88zM704 512c0 76-42 140-106 172v-344c64 32 106 96 106 172zM128 384h170l214-214v684l-214-214h-170v-256z" + ], + "attrs": [], + "isMulticolor": false, + "isMulticolor2": false, + "tags": [ + "volume_up" + ], + "defaultCode": 57424, + "grid": 24 + }, + "attrs": [], + "properties": { + "ligatures": "volume_up", + "id": 8, + "order": 130, + "prevSize": 24, + "code": 57424, + "name": "audio" + }, + "setIdx": 4, + "setId": 2, + "iconIdx": 8 + }, + { + "icon": { + "paths": [ + "M562.479 358.16v-103.361h-100.958v103.361h100.958zM562.479 769.202v-307.681h-100.958v307.681h100.958zM512 0c283.643 0 512 228.357 512 512s-228.357 512-512 512-512-228.357-512-512 228.357-512 512-512z" + ], + "attrs": [], + "isMulticolor": false, + "isMulticolor2": false, + "tags": [ + "info" + ], + "defaultCode": 59534, + "grid": 24 + }, + "attrs": [], + "properties": { + "order": 196, + "ligatures": "info", + "id": 9, + "prevSize": 24, + "code": 59534, + "name": "info2" + }, + "setIdx": 4, + "setId": 2, + "iconIdx": 9 + }, + { + "icon": { + "paths": [ + "M461.521 358.16v-103.361h100.958v103.361h-100.958zM512 923.042c225.953 0 411.042-185.089 411.042-411.042s-185.089-411.042-411.042-411.042-411.042 185.089-411.042 411.042 185.089 411.042 411.042 411.042zM512 0c283.643 0 512 228.357 512 512s-228.357 512-512 512-512-228.357-512-512 228.357-512 512-512zM461.521 769.202v-307.681h100.958v307.681h-100.958z" + ], + "attrs": [], + "isMulticolor": false, + "isMulticolor2": false, + "tags": [ + "info_outline" + ], + "defaultCode": 59535, + "grid": 24 + }, + "attrs": [], + "properties": { + "order": 197, + "ligatures": "info_outline", + "id": 10, + "prevSize": 24, + "code": 59535, + "name": "info_outline" + }, + "setIdx": 4, + "setId": 2, + "iconIdx": 10 + }, + { + "icon": { + "paths": [ + "M512 692.282c98.554 0 180.282-81.728 180.282-180.282s-81.728-180.282-180.282-180.282-180.282 81.728-180.282 180.282 81.728 180.282 180.282 180.282zM894.197 562.479l108.169 84.131c9.615 7.211 12.019 21.634 4.808 33.653l-103.361 177.878c-7.211 12.019-19.23 14.423-31.249 9.615l-127.399-50.479c-26.441 19.23-55.286 38.46-86.535 50.479l-19.23 134.61c-2.404 12.019-12.019 21.634-24.038 21.634h-206.723c-12.019 0-21.634-9.615-24.038-21.634l-19.23-134.61c-31.249-12.019-60.094-28.845-86.535-50.479l-127.399 50.479c-12.019 4.808-24.038 2.404-31.249-9.615l-103.361-177.878c-7.211-12.019-4.808-26.441 4.808-33.653l108.169-84.131c-2.404-16.826-2.404-33.653-2.404-50.479s0-33.653 2.404-50.479l-108.169-84.131c-9.615-7.211-12.019-21.634-4.808-33.653l103.361-177.878c7.211-12.019 19.23-14.423 31.249-9.615l127.399 50.479c26.441-19.23 55.286-38.46 86.535-50.479l19.23-134.61c2.404-12.019 12.019-21.634 24.038-21.634h206.723c12.019 0 21.634 9.615 24.038 21.634l19.23 134.61c31.249 12.019 60.094 28.845 86.535 50.479l127.399-50.479c12.019-4.808 24.038-2.404 31.249 9.615l103.361 177.878c7.211 12.019 4.808 26.441-4.808 33.653l-108.169 84.131c2.404 16.826 2.404 33.653 2.404 50.479s0 33.653-2.404 50.479z" + ], + "attrs": [], + "isMulticolor": false, + "isMulticolor2": false, + "tags": [ + "settings" + ], + "defaultCode": 59576, + "grid": 24 + }, + "attrs": [], + "properties": { + "order": 198, + "ligatures": "settings", + "id": 11, + "prevSize": 24, + "code": 59576, + "name": "settings" + }, + "setIdx": 4, + "setId": 2, + "iconIdx": 11 + }, + { + "icon": { + "paths": [ + "M982 342c0 46-40 84-86 84-8 0-16 0-22-2l-152 152c2 6 4 14 4 22 0 46-40 84-86 84s-86-38-86-84c0-8 2-16 4-22l-110-110c-6 2-14 4-22 4s-16-2-22-4l-194 194c2 6 4 14 4 22 0 46-40 86-86 86s-86-40-86-86 40-84 86-84c8 0 16 0 22 2l194-194c-2-6-2-14-2-22 0-46 38-86 84-86s86 40 86 86c0 8 0 16-2 22l108 108c6-2 14-2 22-2s16 0 22 2l152-150c-2-6-4-14-4-22 0-46 40-86 86-86s86 40 86 86z" + ], + "attrs": [], + "isMulticolor": false, + "isMulticolor2": false, + "tags": [ + "timeline" + ], + "defaultCode": 59682, + "grid": 24 + }, + "attrs": [], + "properties": { + "ligatures": "timeline", + "id": 12, + "order": 199, + "prevSize": 24, + "code": 59682, + "name": "evolution" + }, + "setIdx": 4, + "setId": 2, + "iconIdx": 12 + }, + { + "icon": { + "paths": [ "M576 64c0 35.346-28.654 64-64 64s-64-28.654-64-64c0-35.346 28.654-64 64-64s64 28.654 64 64z", "M480 96h64v128h-64v-128z", "M897.024 1024h-770.048c-70.144 0-126.976-56.832-126.976-126.976v0c0-70.144 56.832-126.976 126.976-126.976h769.984c70.144 0 126.976 56.832 126.976 126.976v0c0.064 70.144-56.768 126.976-126.912 126.976z", @@ -19,14 +397,14 @@ }, "attrs": [], "properties": { - "order": 107, + "order": 131, "id": 0, "prevSize": 32, "code": 58880, "name": "alien" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 0 }, { @@ -47,14 +425,14 @@ }, "attrs": [], "properties": { - "order": 108, + "order": 132, "id": 1, "prevSize": 32, "code": 58881, "name": "annotation" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 1 }, { @@ -72,14 +450,14 @@ }, "attrs": [], "properties": { - "order": 109, + "order": 133, "id": 2, "prevSize": 32, "code": 58882, "name": "arrow-left" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 2 }, { @@ -97,14 +475,14 @@ }, "attrs": [], "properties": { - "order": 110, + "order": 134, "id": 3, "prevSize": 32, "code": 58883, "name": "arrow-right" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 3 }, { @@ -124,14 +502,14 @@ }, "attrs": [], "properties": { - "order": 111, + "order": 135, "id": 4, "prevSize": 32, "code": 58884, "name": "business" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 4 }, { @@ -155,14 +533,14 @@ }, "attrs": [], "properties": { - "order": 112, + "order": 136, "id": 5, "prevSize": 32, "code": 58885, "name": "calendar" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 5 }, { @@ -182,14 +560,14 @@ }, "attrs": [], "properties": { - "order": 113, + "order": 137, "id": 6, "prevSize": 32, "code": 58886, "name": "chart-bar" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 6 }, { @@ -207,14 +585,14 @@ }, "attrs": [], "properties": { - "order": 114, + "order": 229, "id": 7, "prevSize": 32, "code": 58887, "name": "chart-line-details" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 7 }, { @@ -232,14 +610,14 @@ }, "attrs": [], "properties": { - "order": 115, + "order": 228, "id": 8, "prevSize": 32, "code": 58888, "name": "chart-line" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 8 }, { @@ -258,14 +636,14 @@ }, "attrs": [], "properties": { - "order": 116, + "order": 227, "id": 9, "prevSize": 32, "code": 58889, "name": "chart-pie" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 9 }, { @@ -284,14 +662,14 @@ }, "attrs": [], "properties": { - "order": 117, + "order": 226, "id": 10, "prevSize": 32, "code": 58890, "name": "close" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 10 }, { @@ -310,14 +688,14 @@ }, "attrs": [], "properties": { - "order": 118, + "order": 225, "id": 11, "prevSize": 32, "code": 58891, "name": "collapsed-arrows" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 11 }, { @@ -336,14 +714,14 @@ }, "attrs": [], "properties": { - "order": 119, + "order": 224, "id": 12, "prevSize": 32, "code": 58892, "name": "configure" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 12 }, { @@ -361,14 +739,14 @@ }, "attrs": [], "properties": { - "order": 120, + "order": 138, "id": 13, "prevSize": 32, "code": 58893, "name": "datepicker-arr-l" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 13 }, { @@ -386,14 +764,14 @@ }, "attrs": [], "properties": { - "order": 121, + "order": 139, "id": 14, "prevSize": 32, "code": 58894, "name": "datepicker-arr-r" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 14 }, { @@ -412,14 +790,14 @@ }, "attrs": [], "properties": { - "order": 122, + "order": 140, "id": 15, "prevSize": 32, "code": 58895, "name": "delete" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 15 }, { @@ -443,14 +821,14 @@ }, "attrs": [], "properties": { - "order": 123, + "order": 141, "id": 16, "prevSize": 32, "code": 58896, "name": "document" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 16 }, { @@ -471,14 +849,14 @@ }, "attrs": [], "properties": { - "order": 124, + "order": 142, "id": 17, "prevSize": 32, "code": 58897, "name": "download" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 17 }, { @@ -497,14 +875,14 @@ }, "attrs": [], "properties": { - "order": 125, + "order": 143, "id": 18, "prevSize": 32, "code": 58898, "name": "drop" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 18 }, { @@ -523,14 +901,14 @@ }, "attrs": [], "properties": { - "order": 126, + "order": 144, "id": 19, "prevSize": 32, "code": 58899, "name": "ecommerce-abandoned" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 19 }, { @@ -549,14 +927,14 @@ }, "attrs": [], "properties": { - "order": 127, + "order": 145, "id": 20, "prevSize": 32, "code": 58900, "name": "ecommerce-order" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 20 }, { @@ -574,14 +952,14 @@ }, "attrs": [], "properties": { - "order": 128, + "order": 146, "id": 21, "prevSize": 32, "code": 58901, "name": "email" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 21 }, { @@ -599,14 +977,14 @@ }, "attrs": [], "properties": { - "order": 129, + "order": 147, "id": 22, "prevSize": 32, "code": 58902, "name": "error" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 22 }, { @@ -625,14 +1003,14 @@ }, "attrs": [], "properties": { - "order": 130, + "order": 148, "id": 23, "prevSize": 32, "code": 58903, "name": "export" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 23 }, { @@ -650,14 +1028,14 @@ }, "attrs": [], "properties": { - "order": 131, + "order": 149, "id": 24, "prevSize": 32, "code": 58904, "name": "feed" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 24 }, { @@ -676,14 +1054,14 @@ }, "attrs": [], "properties": { - "order": 132, + "order": 150, "id": 25, "prevSize": 32, "code": 58905, "name": "finance" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 25 }, { @@ -701,14 +1079,14 @@ }, "attrs": [], "properties": { - "order": 133, + "order": 151, "id": 26, "prevSize": 32, "code": 58906, "name": "folder-charts" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 26 }, { @@ -726,14 +1104,14 @@ }, "attrs": [], "properties": { - "order": 134, + "order": 152, "id": 27, "prevSize": 32, "code": 58907, "name": "folder" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 27 }, { @@ -754,14 +1132,14 @@ }, "attrs": [], "properties": { - "order": 135, + "order": 153, "id": 28, "prevSize": 32, "code": 58908, "name": "fullscreen" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 28 }, { @@ -781,14 +1159,14 @@ }, "attrs": [], "properties": { - "order": 136, + "order": 154, "id": 29, "prevSize": 32, "code": 58909, "name": "goal" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 29 }, { @@ -806,14 +1184,14 @@ }, "attrs": [], "properties": { - "order": 137, + "order": 223, "id": 30, "prevSize": 32, "code": 58910, "name": "help-alt" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 30 }, { @@ -831,14 +1209,14 @@ }, "attrs": [], "properties": { - "order": 138, + "order": 222, "id": 31, "prevSize": 32, "code": 58911, "name": "help" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 31 }, { @@ -859,14 +1237,14 @@ }, "attrs": [], "properties": { - "order": 139, + "order": 221, "id": 32, "prevSize": 32, "code": 58912, "name": "code" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 32 }, { @@ -884,14 +1262,14 @@ }, "attrs": [], "properties": { - "order": 140, + "order": 220, "id": 33, "prevSize": 32, "code": 58913, "name": "alert" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 33 }, { @@ -911,14 +1289,14 @@ }, "attrs": [], "properties": { - "order": 141, + "order": 219, "id": 34, "prevSize": 32, "code": 58914, "name": "edit" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 34 }, { @@ -938,14 +1316,14 @@ }, "attrs": [], "properties": { - "order": 142, + "order": 218, "id": 35, "prevSize": 32, "code": 58915, "name": "image" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 35 }, { @@ -966,14 +1344,14 @@ }, "attrs": [], "properties": { - "order": 143, + "order": 155, "id": 36, "prevSize": 32, "code": 58916, "name": "info" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 36 }, { @@ -992,14 +1370,14 @@ }, "attrs": [], "properties": { - "order": 144, + "order": 156, "id": 37, "prevSize": 32, "code": 58917, "name": "insights" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 37 }, { @@ -1024,14 +1402,14 @@ }, "attrs": [], "properties": { - "order": 145, + "order": 230, "id": 38, "prevSize": 32, "code": 58918, "name": "locked-2" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 38 }, { @@ -1049,14 +1427,14 @@ }, "attrs": [], "properties": { - "order": 146, + "order": 157, "id": 39, "prevSize": 32, "code": 58919, "name": "locked" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 39 }, { @@ -1074,14 +1452,14 @@ }, "attrs": [], "properties": { - "order": 147, + "order": 158, "id": 40, "prevSize": 32, "code": 58920, "name": "locked-3" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 40 }, { @@ -1099,14 +1477,14 @@ }, "attrs": [], "properties": { - "order": 148, + "order": 159, "id": 41, "prevSize": 32, "code": 58921, "name": "locked-4" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 41 }, { @@ -1127,14 +1505,14 @@ }, "attrs": [], "properties": { - "order": 149, + "order": 160, "id": 42, "prevSize": 32, "code": 58922, "name": "maximise" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 42 }, { @@ -1152,14 +1530,14 @@ }, "attrs": [], "properties": { - "order": 150, + "order": 161, "id": 43, "prevSize": 32, "code": 58923, "name": "minimise" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 43 }, { @@ -1177,14 +1555,14 @@ }, "attrs": [], "properties": { - "order": 151, + "order": 162, "id": 44, "prevSize": 32, "code": 58924, "name": "minus" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 44 }, { @@ -1202,14 +1580,14 @@ }, "attrs": [], "properties": { - "order": 152, + "order": 163, "id": 45, "prevSize": 32, "code": 58925, "name": "newtab" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 45 }, { @@ -1227,14 +1605,14 @@ }, "attrs": [], "properties": { - "order": 153, + "order": 164, "id": 46, "prevSize": 32, "code": 58926, "name": "ok" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 46 }, { @@ -1252,14 +1630,14 @@ }, "attrs": [], "properties": { - "order": 154, + "order": 165, "id": 47, "prevSize": 32, "code": 58927, "name": "open-source" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 47 }, { @@ -1277,14 +1655,14 @@ }, "attrs": [], "properties": { - "order": 155, + "order": 166, "id": 48, "prevSize": 32, "code": 58928, "name": "add" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 48 }, { @@ -1302,14 +1680,14 @@ }, "attrs": [], "properties": { - "order": 156, + "order": 167, "id": 49, "prevSize": 32, "code": 58929, "name": "puzzle" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 49 }, { @@ -1327,14 +1705,14 @@ }, "attrs": [], "properties": { - "order": 157, + "order": 168, "id": 50, "prevSize": 32, "code": 58930, "name": "refresh" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 50 }, { @@ -1353,14 +1731,14 @@ }, "attrs": [], "properties": { - "order": 158, + "order": 169, "id": 51, "prevSize": 32, "code": 58931, "name": "reload" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 51 }, { @@ -1379,14 +1757,14 @@ }, "attrs": [], "properties": { - "order": 159, + "order": 170, "id": 52, "prevSize": 32, "code": 58932, "name": "search" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 52 }, { @@ -1409,14 +1787,14 @@ }, "attrs": [], "properties": { - "order": 160, + "order": 171, "id": 53, "prevSize": 32, "code": 58933, "name": "users" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 53 }, { @@ -1438,14 +1816,14 @@ }, "attrs": [], "properties": { - "order": 161, + "order": 217, "id": 54, "prevSize": 32, "code": 58934, "name": "server-alt" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 54 }, { @@ -1467,14 +1845,14 @@ }, "attrs": [], "properties": { - "order": 162, + "order": 216, "id": 55, "prevSize": 32, "code": 58935, "name": "server" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 55 }, { @@ -1492,14 +1870,14 @@ }, "attrs": [], "properties": { - "order": 163, + "order": 215, "id": 56, "prevSize": 32, "code": 58936, "name": "hide" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 56 }, { @@ -1518,14 +1896,14 @@ }, "attrs": [], "properties": { - "order": 164, + "order": 214, "id": 57, "prevSize": 32, "code": 58937, "name": "show" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 57 }, { @@ -1543,14 +1921,14 @@ }, "attrs": [], "properties": { - "order": 165, + "order": 213, "id": 58, "prevSize": 32, "code": 58938, "name": "arrow-top" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 58 }, { @@ -1568,14 +1946,14 @@ }, "attrs": [], "properties": { - "order": 166, + "order": 212, "id": 59, "prevSize": 32, "code": 58939, "name": "arrow-bottom" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 59 }, { @@ -1593,14 +1971,14 @@ }, "attrs": [], "properties": { - "order": 167, + "order": 172, "id": 60, "prevSize": 32, "code": 58940, "name": "star" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 60 }, { @@ -1618,14 +1996,14 @@ }, "attrs": [], "properties": { - "order": 168, + "order": 173, "id": 61, "prevSize": 32, "code": 58941, "name": "success" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 61 }, { @@ -1651,14 +2029,14 @@ }, "attrs": [], "properties": { - "order": 169, + "order": 174, "id": 62, "prevSize": 32, "code": 58942, "name": "table-more" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 62 }, { @@ -1682,14 +2060,14 @@ }, "attrs": [], "properties": { - "order": 170, + "order": 175, "id": 63, "prevSize": 32, "code": 58943, "name": "table" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 63 }, { @@ -1708,14 +2086,14 @@ }, "attrs": [], "properties": { - "order": 171, + "order": 176, "id": 64, "prevSize": 32, "code": 58944, "name": "tag-cloud" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 64 }, { @@ -1733,14 +2111,14 @@ }, "attrs": [], "properties": { - "order": 172, + "order": 177, "id": 65, "prevSize": 32, "code": 58945, "name": "user" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 65 }, { @@ -1761,14 +2139,14 @@ }, "attrs": [], "properties": { - "order": 173, + "order": 178, "id": 66, "prevSize": 32, "code": 58946, "name": "user-add" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 66 }, { @@ -1791,14 +2169,14 @@ }, "attrs": [], "properties": { - "order": 175, + "order": 179, "id": 67, "prevSize": 32, "code": 58948, "name": "visitor-profile" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 67 }, { @@ -1819,14 +2197,14 @@ }, "attrs": [], "properties": { - "order": 176, + "order": 180, "id": 68, "prevSize": 32, "code": 58949, "name": "zoom-in" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 68 }, { @@ -1846,14 +2224,14 @@ }, "attrs": [], "properties": { - "order": 177, + "order": 181, "id": 69, "prevSize": 32, "code": 58950, "name": "zoom-out" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 69 }, { @@ -1874,14 +2252,14 @@ }, "attrs": [], "properties": { - "order": 178, + "order": 182, "id": 70, "prevSize": 32, "code": 58951, "name": "sign-out" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 70 }, { @@ -1901,14 +2279,14 @@ "attrs": [], "properties": { "id": 71, - "order": 202, + "order": 183, "ligatures": "", "prevSize": 32, "code": 58952, "name": "sign-in" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 71 }, { @@ -1928,14 +2306,14 @@ "attrs": [], "properties": { "id": 72, - "order": 181, + "order": 184, "ligatures": "", "prevSize": 32, "code": 58953, "name": "menu-hamburger" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 72 }, { @@ -1955,14 +2333,14 @@ "attrs": [], "properties": { "id": 73, - "order": 182, + "order": 185, "ligatures": "", "prevSize": 32, "code": 58954, "name": "menu-horiz" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 73 }, { @@ -1982,14 +2360,14 @@ "attrs": [], "properties": { "id": 74, - "order": 183, + "order": 186, "ligatures": "", "prevSize": 32, "code": 58955, "name": "menu-verti" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 74 }, { @@ -2009,14 +2387,14 @@ "attrs": [], "properties": { "id": 75, - "order": 184, + "order": 187, "ligatures": "", "prevSize": 32, "code": 58956, "name": "admin-administration" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 75 }, { @@ -2036,14 +2414,14 @@ "attrs": [], "properties": { "id": 76, - "order": 185, + "order": 188, "ligatures": "", "prevSize": 32, "code": 58957, "name": "admin-development" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 76 }, { @@ -2063,14 +2441,14 @@ "attrs": [], "properties": { "id": 77, - "order": 186, + "order": 211, "ligatures": "", "prevSize": 32, "code": 58958, "name": "admin-diagnostic" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 77 }, { @@ -2090,14 +2468,14 @@ "attrs": [], "properties": { "id": 78, - "order": 187, + "order": 210, "ligatures": "", "prevSize": 32, "code": 58959, "name": "admin-platform" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 78 }, { @@ -2117,14 +2495,14 @@ "attrs": [], "properties": { "id": 79, - "order": 188, + "order": 209, "ligatures": "", "prevSize": 32, "code": 58960, "name": "admin-settings" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 79 }, { @@ -2144,14 +2522,14 @@ "attrs": [], "properties": { "id": 80, - "order": 189, + "order": 208, "ligatures": "", "prevSize": 32, "code": 58961, "name": "reporting-actions" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 80 }, { @@ -2171,14 +2549,14 @@ "attrs": [], "properties": { "id": 81, - "order": 190, + "order": 207, "ligatures": "", "prevSize": 32, "code": 58962, "name": "reporting-dashboard" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 81 }, { @@ -2198,14 +2576,14 @@ "attrs": [], "properties": { "id": 82, - "order": 191, + "order": 206, "ligatures": "", "prevSize": 32, "code": 58963, "name": "reporting-ecommerce" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 82 }, { @@ -2225,14 +2603,14 @@ "attrs": [], "properties": { "id": 83, - "order": 192, + "order": 189, "ligatures": "", "prevSize": 32, "code": 58964, "name": "reporting-goal" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 83 }, { @@ -2252,14 +2630,14 @@ "attrs": [], "properties": { "id": 84, - "order": 193, + "order": 190, "ligatures": "", "prevSize": 32, "code": 58965, "name": "reporting-referer" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 84 }, { @@ -2279,14 +2657,14 @@ "attrs": [], "properties": { "id": 85, - "order": 197, + "order": 191, "ligatures": "", "prevSize": 32, "code": 58966, "name": "reporting-visitors" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 85 }, { @@ -2306,14 +2684,14 @@ "attrs": [], "properties": { "id": 86, - "order": 196, + "order": 192, "ligatures": "", "prevSize": 32, "code": 58967, "name": "user-manage" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 86 }, { @@ -2333,14 +2711,14 @@ "attrs": [], "properties": { "id": 87, - "order": 195, + "order": 193, "ligatures": "", "prevSize": 32, "code": 58968, "name": "user-personal" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 87 }, { @@ -2366,8 +2744,8 @@ "code": 58969, "name": "user-platform" }, - "setIdx": 0, - "setId": 13, + "setIdx": 2, + "setId": 4, "iconIdx": 88 }, { @@ -2386,317 +2764,112 @@ }, "attrs": [], "properties": { - "order": 210, + "order": 195, "ligatures": "assignment", "id": 0, "prevSize": 24, "code": 59485, "name": "assignment" }, - "setIdx": 1, - "setId": 12, + "setIdx": 3, + "setId": 3, "iconIdx": 0 }, { "icon": { "paths": [ - "M562.479 358.16v-103.361h-100.958v103.361h100.958zM562.479 769.202v-307.681h-100.958v307.681h100.958zM512 0c283.643 0 512 228.357 512 512s-228.357 512-512 512-512-228.357-512-512 228.357-512 512-512z" + "M832 64h-640l-192 192v672c0 17.674 14.326 32 32 32h960c17.672 0 32-14.326 32-32v-672l-192-192zM512 832l-320-256h192v-192h256v192h192l-320 256zM154.51 192l64-64h586.978l64 64h-714.978z" ], "attrs": [], "isMulticolor": false, "isMulticolor2": false, "tags": [ - "info" + "box-add", + "box", + "download", + "storage", + "inbox", + "archive" ], - "defaultCode": 59534, - "grid": 24 + "defaultCode": 59742, + "grid": 16 }, "attrs": [], "properties": { + "ligatures": "box-add, box3", + "name": "archive", "order": 200, - "ligatures": "info", "id": 0, - "prevSize": 24, - "code": 59534, - "name": "info2" + "prevSize": 32, + "code": 59742 }, - "setIdx": 2, - "setId": 11, + "setIdx": 5, + "setId": 1, "iconIdx": 0 }, { "icon": { "paths": [ - "M461.521 358.16v-103.361h100.958v103.361h-100.958zM512 923.042c225.953 0 411.042-185.089 411.042-411.042s-185.089-411.042-411.042-411.042-411.042 185.089-411.042 411.042 185.089 411.042 411.042 411.042zM512 0c283.643 0 512 228.357 512 512s-228.357 512-512 512-512-228.357-512-512 228.357-512 512-512zM461.521 769.202v-307.681h100.958v307.681h-100.958z" + "M956.29 804.482l-316.29-527.024v-213.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 32h32v213.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 640l206.962-344.938v-231.062h128v231.062l206.964 344.938h-541.926z" ], "attrs": [], "isMulticolor": false, "isMulticolor2": false, "tags": [ - "info_outline" + "lab", + "beta", + "beaker", + "test", + "experiment" ], - "defaultCode": 59535, - "grid": 24 + "defaultCode": 59818, + "grid": 16 }, "attrs": [], "properties": { + "ligatures": "lab, beta", + "name": "lab", "order": 201, - "ligatures": "info_outline", "id": 1, - "prevSize": 24, - "code": 59535, - "name": "info_outline" + "prevSize": 32, + "code": 59818 }, - "setIdx": 2, - "setId": 11, + "setIdx": 5, + "setId": 1, "iconIdx": 1 }, { "icon": { "paths": [ - "M512 692.282c98.554 0 180.282-81.728 180.282-180.282s-81.728-180.282-180.282-180.282-180.282 81.728-180.282 180.282 81.728 180.282 180.282 180.282zM894.197 562.479l108.169 84.131c9.615 7.211 12.019 21.634 4.808 33.653l-103.361 177.878c-7.211 12.019-19.23 14.423-31.249 9.615l-127.399-50.479c-26.441 19.23-55.286 38.46-86.535 50.479l-19.23 134.61c-2.404 12.019-12.019 21.634-24.038 21.634h-206.723c-12.019 0-21.634-9.615-24.038-21.634l-19.23-134.61c-31.249-12.019-60.094-28.845-86.535-50.479l-127.399 50.479c-12.019 4.808-24.038 2.404-31.249-9.615l-103.361-177.878c-7.211-12.019-4.808-26.441 4.808-33.653l108.169-84.131c-2.404-16.826-2.404-33.653-2.404-50.479s0-33.653 2.404-50.479l-108.169-84.131c-9.615-7.211-12.019-21.634-4.808-33.653l103.361-177.878c7.211-12.019 19.23-14.423 31.249-9.615l127.399 50.479c26.441-19.23 55.286-38.46 86.535-50.479l19.23-134.61c2.404-12.019 12.019-21.634 24.038-21.634h206.723c12.019 0 21.634 9.615 24.038 21.634l19.23 134.61c31.249 12.019 60.094 28.845 86.535 50.479l127.399-50.479c12.019-4.808 24.038-2.404 31.249 9.615l103.361 177.878c7.211 12.019 4.808 26.441-4.808 33.653l-108.169 84.131c2.404 16.826 2.404 33.653 2.404 50.479s0 33.653-2.404 50.479z" + "M768 704h-101.49l-160-160 160-160h101.49v160l224-224-224-224v160h-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-192v128h165.49l160 160-160 160h-165.49v128h192c16.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.746h128v160l224-224-224-224v160z" ], "attrs": [], "isMulticolor": false, "isMulticolor2": false, "tags": [ - "settings" + "shuffle", + "random", + "player" ], - "defaultCode": 59576, - "grid": 24 + "defaultCode": 59952, + "grid": 16 }, "attrs": [], "properties": { - "order": 9, - "ligatures": "settings", + "ligatures": "shuffle, random", + "name": "transition", "id": 2, - "prevSize": 24, - "code": 59576, - "name": "settings" + "order": 202, + "prevSize": 32, + "code": 59952 }, - "setIdx": 2, - "setId": 11, + "setIdx": 5, + "setId": 1, "iconIdx": 2 }, { "icon": { "paths": [ - "M557.5 234.667l394.333 277.333-394.333 277.333v-554.667zM141.5 789.333v-554.667l394.333 277.333z" - ], - "attrs": [], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "fast_forward" - ], - "defaultCode": 57375, - "grid": 24 - }, - "attrs": [], - "properties": { - "order": 215, - "ligatures": "fast_forward", - "id": 3, - "prevSize": 24, - "code": 57375, - "name": "fast-forward" - }, - "setIdx": 2, - "setId": 11, - "iconIdx": 3 - }, - { - "icon": { - "paths": [ - "M488.167 512l394.333-277.333v554.667zM466.5 789.333l-394.333-277.333 394.333-277.333v554.667z" - ], - "attrs": [], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "fast_rewind" - ], - "defaultCode": 57376, - "grid": 24 - }, - "attrs": [], - "properties": { - "order": 218, - "ligatures": "fast_rewind", - "id": 4, - "prevSize": 24, - "code": 57376, - "name": "fast-rewind" - }, - "setIdx": 2, - "setId": 11, - "iconIdx": 4 - }, - { - "icon": { - "paths": [ - "M665.84 716.319v-408.639h-103.362v408.639h103.362zM461.521 716.319v-408.639h-103.362v408.639h103.362zM512 0c283.643 0 512 228.357 512 512s-228.357 512-512 512-512-228.357-512-512 228.357-512 512-512z" - ], - "attrs": [], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "pause_circle_filled" - ], - "defaultCode": 57397, - "grid": 24 - }, - "attrs": [], - "properties": { - "order": 225, - "ligatures": "pause_circle_filled", - "id": 5, - "prevSize": 24, - "code": 57397, - "name": "pause" - }, - "setIdx": 2, - "setId": 11, - "iconIdx": 5 - }, - { - "icon": { - "paths": [ - "M408.639 742.76l307.681-230.76-307.681-230.76v461.521zM512 0c283.643 0 512 228.357 512 512s-228.357 512-512 512-512-228.357-512-512 228.357-512 512-512z" - ], - "attrs": [], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "play_circle_filled" - ], - "defaultCode": 57400, - "grid": 24 - }, - "attrs": [], - "properties": { - "order": 234, - "ligatures": "play_circle_filled", - "id": 6, - "prevSize": 24, - "code": 57400, - "name": "play" - }, - "setIdx": 2, - "setId": 11, - "iconIdx": 6 - }, - { - "icon": { - "paths": [ - "M512 229.152c206.638 0 375.906 167.070 375.906 373.708s-169.268 375.906-375.906 375.906-375.906-169.268-375.906-375.906h94.525c0 156.079 125.3 281.38 281.38 281.38s281.38-125.3 281.38-281.38-125.3-281.38-281.38-281.38v189.053l-235.216-235.216 235.216-235.216v189.053z" - ], - "attrs": [], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "replay" - ], - "defaultCode": 57410, - "grid": 24 - }, - "attrs": [], - "properties": { - "order": 219, - "ligatures": "replay", - "id": 7, - "prevSize": 24, - "code": 57410, - "name": "replay" - }, - "setIdx": 2, - "setId": 11, - "iconIdx": 7 - }, - { - "icon": { - "paths": [ - "M710.334 213.334h100.334v597.334h-100.334v-597.334zM213.334 810.666v-597.334l422.334 298.666z" - ], - "attrs": [], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "skip_next" - ], - "defaultCode": 57412, - "grid": 24 - }, - "attrs": [], - "properties": { - "order": 216, - "ligatures": "skip_next", - "id": 8, - "prevSize": 24, - "code": 57412, - "name": "skip-next" - }, - "setIdx": 2, - "setId": 11, - "iconIdx": 8 - }, - { - "icon": { - "paths": [ - "M388.332 512l422.33-298.668v597.33zM213.332 213.332h100.331v597.33h-100.331v-597.33z" - ], - "attrs": [], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "skip_previous" - ], - "defaultCode": 57413, - "grid": 24 - }, - "attrs": [], - "properties": { - "order": 217, - "ligatures": "skip_previous", - "id": 9, - "prevSize": 24, - "code": 57413, - "name": "skip_previous" - }, - "setIdx": 2, - "setId": 11, - "iconIdx": 9 - }, - { - "icon": { - "paths": [ - "M213.334 213.334h597.334v597.334h-597.334v-597.334z" - ], - "attrs": [], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "stop" - ], - "defaultCode": 57415, - "grid": 24 - }, - "attrs": [], - "properties": { - "order": 228, - "ligatures": "stop", - "id": 10, - "prevSize": 24, - "code": 57415, - "name": "stop" - }, - "setIdx": 2, - "setId": 11, - "iconIdx": 10 - }, - { - "icon": { - "paths": [ "M512 0c-282.77 0-512 71.634-512 160v96l384 384v320c0 35.346 57.306 64 128 64 70.692 0 128-28.654 128-64v-320l384-384v-96c0-88.366-229.23-160-512-160zM94.384 138.824c23.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" ], "attrs": [], @@ -2714,76 +2887,13 @@ "ligatures": "filter, funnel", "name": "funnel", "order": 203, - "id": 0, + "id": 3, "prevSize": 32, "code": 59995 }, - "setIdx": 3, - "setId": 10, - "iconIdx": 0 - }, - { - "icon": { - "paths": [ - "M832 64h-640l-192 192v672c0 17.674 14.326 32 32 32h960c17.672 0 32-14.326 32-32v-672l-192-192zM512 832l-320-256h192v-192h256v192h192l-320 256zM154.51 192l64-64h586.978l64 64h-714.978z" - ], - "attrs": [], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "box-add", - "box", - "download", - "storage", - "inbox", - "archive" - ], - "defaultCode": 59742, - "grid": 16 - }, - "attrs": [], - "properties": { - "ligatures": "box-add, box3", - "name": "archive", - "order": 211, - "id": 1, - "prevSize": 32, - "code": 59742 - }, - "setIdx": 3, - "setId": 10, - "iconIdx": 1 - }, - { - "icon": { - "paths": [ - "M956.29 804.482l-316.29-527.024v-213.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 32h32v213.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 640l206.962-344.938v-231.062h128v231.062l206.964 344.938h-541.926z" - ], - "attrs": [], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "lab", - "beta", - "beaker", - "test", - "experiment" - ], - "defaultCode": 59818, - "grid": 16 - }, - "attrs": [], - "properties": { - "ligatures": "lab, beta", - "name": "lab", - "order": 212, - "id": 2, - "prevSize": 32, - "code": 59818 - }, - "setIdx": 3, - "setId": 10, - "iconIdx": 2 + "setIdx": 5, + "setId": 1, + "iconIdx": 3 }, { "icon": { @@ -2803,14 +2913,14 @@ "attrs": [], "properties": { "name": "angle-double-up", - "id": 231, - "order": 235, + "id": 0, + "order": 204, "prevSize": 28, "code": 61698 }, - "setIdx": 4, - "setId": 9, - "iconIdx": 231 + "setIdx": 6, + "setId": 0, + "iconIdx": 0 }, { "icon": { @@ -2830,41 +2940,14 @@ "attrs": [], "properties": { "name": "angle-double-down", - "id": 232, - "order": 236, + "id": 1, + "order": 205, "prevSize": 28, "code": 61699 }, - "setIdx": 4, - "setId": 9, - "iconIdx": 232 - }, - { - "icon": { - "paths": [ - "M598 138c172 38 298 192 298 374s-126 336-298 374v-88c124-36 212-150 212-286s-88-250-212-286v-88zM704 512c0 76-42 140-106 172v-344c64 32 106 96 106 172zM128 384h170l214-214v684l-214-214h-170v-256z" - ], - "attrs": [], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "volume_up" - ], - "defaultCode": 57424, - "grid": 24 - }, - "attrs": [], - "properties": { - "ligatures": "volume_up", - "id": 820, - "order": 2, - "prevSize": 24, - "code": 57424, - "name": "audio" - }, - "setIdx": 0, - "setId": 7, - "iconIdx": 820 + "setIdx": 6, + "setId": 0, + "iconIdx": 1 } ], "height": 1024, diff --git a/plugins/Morpheus/stylesheets/base/icons.css b/plugins/Morpheus/stylesheets/base/icons.css index fae2a340f4..d1eb6500be 100644 --- a/plugins/Morpheus/stylesheets/base/icons.css +++ b/plugins/Morpheus/stylesheets/base/icons.css @@ -2,14 +2,18 @@ /* @todo remove piwik font in Matomo 4.0 */ @font-face { font-family: 'piwik'; - src: url('plugins/Morpheus/fonts/piwik.woff?43xrdb') format('woff'); + src: url('plugins/Morpheus/fonts/piwik.ttf?gnoj4m') format('truetype'), + url('plugins/Morpheus/fonts/piwik.woff?gnoj4m') format('woff'), + url('plugins/Morpheus/fonts/piwik.svg?gnoj4m#piwik') format('svg'); font-weight: normal; font-style: normal; } @font-face { font-family: 'matomo'; - src: url('plugins/Morpheus/fonts/matomo.woff?43xrdb') format('woff'); + src: url('plugins/Morpheus/fonts/matomo.ttf?gnoj4m') format('truetype'), + url('plugins/Morpheus/fonts/matomo.woff?gnoj4m') format('woff'), + url('plugins/Morpheus/fonts/matomo.svg?gnoj4m#matomo') format('svg'); font-weight: normal; font-style: normal; } @@ -29,320 +33,425 @@ } .icon-settings:before { - content: "\e8b8"; + content: "\e8b8"; } + .icon-info2:before { content: "\e88e"; } + .icon-info_outline:before { content: "\e88f"; } + .icon-alien:before { content: "\e600"; } + .icon-annotation:before { content: "\e601"; } + .icon-arrow-left:before { content: "\e602"; } + .icon-arrow-right:before { content: "\e603"; } + .icon-business:before { content: "\e604"; } + .icon-calendar:before { content: "\e605"; } + .icon-chart-bar:before { content: "\e606"; } + .icon-chart-line-details:before { content: "\e607"; } + .icon-chart-line:before { content: "\e608"; } + .icon-chart-pie:before { content: "\e609"; } + .icon-close:before { content: "\e60a"; } + .icon-arrow-collapsed:before { content: "\e60b"; } + .icon-configure:before { content: "\e60c"; } + .icon-datepicker-arr-l:before { - content: "\e60d"; + content: "\e60d"; } + .icon-datepicker-arr-r:before { - content: "\e60e"; + content: "\e60e"; } + .icon-delete:before { content: "\e60f"; } + .icon-document:before { content: "\e610"; } + .icon-download:before { content: "\e611"; } + .icon-drop:before { content: "\e612"; } + .icon-ecommerce-abandoned-cart:before { content: "\e613"; } + .icon-ecommerce-order:before { content: "\e614"; } + .icon-email:before { content: "\e615"; } + .icon-error:before { content: "\e616"; } + .icon-export:before { content: "\e617"; } + .icon-feed:before { content: "\e618"; } + .icon-finance:before { content: "\e619"; } + .icon-folder-charts:before { content: "\e61a"; } + .icon-folder:before { content: "\e61b"; } + .icon-fullscreen:before { content: "\e61c"; } + .icon-goal:before { content: "\e61d"; } + .icon-help-alt:before { content: "\e61e"; } + .icon-help:before { content: "\e61f"; } + .icon-code:before { content: "\e620"; } + .icon-warning:before { content: "\e621"; } + .icon-edit:before { content: "\e622"; } + .icon-image:before { content: "\e623"; } + .icon-info:before { content: "\e624"; } + .icon-insights:before { content: "\e625"; } + .icon-locked-2:before { content: "\e626"; } + .icon-locked-3:before { content: "\e627"; } + .icon-locked:before { content: "\e628"; } + .icon-locked-4:before { content: "\e629"; } + .icon-maximise:before { content: "\e62a"; } + .icon-minimise:before { content: "\e62b"; } + .icon-minus:before { content: "\e62c"; } + .icon-newtab:before { content: "\e62d"; } + .icon-ok:before { content: "\e62e"; } + .icon-open-source:before { content: "\e62f"; } + .icon-plus:before { content: "\e630"; } + .icon-add:before { content: "\e630"; } + .icon-puzzle:before { content: "\e631"; } + .icon-refresh:before { content: "\e632"; } + .icon-reload:before { content: "\e633"; } + .icon-search:before { content: "\e634"; } + .icon-segment:before { content: "\e635"; } + .icon-users:before { content: "\e635"; } + .icon-server-alt:before { content: "\e636"; } + .icon-server:before { content: "\e637"; } + .icon-hide:before { content: "\e638"; } + .icon-show:before { content: "\e639"; } + .icon-arrow-top:before { content: "\e63a"; } + .icon-arrow-bottom:before { content: "\e63b"; } + .icon-star:before { content: "\e63c"; } + .icon-success:before { content: "\e63d"; } + .icon-table-more:before { content: "\e63e"; } + .icon-table:before { content: "\e63f"; } + .icon-tag-cloud:before { content: "\e640"; } + .icon-user-add:before { content: "\e642"; } + .icon-user:before { content: "\e641"; } + .icon-play:before { content: "\e038"; } + .icon-visitor-profile:before { content: "\e644"; } + .icon-zoom-in:before { content: "\e645"; } + .icon-zoom-out:before { content: "\e646"; } + .icon-sign-out:before { content: "\e647"; } + .icon-sign-in:before { - content: "\e648"; + content: "\e648"; } + .icon-menu-hamburger:before { - content: "\e649"; + content: "\e649"; } + .icon-more-horiz:before { - content: "\e64a"; + content: "\e64a"; } + .icon-more-verti:before { - content: "\e64b"; + content: "\e64b"; } + .icon-admin-administration:before { - content: "\e64c"; + content: "\e64c"; } + .icon-admin-development:before { - content: "\e64d"; + content: "\e64d"; } + .icon-admin-diagnostic:before { - content: "\e64e"; + content: "\e64e"; } + .icon-admin-platform:before { - content: "\e64f"; + content: "\e64f"; } + .icon-admin-settings:before { - content: "\e650"; + content: "\e650"; } + .icon-reporting-actions:before { - content: "\e651"; + content: "\e651"; } + .icon-reporting-dashboard:before { - content: "\e652"; + content: "\e652"; } + .icon-reporting-ecommerce:before { - content: "\e653"; + content: "\e653"; } + .icon-reporting-goal:before { - content: "\e654"; + content: "\e654"; } + .icon-reporting-referer:before { - content: "\e655"; + content: "\e655"; } + .icon-reporting-visitors:before { - content: "\e656"; + content: "\e656"; } + .icon-user-manage:before { - content: "\e657"; + content: "\e657"; } + .icon-user-personal:before { - content: "\e658"; + content: "\e658"; } + .icon-user-platform:before { - content: "\e659"; + content: "\e659"; } + .icon-funnel:before { - content: "\ea5b"; + content: "\ea5b"; } + .icon-form:before { content: "\e85d"; } + .icon-lab:before { content: "\e9aa"; } + .icon-archive:before { content: "\e95e"; } + .icon-fast-forward:before { content: "\e01f"; } + .icon-fast-rewind:before { content: "\e020"; } + .icon-pause:before { content: "\e035"; } + .icon-replay:before { content: "\e042"; } + .icon-skip-next:before { content: "\e044"; } + .icon-skip-previous:before { content: "\e045"; } + .icon-stop:before { content: "\e047"; } @@ -350,9 +459,23 @@ .icon-arrowup:before { content: "\f102"; } + .icon-arrowdown:before { content: "\f103"; } + .icon-audio:before { content: "\e050"; +} + +.icon-transition:before { + content: "\ea30"; +} + +.icon-evolution:before { + content: "\e922"; +} + +.icon-overlay:before { + content: "\e0cb"; }
\ No newline at end of file diff --git a/plugins/Morpheus/templates/demo.twig b/plugins/Morpheus/templates/demo.twig index c675a3a22a..9a74ca4d6d 100644 --- a/plugins/Morpheus/templates/demo.twig +++ b/plugins/Morpheus/templates/demo.twig @@ -671,8 +671,11 @@ 'chart-pie', 'chart-line', 'chart-line-details', + 'evolution', 'funnel', 'form', + 'transition', + 'overlay', 'lab' ], 'Users': [ diff --git a/plugins/Overlay/javascripts/Piwik_Overlay.js b/plugins/Overlay/javascripts/Piwik_Overlay.js index b409911e49..2b18578147 100644 --- a/plugins/Overlay/javascripts/Piwik_Overlay.js +++ b/plugins/Overlay/javascripts/Piwik_Overlay.js @@ -8,7 +8,7 @@ var Piwik_Overlay = (function () { var $body, $iframe, $sidebar, $main, $location, $loading, $errorNotLoading; - var $rowEvolutionLink, $transitionsLink, $fullScreenLink, $visitorLogLink; + var $rowEvolutionLink, $transitionsLink, $visitorLogLink; var idSite, period, date, segment; @@ -103,7 +103,6 @@ var Piwik_Overlay = (function () { $sidebar.hide(); $location.hide(); - $fullScreenLink.hide(); $rowEvolutionLink.hide(); $transitionsLink.hide(); $visitorLogLink.hide(); @@ -114,7 +113,6 @@ var Piwik_Overlay = (function () { /** Hide the loading message */ function hideLoading() { $loading.hide(); - $fullScreenLink.show(); } function getOverlaySegment(url) { @@ -176,7 +174,6 @@ var Piwik_Overlay = (function () { $rowEvolutionLink = $('#overlayRowEvolution'); $transitionsLink = $('#overlayTransitions'); - $fullScreenLink = $('#overlayFullScreen'); $visitorLogLink = $('#overlaySegmentedVisitorLog'); adjustDimensions(); @@ -261,16 +258,6 @@ var Piwik_Overlay = (function () { SegmentedVisitorLog.show('Actions.getPageUrls', $('#segment').val(), {}); return false; }); - - // handle full screen link - $fullScreenLink.click(function () { - var href = iframeSrcBase; - if (iframeCurrentPage) { - href += '#' + iframeCurrentPage.replace(/#/g, '%23'); - } - window.location.href = href; - return false; - }); }, /** This callback is used from within the iframe */ diff --git a/plugins/Overlay/javascripts/rowaction.js b/plugins/Overlay/javascripts/rowaction.js index de063b990e..f4e733433d 100644 --- a/plugins/Overlay/javascripts/rowaction.js +++ b/plugins/Overlay/javascripts/rowaction.js @@ -65,8 +65,7 @@ DataTable_RowActions_Registry.register({ name: 'Overlay', - dataTableIcon: 'plugins/Overlay/images/overlay_icon.png', - dataTableIconHover: 'plugins/Overlay/images/overlay_icon_hover.png', + dataTableIcon: 'icon-overlay', order: 30, diff --git a/plugins/Overlay/stylesheets/overlay.css b/plugins/Overlay/stylesheets/overlay.css index 257ae31d9a..42585250b3 100644 --- a/plugins/Overlay/stylesheets/overlay.css +++ b/plugins/Overlay/stylesheets/overlay.css @@ -16,7 +16,7 @@ body #header { } a#overlayTitle { - font-size: 12px; + font-size: 16px; text-decoration: none; color: #4d4d4d; margin-left: 10px; @@ -27,8 +27,14 @@ a#overlayTitle .icon-help { #overlayDateRangeSelection { padding: 0 0 0 25px; - background: url(../../Morpheus/images/icon-calendar.png) 2px center no-repeat; margin: 20px 10px; + position: relative; +} + +#overlayDateRangeSelection .icon-calendar { + position: absolute; + top: 18px; + left: 2px; } #overlayLocation, .overlaySegment { @@ -62,7 +68,6 @@ a#overlayTitle .icon-help { #overlaySidebar h2 { font-size: 15px; margin: 0 0 8px 0; - color: #255792; } .overlayMainMetrics { @@ -70,7 +75,6 @@ a#overlayTitle .icon-help { } a#overlaySegmentedVisitorLog, -a#overlayFullScreen, a#overlayRowEvolution, a#overlayTransitions { display: block; @@ -78,30 +82,24 @@ a#overlayTransitions { font-size: 13px; line-height: 15px; margin: 0 0 0 10px; - padding: 8px 10px 3px 25px; + padding: 8px 10px 3px 0; text-decoration: none; } -a#overlayRowEvolution { - margin-top: 20px; - background: url(../../Morpheus/images/row_evolution_hover.png) no-repeat 0 7px; -} - -a#overlayTransitions { - background: url(../../Transitions/images/transitions_icon_hover.png) no-repeat 0 6px; -} - -a#overlaySegmentedVisitorLog { - background: url(../../Live/images/visitorlog-hover.png) no-repeat 0 8px; +a#overlaySegmentedVisitorLog .icon, +a#overlayRowEvolution .icon, +a#overlayTransitions .icon { + font-size: 18px; + display: block; + float: left; + margin-right: 5px; } -a#overlayFullScreen { +a#overlayRowEvolution { margin-top: 20px; - background: url(../../Morpheus/images/fullscreen.png) no-repeat 3px 8px; } a#overlaySegmentedVisitorLog:hover, -a#overlayFullScreen:hover, a#overlayRowEvolution:hover, a#overlayTransitions:hover { color: #E87500; diff --git a/plugins/Overlay/templates/index.twig b/plugins/Overlay/templates/index.twig index 8d51270764..f47b875fc7 100644 --- a/plugins/Overlay/templates/index.twig +++ b/plugins/Overlay/templates/index.twig @@ -14,6 +14,8 @@ </a> <div id="overlayDateRangeSelection"> + + <span class="icon icon-calendar"></span> <select id="overlayDateRangeSelect" name="overlayDateRangeSelect"> <option value="day;today">{{ 'Intl_Today'|translate }}</option> <option value="day;yesterday">{{ 'Intl_Yesterday'|translate }}</option> @@ -49,9 +51,9 @@ <div id="overlaySidebar"></div> - <a id="overlayRowEvolution">{{ 'General_RowEvolutionRowActionTooltipTitle'|translate }}</a> - <a id="overlayTransitions">{{ 'General_TransitionsRowActionTooltipTitle'|translate }}</a> - <a id="overlaySegmentedVisitorLog">{{ 'Live_RowActionTooltipTitle'|translate }}</a> + <a id="overlayRowEvolution"><span class="icon icon-evolution"></span>{{ 'General_RowEvolutionRowActionTooltipTitle'|translate }}</a> + <a id="overlayTransitions"><span class="icon icon-transition"></span>{{ 'General_TransitionsRowActionTooltipTitle'|translate }}</a> + <a id="overlaySegmentedVisitorLog"><span class="icon icon-visitor-profile"></span>{{ 'Live_RowActionTooltipTitle'|translate }}</a> {{ postEvent('Template.afterOverlaySidebar') }} </div> diff --git a/plugins/Transitions/javascripts/transitions.js b/plugins/Transitions/javascripts/transitions.js index 7a75945543..1bb6b1043b 100644 --- a/plugins/Transitions/javascripts/transitions.js +++ b/plugins/Transitions/javascripts/transitions.js @@ -101,8 +101,7 @@ DataTable_RowActions_Registry.register({ name: 'Transitions', - dataTableIcon: 'plugins/Transitions/images/transitions_icon.png', - dataTableIconHover: 'plugins/Transitions/images/transitions_icon_hover.png', + dataTableIcon: 'icon-transition', order: 20, diff --git a/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png b/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png index d8918cba33..ed4623c453 100644 --- a/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png +++ b/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27b1fb101786bbf1bf5d4bee639c98f830088a5c0b2ddb38881255aa3bd7b727 -size 377585 +oid sha256:2bafb7590170d13adf50e652f85f5a9c916fe8d9f6c4ee95e3e90547b817524c +size 377310 diff --git a/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png b/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png index 97fcd1e778..eae235c336 100644 --- a/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png +++ b/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7716e17ab94572b525adb64c9571bb9cd6693efce607d8efeac3bf5ce9b79e7b -size 71763 +oid sha256:99b4dc5d20badb210aa7995d60d36c018b1a371fc46f1b03483eb236cc242354 +size 71291 diff --git a/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png b/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png index 951cdfb3c8..09cf131436 100644 --- a/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png +++ b/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9da52981d4d33700300db60cb2d4a5990725a83d950375d064f60d56d46759f9 -size 70876 +oid sha256:6d21a7cb9d45bad644cfc1ea8ffd9f8e9cbf8330da9473eacde846d3c569f948 +size 70730 diff --git a/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png b/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png index b135fd955d..0f02b60613 100644 --- a/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png +++ b/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1b784df469c482d1ff104f23dab244287647274e0ef24be529c875f454c8edc -size 434131 +oid sha256:b9c877245bd20f4a67f7f3ef2b3d3e48d8a94d048136842014d99b42e7371a23 +size 382648 diff --git a/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png b/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png index be5cfddaeb..60522aac93 100644 --- a/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png +++ b/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d59abec0369ef516a34364aa31285a00c03ff0e22452f3071d1ca77a994f27a -size 71750 +oid sha256:55a8bb4bebacbe5ca1b288a7b38a13c69469f6d0e016f5a6a5a5e1f8709e6f2e +size 71279 diff --git a/tests/UI/expected-screenshots/Morpheus_load.png b/tests/UI/expected-screenshots/Morpheus_load.png index f8568e506e..7328418028 100644 --- a/tests/UI/expected-screenshots/Morpheus_load.png +++ b/tests/UI/expected-screenshots/Morpheus_load.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f72ee64e022e869ce2395a9349e90e82c4fba0ae61e87a5c2ef10536f3cd7782 -size 1236739 +oid sha256:281c004e26db482472f5698b90890dbdcda6f117e7e71f4481ad2737915fd3f3 +size 1242172 diff --git a/tests/UI/expected-screenshots/Overlay_loaded.png b/tests/UI/expected-screenshots/Overlay_loaded.png index 65c1f75f71..2acc288baf 100644 --- a/tests/UI/expected-screenshots/Overlay_loaded.png +++ b/tests/UI/expected-screenshots/Overlay_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69a0c62eeda952f69427a4f62d823f4ba94931c1c1af99235978939db3a84b44 -size 108576 +oid sha256:378eebedf0042fcf27c9201c01694ef513069e4c8c59055693b4f46c2713255a +size 108949 diff --git a/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png b/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png index 38f0586a4c..7a5dc8118c 100644 --- a/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png +++ b/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7da3a752343b1cad36de141e4be57a1af12baf30095f4b01ba8b1346db6925bc -size 105835 +oid sha256:8f48d2268123d1251e887e31f5a7861461f5583cfc00c517b42dd179e064bc40 +size 106269 diff --git a/tests/UI/expected-screenshots/Overlay_page_change.png b/tests/UI/expected-screenshots/Overlay_page_change.png index 172e06ea17..3a513ad0fb 100644 --- a/tests/UI/expected-screenshots/Overlay_page_change.png +++ b/tests/UI/expected-screenshots/Overlay_page_change.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:509be82d8ddfd719a8e9d9bd68908b27bc8742f914da583d6c66e2b79caa8fa3 -size 215338 +oid sha256:97d3eea2ca2f93a80a99e5f9953ce89b2a3ce2b575eec9d03522e9a736542ec5 +size 215769 diff --git a/tests/UI/expected-screenshots/Overlay_page_link_clicks.png b/tests/UI/expected-screenshots/Overlay_page_link_clicks.png index a798da2b5a..3396f1e0ef 100644 --- a/tests/UI/expected-screenshots/Overlay_page_link_clicks.png +++ b/tests/UI/expected-screenshots/Overlay_page_link_clicks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ff83b683001653f8e9c280a73e06c82a493a5c2ef2526cd991077b05bb03603 -size 115072 +oid sha256:05ca31c1b3d51b978ac323ec44ecc2b4d5c69074d7557db23fe2e2f063553883 +size 115439 diff --git a/tests/UI/expected-screenshots/Overlay_page_new_links.png b/tests/UI/expected-screenshots/Overlay_page_new_links.png index dd2d3a185c..f447a77846 100644 --- a/tests/UI/expected-screenshots/Overlay_page_new_links.png +++ b/tests/UI/expected-screenshots/Overlay_page_new_links.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f33e05a9fb49bebe5bbefe57d654ee439760cc58ec2fc4b5d03b97038764740 -size 119010 +oid sha256:264c880c261ce3ac783b34072a3e4aedd9c6ac1d50aa4888366fe7287227e8cc +size 119311 diff --git a/tests/UI/expected-screenshots/Overlay_period_change.png b/tests/UI/expected-screenshots/Overlay_period_change.png index 76f5ed6e66..27c2e63bde 100644 --- a/tests/UI/expected-screenshots/Overlay_period_change.png +++ b/tests/UI/expected-screenshots/Overlay_period_change.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31945b420fce1967d4911372086f0f489eeeafd430b8acd5609d31ed215c7a26 -size 216948 +oid sha256:68eecc71e96d62a0abe75ed98dcaf09f33e882c5de4705c65553f1fcf88f3ebc +size 217412 diff --git a/tests/UI/expected-screenshots/Overlay_row_evolution.png b/tests/UI/expected-screenshots/Overlay_row_evolution.png index 7757a9b7d4..fc55e40997 100644 --- a/tests/UI/expected-screenshots/Overlay_row_evolution.png +++ b/tests/UI/expected-screenshots/Overlay_row_evolution.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4563b730723f4891e273d68673f47c2613bfc88ab5d6620b8fb2a506815445b1 -size 112044 +oid sha256:7d1d44f984293b417d9722809814a6357b784f08ed060ccc454d7c0f905b85c0 +size 112457 diff --git a/tests/UI/expected-screenshots/Overlay_transitions.png b/tests/UI/expected-screenshots/Overlay_transitions.png index 40cfbabe1c..15e982430d 100644 --- a/tests/UI/expected-screenshots/Overlay_transitions.png +++ b/tests/UI/expected-screenshots/Overlay_transitions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e09a5363f53f84a983a0c9f83b899a74f59d03008c238062301a6f1bf561e22b -size 132545 +oid sha256:f58690b7e5141ebeccc4785cf73af497af2455c89cc83daabc5f80f4630bd6dd +size 133021 diff --git a/tests/UI/expected-screenshots/PivotByDimension_pivoted_columns_report.png b/tests/UI/expected-screenshots/PivotByDimension_pivoted_columns_report.png index e166802184..7236c50fb5 100644 --- a/tests/UI/expected-screenshots/PivotByDimension_pivoted_columns_report.png +++ b/tests/UI/expected-screenshots/PivotByDimension_pivoted_columns_report.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55d924becb5ccf84777e4209335f91fe6c337cb93d0f2601cc758823bc54dd4a -size 45337 +oid sha256:a71e0325a817e45fcf7a77cd559375a859169311750482b821c141900d10f379 +size 55544 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png index 3677451541..e0b1f83dd0 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_sales.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3841d3b9d3e45c2d384a5d188099b3b3d907744071cc8dee0d37feb878d9f1e8 -size 69449 +oid sha256:d36247f3ca0150c900a8fac1c8a8ed6b8b5f6e26037fbb145e58afbfcbe012b6 +size 85779 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png index d47b885bb7..e72b23e8a1 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50ed0baa2457c5af22510f31f4a9d006a6a484a55e909a95bd60f41170cc1174 -size 193512 +oid sha256:cba89e82980642bc6b176a7349e677e5143ffd53a282f619b4a0b6589cbe1e73 +size 208261 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png index 81daeb9c4b..48798ad10e 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_goals_individual_goal_updated.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:185579466fc64c9f1265678307e02a8f43e0411a3b1e5593a421846ca2ed36a8 -size 195606 +oid sha256:fbcd9df0d2e5ce10183221169b4702478fe86e80aee016b4345a52fe7a1a3678 +size 210121 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_custom_vars.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_custom_vars.png index 25104f863b..0c6ef7df18 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_custom_vars.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_custom_vars.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dcfbe07f326c3f972f9c269388be1cfbc804053432411134fe81d91d909b4afd -size 49712 +oid sha256:d72b2223a198ccf722ae039696b331019b1b37ded33f02f5d34914834679d5ff +size 59734 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png index 980d478dc3..101643b064 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7005ff0a706f1a5d9fdc30a85dcb5f83ea11b2a04a65a9f9e25bccdde573031e -size 602488 +oid sha256:e21f928a4982d3755d7e82739ba244401bc1d47790f49b50f9a8314913aef9c5 +size 607520 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png b/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png index f1b3ebc7ba..08d7a7519c 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0bcb805352c46619bb07166247fa9624ae1b6fae5fec1b2e23fe0276f4853161 -size 65742 +oid sha256:2abe18f7388126b373a3c04fbd1364380e5355bd293960dffced33ed2e756a98 +size 65613 diff --git a/tests/UI/specs/ActionsDataTable_spec.js b/tests/UI/specs/ActionsDataTable_spec.js index 015c5984a2..f5b4f0f2bc 100644 --- a/tests/UI/specs/ActionsDataTable_spec.js +++ b/tests/UI/specs/ActionsDataTable_spec.js @@ -28,8 +28,10 @@ describe("ActionsDataTable", function () { it("should load subtables correctly when row clicked", function (done) { expect.screenshot('subtables_loaded').to.be.capture(function (page) { - page.click('tr.subDataTable:first'); - page.click('tr.subDataTable:eq(2)'); + page.evaluate(function(){ + $('tr.subDataTable:first').click(); + $('tr.subDataTable:eq(2)').click(); + }); }, done); }); |
