diff --git a/LICENSE-ICONS-3RD-PARTY.json b/LICENSE-ICONS-3RD-PARTY.json index 352c35ebc..eb8501d43 100755 --- a/LICENSE-ICONS-3RD-PARTY.json +++ b/LICENSE-ICONS-3RD-PARTY.json @@ -1,4 +1,59 @@ { + "trash.svg": { + "author": "Filip Malinowski", + "url": "https:\/\/thenounproject.com\/term\/trash\/16505\/", + "license": "CC 3.0 Attribution" + }, + "email.svg": { + "author": "Felix Niklas", + "url": "", + "license": "MIT" + }, + "email-button.svg": { + "author": "Felix Niklas", + "url": "", + "license": "MIT" + }, + "paperclip.svg": { + "author": "Cheesefork", + "url": "https:\/\/thenounproject.com\/search\/?q=attachment&i=197956", + "license": "CC 3.0 Attribution" + }, + "cog.svg": { + "author": "Melvin Salas", + "url": "https:\/\/thenounproject.com\/term\/gear\/17369\/", + "license": "CC 3.0 Attribution" + }, + "team.svg": { + "author": "R\u00e9my M\u00e9dard", + "url": "https:\/\/thenounproject.com\/catalarem\/uploads\/?i=2554", + "license": "CC 3.0 Attribution" + }, + "important.svg": { + "author": "Felix Niklas", + "url": "", + "license": "MIT" + }, + "note.svg": { + "author": "Felix Niklas", + "url": "", + "license": "MIT" + }, + "pen.svg": { + "author": "Dmitry Baranovskiy", + "url": "https:\/\/thenounproject.com\/search\/?q=edit&i=5039", + "license": "CC 3.0 Attribution" + }, + "package.svg": { + "author": "Michael Wallner", + "url": "https:\/\/thenounproject.com\/search\/?q=package&i=25152", + "license": "CC 3.0 Attribution" + }, + "organization.svg": { + "author": "Felix Niklas", + "url": "", + "license": "MIT" + }, "eyedropper.svg": { "author": "Felix Niklas", "url": "", @@ -25,9 +80,9 @@ "license": "MIT" }, "user.svg": { - "author": "", - "url": "", - "license": "" + "author": "R\u00e9my M\u00e9dard", + "url": "https:\/\/thenounproject.com\/search\/?q=user&i=10314", + "license": "CC 3.0 Attribution" }, "twitter.svg": { "author": "Twitter", @@ -39,15 +94,10 @@ "url": "twitter.com", "license": "" }, - "trash.svg": { - "author": "Felix Niklas", - "url": "", - "license": "MIT" - }, "total-tickets.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "tools.svg": { "author": "Michael Kussmaul", @@ -59,35 +109,30 @@ "url": "", "license": "MIT" }, - "team.svg": { - "author": "", - "url": "", - "license": "" - }, "task-state.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "switchView.svg": { - "author": "", + "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "stopwatch.svg": { - "author": "", + "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "status.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "status-modified-outer-circle.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "split.svg": { "author": "Felix Niklas", @@ -95,14 +140,14 @@ "license": "MIT" }, "signout.svg": { - "author": "", + "author": "Felix Niklas", "url": "", - "license": "" + "license": "MIT" }, "report.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "reply.svg": { "author": "Felix Niklas", @@ -115,9 +160,9 @@ "license": "MIT" }, "reopening.svg": { - "author": "", + "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "reload.svg": { "author": "Anand A Nair", @@ -125,51 +170,36 @@ "license": "CC 3.0 Attribution" }, "received-calls.svg": { - "author": "", - "url": "", - "license": "" + "author": "Michael Zenaty", + "url": "https:\/\/thenounproject.com\/search\/?q=phone&i=21797", + "license": "CC 3.0 Attribution" }, "radio.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "radio-checked.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "plus.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "plus-small.svg": { "author": "Zammad", "url": "", - "license": "" - }, - "phone.svg": { - "author": "", - "url": "", - "license": "" - }, - "person.svg": { - "author": "", - "url": "", - "license": "" - }, - "pen.svg": { - "author": "", - "url": "", - "license": "" - }, - "paperclip.svg": { - "author": "Felix Niklas", - "url": "", "license": "MIT" }, - "package.svg": { + "phone.svg": { + "author": "Michael Zenaty", + "url": "https:\/\/thenounproject.com\/search\/?q=phone&i=21797", + "license": "CC 3.0 Attribution" + }, + "person.svg": { "author": "Felix Niklas", "url": "", "license": "MIT" @@ -180,59 +210,49 @@ "license": "MIT" }, "outbound-calls.svg": { - "author": "", - "url": "", - "license": "" - }, - "organization.svg": { - "author": "", - "url": "", - "license": "" + "author": "Michael Zenaty", + "url": "https:\/\/thenounproject.com\/search\/?q=phone&i=21797", + "license": "CC 3.0 Attribution" }, "one-ticket.svg": { "author": "Zammad", "url": "", - "license": "" - }, - "note.svg": { - "author": "", - "url": "", - "license": "" + "license": "MIT" }, "mood-supergood.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "mood-super-bad.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "mood-ok.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "mood-good.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "mood-bad.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "minus.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "minus-small.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "message.svg": { "author": "Felix Niklas", @@ -247,42 +267,42 @@ "magnifier.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "long-arrow-right.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "logotype.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "logo.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "lock.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "lock-open.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "loading.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "list.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "linkedin-button.svg": { "author": "Linkedin", @@ -302,12 +322,7 @@ "in-process.svg": { "author": "Zammad", "url": "", - "license": "" - }, - "important.svg": { - "author": "", - "url": "", - "license": "" + "license": "MIT" }, "help.svg": { "author": "Felix Niklas", @@ -315,9 +330,9 @@ "license": "MIT" }, "group.svg": { - "author": "", + "author": "Felix Niklas", "url": "", - "license": "" + "license": "MIT" }, "google-button.svg": { "author": "Google", @@ -327,7 +342,7 @@ "full-logo.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "facebook.svg": { "author": "Facebook", @@ -339,20 +354,10 @@ "url": "", "license": "" }, - "email.svg": { - "author": "", - "url": "", - "license": "" - }, - "email-button.svg": { - "author": "", - "url": "", - "license": "" - }, "dropdown-list.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "download.svg": { "author": "Felix Niklas", @@ -362,7 +367,7 @@ "diagonal-cross.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "dashboard.svg": { "author": "Anton Gajdosik", @@ -374,25 +379,20 @@ "url": "", "license": "MIT" }, - "cog.svg": { - "author": "", - "url": "", - "license": "" - }, "cloud.svg": { - "author": "Felix Niklas", - "url": "", - "license": "MIT" + "author": "Kirill Ulitin", + "url": "https:\/\/thenounproject.com\/search\/?q=cloud&i=84976", + "license": "CC 3.0 Attribution" }, "small-dot.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "clock.svg": { - "author": "", + "author": "Felix Niklas", "url": "", - "license": "" + "license": "MIT" }, "clipboard.svg": { "author": "Felix Niklas", @@ -402,17 +402,17 @@ "checkmark.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "checkbox.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "checkbox-checked.svg": { "author": "Zammad", "url": "", - "license": "" + "license": "MIT" }, "chat.svg": { "author": "Felix Niklas", diff --git a/app/assets/stylesheets/svg-dimensions.css b/app/assets/stylesheets/svg-dimensions.css index 481d629f3..8c4afa5df 100644 --- a/app/assets/stylesheets/svg-dimensions.css +++ b/app/assets/stylesheets/svg-dimensions.css @@ -53,7 +53,7 @@ .icon-outbound-calls { width: 17px; height: 17px; } .icon-overviews { width: 24px; height: 24px; } .icon-package { width: 16px; height: 16px; } -.icon-paperclip { width: 31px; height: 28px; } +.icon-paperclip { width: 28px; height: 28px; } .icon-pen { width: 16px; height: 16px; } .icon-person { width: 24px; height: 24px; } .icon-phone { width: 17px; height: 17px; } diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index 6c3d1c375..7c32c517f 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -4246,8 +4246,6 @@ footer { } .article-meta-icon { - width: 16px; - height: 16px; fill: white; vertical-align: top; margin: 2px 3px 0 0; @@ -4522,8 +4520,6 @@ footer { } .editControls-icon .icon { - width: 16px; - height: 16px; fill: hsl(210,2%,78%); } diff --git a/contrib/edit-icon-license-list.php b/contrib/edit-icon-license-list.php index 23dcdea9b..97d8ae772 100644 --- a/contrib/edit-icon-license-list.php +++ b/contrib/edit-icon-license-list.php @@ -10,6 +10,7 @@ if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQ ?> + Zammad Icons
- +
@@ -191,19 +192,14 @@ if ($sortByImageName) { var filter = "off" var filterTimeout - $('input').on({ - input: storeAuthors, - blur: onBlur, - focus: onFocus - }) - - function onBlur(){ - filterTimeout = setTimeout(applyFilter, 500) + if(localStorage.getItem('icon-list-filter')){ + filter = localStorage.getItem('icon-list-filter') + applyFilter() } + + $('[name="filter"][value="'+ filter +'"]').prop('checked', true) - function onFocus(){ - clearTimeout(filterTimeout) - } + $('input').on('input', storeAuthors) function storeAuthors(){ var iconList = {} @@ -221,6 +217,7 @@ if ($sortByImageName) { $('[name="filter"]').change(function(){ filter = this.value + localStorage.setItem('icon-list-filter', filter) applyFilter() }) diff --git a/contrib/icon-sprite.sketch b/contrib/icon-sprite.sketch index a0323e114..ab9da5357 100644 Binary files a/contrib/icon-sprite.sketch and b/contrib/icon-sprite.sketch differ diff --git a/public/assets/images/icons.svg b/public/assets/images/icons.svg index cba6db882..5ca1f6cf6 100644 --- a/public/assets/images/icons.svg +++ b/public/assets/images/icons.svg @@ -1 +1 @@ -arrow-downarrow-leftarrow-rightarrow-upchatcheckbox-checkedcheckboxcheckmarkclipboardclockcloudcogcrowndashboarddiagonal-crossdownloaddropdown-listemail-buttonemaileyedropperfacebook-buttonfacebookgoogle-buttongrouphelpimportantin-processline-left-arrowline-right-arrowlinkedin-buttonlistloadinglock-openlocklogotypelong-arrow-rightmagnifiermarkermessageminus-smallminusmood-badmood-goodmood-okmood-super-badmood-supergoodmutenoteone-ticketorganizationoutbound-callsoverviewspackagepaperclippenpersonphoneplus-smallplusradio-checkedradioreceived-callsreloadreopeningreply-allreplyreportsignoutsmall-dotsplitstatus-modified-outer-circlestatusstopwatchswitchViewtask-stateteamtemplatestoolstotal-ticketstrashtwitter-buttontwitterunmuteuserzoom-inzoom-out \ No newline at end of file +arrow-downarrow-leftarrow-rightarrow-upchatcheckbox-checkedcheckboxcheckmarkclipboardclockcloudcogcrowndashboarddiagonal-crossdownloaddropdown-listemail-buttonemaileyedropperfacebook-buttonfacebookgoogle-buttongrouphelpimportantin-processline-left-arrowline-right-arrowlinkedin-buttonlistloadinglock-openlocklogotypelong-arrow-rightmagnifiermarkermessageminus-smallminusmood-badmood-goodmood-okmood-super-badmood-supergoodmutenoteone-ticketorganizationoutbound-callsoverviewspackagepaperclippenpersonphoneplus-smallplusradio-checkedradioreceived-callsreloadreopeningreply-allreplyreportsignoutsmall-dotsplitstatus-modified-outer-circlestatusstopwatchswitchViewtask-stateteamtemplatestoolstotal-ticketstrashtwitter-buttontwitterunmuteuserzoom-inzoom-out \ No newline at end of file diff --git a/public/assets/images/icons/clock.svg b/public/assets/images/icons/clock.svg index 5191c2cf7..85f6e321c 100644 --- a/public/assets/images/icons/clock.svg +++ b/public/assets/images/icons/clock.svg @@ -1,12 +1,13 @@ - + clock Created with Sketch. - - + + + \ No newline at end of file diff --git a/public/assets/images/icons/cog.svg b/public/assets/images/icons/cog.svg index d4423bea8..607bdb9bd 100644 --- a/public/assets/images/icons/cog.svg +++ b/public/assets/images/icons/cog.svg @@ -1,12 +1,12 @@ - + cog Created with Sketch. - + \ No newline at end of file diff --git a/public/assets/images/icons/email-button.svg b/public/assets/images/icons/email-button.svg index 7a73630fb..2c833c125 100644 --- a/public/assets/images/icons/email-button.svg +++ b/public/assets/images/icons/email-button.svg @@ -1,12 +1,12 @@ - + email-button Created with Sketch. - + \ No newline at end of file diff --git a/public/assets/images/icons/email.svg b/public/assets/images/icons/email.svg index 178b9a45f..4bf23d17b 100644 --- a/public/assets/images/icons/email.svg +++ b/public/assets/images/icons/email.svg @@ -1,12 +1,12 @@ - + email Created with Sketch. - + \ No newline at end of file diff --git a/public/assets/images/icons/important.svg b/public/assets/images/icons/important.svg index c4253f170..064d9a8df 100644 --- a/public/assets/images/icons/important.svg +++ b/public/assets/images/icons/important.svg @@ -1,12 +1,12 @@ - + important Created with Sketch. - + \ No newline at end of file diff --git a/public/assets/images/icons/note.svg b/public/assets/images/icons/note.svg index 7ea2a9482..99321a7ec 100644 --- a/public/assets/images/icons/note.svg +++ b/public/assets/images/icons/note.svg @@ -1,12 +1,13 @@ - + note Created with Sketch. - + + \ No newline at end of file diff --git a/public/assets/images/icons/organization.svg b/public/assets/images/icons/organization.svg index b981c7e14..1535eaff2 100644 --- a/public/assets/images/icons/organization.svg +++ b/public/assets/images/icons/organization.svg @@ -1,12 +1,12 @@ - + organization Created with Sketch. - + \ No newline at end of file diff --git a/public/assets/images/icons/outbound-calls.svg b/public/assets/images/icons/outbound-calls.svg index 156605d7f..2e2164f50 100644 --- a/public/assets/images/icons/outbound-calls.svg +++ b/public/assets/images/icons/outbound-calls.svg @@ -1,12 +1,13 @@ - + outbound-calls Created with Sketch. - + + \ No newline at end of file diff --git a/public/assets/images/icons/package.svg b/public/assets/images/icons/package.svg index 279e8b398..ae25f0899 100644 --- a/public/assets/images/icons/package.svg +++ b/public/assets/images/icons/package.svg @@ -1,12 +1,12 @@ - + package Created with Sketch. - + \ No newline at end of file diff --git a/public/assets/images/icons/paperclip.svg b/public/assets/images/icons/paperclip.svg index df0f8d1bb..a96229269 100644 --- a/public/assets/images/icons/paperclip.svg +++ b/public/assets/images/icons/paperclip.svg @@ -1,12 +1,12 @@ - - + + paperclip Created with Sketch. - - + + \ No newline at end of file diff --git a/public/assets/images/icons/pen.svg b/public/assets/images/icons/pen.svg index 1e88b2f1a..ac8865a0c 100644 --- a/public/assets/images/icons/pen.svg +++ b/public/assets/images/icons/pen.svg @@ -1,12 +1,12 @@ - + pen Created with Sketch. - + \ No newline at end of file diff --git a/public/assets/images/icons/phone.svg b/public/assets/images/icons/phone.svg index 6a9b4de9e..95776c6d1 100644 --- a/public/assets/images/icons/phone.svg +++ b/public/assets/images/icons/phone.svg @@ -1,12 +1,12 @@ - + phone Created with Sketch. - + \ No newline at end of file diff --git a/public/assets/images/icons/received-calls.svg b/public/assets/images/icons/received-calls.svg index a8bcfcd6f..03f579fac 100644 --- a/public/assets/images/icons/received-calls.svg +++ b/public/assets/images/icons/received-calls.svg @@ -1,12 +1,13 @@ - + received-calls Created with Sketch. - + + \ No newline at end of file diff --git a/public/assets/images/icons/reopening.svg b/public/assets/images/icons/reopening.svg index ad1c06660..9a161b2d5 100644 --- a/public/assets/images/icons/reopening.svg +++ b/public/assets/images/icons/reopening.svg @@ -1,13 +1,13 @@ - + reopening Created with Sketch. - + diff --git a/public/assets/images/icons/signout.svg b/public/assets/images/icons/signout.svg index 878f2e070..c81cbb2d3 100644 --- a/public/assets/images/icons/signout.svg +++ b/public/assets/images/icons/signout.svg @@ -1,12 +1,13 @@ - + signout Created with Sketch. - + + \ No newline at end of file diff --git a/public/assets/images/icons/team.svg b/public/assets/images/icons/team.svg index d08d2a755..dd6e141a5 100644 --- a/public/assets/images/icons/team.svg +++ b/public/assets/images/icons/team.svg @@ -1,12 +1,12 @@ - + team Created with Sketch. - + \ No newline at end of file diff --git a/public/assets/images/icons/trash.svg b/public/assets/images/icons/trash.svg index 67f061633..4a898d448 100644 --- a/public/assets/images/icons/trash.svg +++ b/public/assets/images/icons/trash.svg @@ -1,12 +1,12 @@ - + trash Created with Sketch. - + \ No newline at end of file