From c1b73de746e8a1267e1b970b57d29aee3dd06211 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 26 May 2015 18:29:04 +0200 Subject: [PATCH 1/6] fix arrows and add delete button to avatar picker --- .../app/views/dashboard/ticket.jst.eco | 8 +-- .../app/views/generic/actions.jst.eco | 2 +- .../app/views/generic/select.jst.eco | 2 +- .../app/views/generic/sidebar_tabs.jst.eco | 2 +- .../views/generic/user_search/input.jst.eco | 2 +- .../user_search/item_organization.jst.eco | 2 +- .../item_organization_members.jst.eco | 2 +- .../app/views/layout_ref/highlight.jst.eco | 10 +-- .../app/views/profile/avatar-holder.jst.eco | 4 +- .../app/views/profile/avatar.jst.eco | 10 +-- .../javascripts/app/views/ticket_zoom.jst.eco | 8 +-- .../ticket_zoom/overview_navigator.jst.eco | 4 +- app/assets/stylesheets/zammad.css.scss | 66 +++++++++---------- 13 files changed, 61 insertions(+), 61 deletions(-) diff --git a/app/assets/javascripts/app/views/dashboard/ticket.jst.eco b/app/assets/javascripts/app/views/dashboard/ticket.jst.eco index 36fc9bbfc..4a0334129 100644 --- a/app/assets/javascripts/app/views/dashboard/ticket.jst.eco +++ b/app/assets/javascripts/app/views/dashboard/ticket.jst.eco @@ -12,22 +12,22 @@
  • <% if @items_from != 1: %> - + <% else: %> - + <% end %>
  • <% if @items_till != @items_total: %> - + <% else: %> - +
    • <% end %> diff --git a/app/assets/javascripts/app/views/generic/actions.jst.eco b/app/assets/javascripts/app/views/generic/actions.jst.eco index bdfeeea18..c637968cb 100644 --- a/app/assets/javascripts/app/views/generic/actions.jst.eco +++ b/app/assets/javascripts/app/views/generic/actions.jst.eco @@ -4,7 +4,7 @@ <% end %> - +
    -
    +

    Steuerbüro C. Kaik

    diff --git a/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco b/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco index 0ff260cb9..538952c7e 100644 --- a/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco @@ -1,4 +1,4 @@ -
    +
    diff --git a/app/assets/javascripts/app/views/organization_profile/index.jst.eco b/app/assets/javascripts/app/views/organization_profile/index.jst.eco index 97263221b..79fadb99a 100644 --- a/app/assets/javascripts/app/views/organization_profile/index.jst.eco +++ b/app/assets/javascripts/app/views/organization_profile/index.jst.eco @@ -1,4 +1,4 @@ -
    +
    diff --git a/app/assets/javascripts/app/views/organization_profile/object.jst.eco b/app/assets/javascripts/app/views/organization_profile/object.jst.eco index d2752a419..413d80186 100644 --- a/app/assets/javascripts/app/views/organization_profile/object.jst.eco +++ b/app/assets/javascripts/app/views/organization_profile/object.jst.eco @@ -1,7 +1,7 @@
    -
    +

    <%= @organization.displayName() %>

    diff --git a/app/assets/javascripts/app/views/user_profile/index.jst.eco b/app/assets/javascripts/app/views/user_profile/index.jst.eco index 97263221b..79fadb99a 100644 --- a/app/assets/javascripts/app/views/user_profile/index.jst.eco +++ b/app/assets/javascripts/app/views/user_profile/index.jst.eco @@ -1,4 +1,4 @@ -
    +
    diff --git a/app/assets/javascripts/app/views/widget/organization.jst.eco b/app/assets/javascripts/app/views/widget/organization.jst.eco index e86f14687..41b39320e 100644 --- a/app/assets/javascripts/app/views/widget/organization.jst.eco +++ b/app/assets/javascripts/app/views/widget/organization.jst.eco @@ -1,6 +1,8 @@
    - + + +

    <%= @organization.displayName() %>

    diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index fb9feb823..dca515e01 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -4620,6 +4620,7 @@ label + .wizard-buttonList { .profile { padding: 60px; overflow: auto; + flex: 1; h1 { margin: 18px 0 0; @@ -4752,8 +4753,9 @@ label + .wizard-buttonList { border-radius: 100%; opacity: 0.4; - .icon { - transform: scale(1.6); + svg { + width: 32px; + height: 32px; } } From 99d6ab383fd6ce95008d38edfe26f880eb78225e Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 26 May 2015 20:03:52 +0200 Subject: [PATCH 4/6] fix trash icon --- .../javascripts/app/views/generic/table.jst.eco | 2 +- app/assets/stylesheets/svg-dimensions.css | 1 + app/assets/stylesheets/zammad.css.scss | 5 +++++ public/assets/images/icons.svg | 2 +- public/assets/images/icons/trash.svg | 12 ++++++++++++ 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 public/assets/images/icons/trash.svg diff --git a/app/assets/javascripts/app/views/generic/table.jst.eco b/app/assets/javascripts/app/views/generic/table.jst.eco index bccd925a7..ed6d1a6f9 100644 --- a/app/assets/javascripts/app/views/generic/table.jst.eco +++ b/app/assets/javascripts/app/views/generic/table.jst.eco @@ -80,7 +80,7 @@ <% end %> <% if @destroy: %> - + <% end %> <% end %> diff --git a/app/assets/stylesheets/svg-dimensions.css b/app/assets/stylesheets/svg-dimensions.css index b0e66af82..911973215 100644 --- a/app/assets/stylesheets/svg-dimensions.css +++ b/app/assets/stylesheets/svg-dimensions.css @@ -60,5 +60,6 @@ .icon-templates { width: 24px; height: 24px; } .icon-tools { width: 24px; height: 24px; } .icon-total-tickets { width: 48px; height: 83px; } +.icon-trash { width: 16px; height: 16px; } .icon-twitter { width: 17px; height: 17px; } .icon-user { width: 16px; height: 16px; } \ No newline at end of file diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index dca515e01..1ac0a3232 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -503,6 +503,11 @@ table { padding: 0; } +.table .icon-trash { + vertical-align: middle; + fill: hsl(240,1%,77%); +} + .input-replacement { padding: 0; margin: 0; diff --git a/public/assets/images/icons.svg b/public/assets/images/icons.svg index 0a2387f8e..46e308cea 100644 --- a/public/assets/images/icons.svg +++ b/public/assets/images/icons.svg @@ -1 +1 @@ -arrow-downarrow-leftarrow-rightarrow-upcheckbox-checkedcheckboxcheckmarkclockclosecloudcogdashboarddiagonal-crossdownloademailfacebookgrouphelpimportantin-processlistloadinglock-openlocklong-arrow-rightmagnifiermarkermessagemood-badmood-goodmood-okmood-super-badmood-supergoodnoteone-ticketorganizationoutbound-callsoverviewspackagepaperclippenpersonphonepluspriority-modified-inner-circlepriority-modified-outer-circlepriorityradio-checkedradioreceived-callsreopeningreply-allreplysignoutsplitstopwatchswitchViewteamtemplatestoolstotal-ticketstwitteruser \ No newline at end of file +arrow-downarrow-leftarrow-rightarrow-upcheckbox-checkedcheckboxcheckmarkclockclosecloudcogdashboarddiagonal-crossdownloademailfacebookgrouphelpimportantin-processlistloadinglock-openlocklong-arrow-rightmagnifiermarkermessagemood-badmood-goodmood-okmood-super-badmood-supergoodnoteone-ticketorganizationoutbound-callsoverviewspackagepaperclippenpersonphonepluspriority-modified-inner-circlepriority-modified-outer-circlepriorityradio-checkedradioreceived-callsreopeningreply-allreplysignoutsplitstopwatchswitchViewteamtemplatestoolstotal-ticketstrashtwitteruser \ No newline at end of file diff --git a/public/assets/images/icons/trash.svg b/public/assets/images/icons/trash.svg new file mode 100644 index 000000000..d1e6463eb --- /dev/null +++ b/public/assets/images/icons/trash.svg @@ -0,0 +1,12 @@ + + + + trash + Created with Sketch. + + + + + + + \ No newline at end of file From 2158807fd0054c7bd7d9010ff893453405c72e10 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 26 May 2015 21:42:08 +0200 Subject: [PATCH 5/6] replace icon-close by icon-diagonal-cross --- .../app/views/agent_user_create.jst.eco | 2 +- .../app/views/layout_ref/local_modal.jst.eco | 2 +- app/assets/javascripts/app/views/modal.jst.eco | 2 +- .../javascripts/app/views/navigation.jst.eco | 2 +- .../app/views/task_widget_tasks.jst.eco | 2 +- .../app/views/widget/switch_back_to_user.jst.eco | 2 +- app/assets/stylesheets/svg-dimensions.css | 1 - app/assets/stylesheets/zammad.css.scss | 14 +++++--------- public/assets/images/icons.svg | 2 +- public/assets/images/icons/close.svg | 12 ------------ 10 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 public/assets/images/icons/close.svg diff --git a/app/assets/javascripts/app/views/agent_user_create.jst.eco b/app/assets/javascripts/app/views/agent_user_create.jst.eco index 89f47efec..4ed610d36 100644 --- a/app/assets/javascripts/app/views/agent_user_create.jst.eco +++ b/app/assets/javascripts/app/views/agent_user_create.jst.eco @@ -3,7 +3,7 @@
    - +

    <%- @T( @head ) %>

    diff --git a/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco b/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco index 4464fdeb3..b68a51cb5 100644 --- a/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco @@ -6,7 +6,7 @@
    - +

    Edit Customer

    diff --git a/app/assets/javascripts/app/views/modal.jst.eco b/app/assets/javascripts/app/views/modal.jst.eco index b2b47500e..11211f2de 100644 --- a/app/assets/javascripts/app/views/modal.jst.eco +++ b/app/assets/javascripts/app/views/modal.jst.eco @@ -4,7 +4,7 @@
    <% if @close: %>
    - +
    <% end %>

    <%- @T( @head ) %>

    diff --git a/app/assets/javascripts/app/views/navigation.jst.eco b/app/assets/javascripts/app/views/navigation.jst.eco index 4fe97ca16..96f6749c0 100644 --- a/app/assets/javascripts/app/views/navigation.jst.eco +++ b/app/assets/javascripts/app/views/navigation.jst.eco @@ -3,7 +3,7 @@
    - +
    diff --git a/app/assets/javascripts/app/views/task_widget_tasks.jst.eco b/app/assets/javascripts/app/views/task_widget_tasks.jst.eco index 81fce0b6b..bdb75b005 100644 --- a/app/assets/javascripts/app/views/task_widget_tasks.jst.eco +++ b/app/assets/javascripts/app/views/task_widget_tasks.jst.eco @@ -11,7 +11,7 @@
    <%= item.data.head %>
    - +
    diff --git a/app/assets/javascripts/app/views/widget/switch_back_to_user.jst.eco b/app/assets/javascripts/app/views/widget/switch_back_to_user.jst.eco index 29f68e6ef..7eb33073e 100644 --- a/app/assets/javascripts/app/views/widget/switch_back_to_user.jst.eco +++ b/app/assets/javascripts/app/views/widget/switch_back_to_user.jst.eco @@ -4,7 +4,7 @@
    <%- @T('Back to my view') %>
    - +
    \ No newline at end of file diff --git a/app/assets/stylesheets/svg-dimensions.css b/app/assets/stylesheets/svg-dimensions.css index 911973215..d66d53d8c 100644 --- a/app/assets/stylesheets/svg-dimensions.css +++ b/app/assets/stylesheets/svg-dimensions.css @@ -6,7 +6,6 @@ .icon-checkbox { width: 10px; height: 10px; } .icon-checkmark { width: 16px; height: 14px; } .icon-clock { width: 16px; height: 16px; } -.icon-close { width: 13px; height: 13px; } .icon-cloud { width: 16px; height: 16px; } .icon-cog { width: 20px; height: 20px; } .icon-dashboard { width: 24px; height: 24px; } diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 1ac0a3232..0dbdba3e3 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -1698,7 +1698,7 @@ footer { background-color: #972e29; } - .nav-tab-close .icon { + .nav-tab-close svg { width: 13px; height: 13px; fill: white; @@ -1706,7 +1706,7 @@ footer { transform: scale(0.7); } - .nav-tab-close:hover .icon { + .nav-tab-close:hover svg { opacity: 1; } @@ -1758,7 +1758,7 @@ footer { justify-content: center; } - .empty-search .icon-close { + .empty-search .icon-diagonal-cross { fill: white; opacity: 0.5; } @@ -3819,10 +3819,8 @@ footer { align-items: center; justify-content: center; - .icon { + svg { fill: white; - width: 13px; - height: 13px; } } @@ -3869,10 +3867,8 @@ footer { @extend .u-clickable; } - .modal-close .close-icon { + .modal-close .icon-diagonal-cross { opacity: 0.18; - width: 13px; - height: 13px; } .modal-body { diff --git a/public/assets/images/icons.svg b/public/assets/images/icons.svg index 46e308cea..77a66985e 100644 --- a/public/assets/images/icons.svg +++ b/public/assets/images/icons.svg @@ -1 +1 @@ -arrow-downarrow-leftarrow-rightarrow-upcheckbox-checkedcheckboxcheckmarkclockclosecloudcogdashboarddiagonal-crossdownloademailfacebookgrouphelpimportantin-processlistloadinglock-openlocklong-arrow-rightmagnifiermarkermessagemood-badmood-goodmood-okmood-super-badmood-supergoodnoteone-ticketorganizationoutbound-callsoverviewspackagepaperclippenpersonphonepluspriority-modified-inner-circlepriority-modified-outer-circlepriorityradio-checkedradioreceived-callsreopeningreply-allreplysignoutsplitstopwatchswitchViewteamtemplatestoolstotal-ticketstrashtwitteruser \ No newline at end of file +arrow-downarrow-leftarrow-rightarrow-upcheckbox-checkedcheckboxcheckmarkclockcloudcogdashboarddiagonal-crossdownloademailfacebookgrouphelpimportantin-processlistloadinglock-openlocklong-arrow-rightmagnifiermarkermessagemood-badmood-goodmood-okmood-super-badmood-supergoodnoteone-ticketorganizationoutbound-callsoverviewspackagepaperclippenpersonphonepluspriority-modified-inner-circlepriority-modified-outer-circlepriorityradio-checkedradioreceived-callsreopeningreply-allreplysignoutsplitstopwatchswitchViewteamtemplatestoolstotal-ticketstrashtwitteruser \ No newline at end of file diff --git a/public/assets/images/icons/close.svg b/public/assets/images/icons/close.svg deleted file mode 100644 index 11955773a..000000000 --- a/public/assets/images/icons/close.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - close - Created with Sketch. - - - - - - - \ No newline at end of file From 4c436ee3e3192b1948467d82802f1c67139451e1 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 26 May 2015 21:42:17 +0200 Subject: [PATCH 6/6] add icon_authors editor --- extras/icon_authors/index.php | 145 ++++++++++++++++++++++++++++++++++ extras/icon_authors/list.json | 67 ++++++++++++++++ extras/icon_authors/store.php | 9 +++ 3 files changed, 221 insertions(+) create mode 100644 extras/icon_authors/index.php create mode 100644 extras/icon_authors/list.json create mode 100644 extras/icon_authors/store.php diff --git a/extras/icon_authors/index.php b/extras/icon_authors/index.php new file mode 100644 index 000000000..6ccce2121 --- /dev/null +++ b/extras/icon_authors/index.php @@ -0,0 +1,145 @@ + +Zammad Icons + + + + + + +
    +
    + +
    +
    +
    + +
    +
    + + + + \ No newline at end of file diff --git a/extras/icon_authors/list.json b/extras/icon_authors/list.json new file mode 100644 index 000000000..b8132a922 --- /dev/null +++ b/extras/icon_authors/list.json @@ -0,0 +1,67 @@ +{ + "arrow-down.svg": "Felix Niklas", + "arrow-left.svg": "Felix Niklas", + "arrow-right.svg": "Felix Niklas", + "arrow-up.svg": "Felix Niklas", + "checkbox-checked.svg": "Felix Niklas", + "checkbox.svg": "Felix Niklas", + "checkmark.svg": "Felix Niklas", + "clock.svg": "", + "close.svg": "Felix Niklas", + "cloud.svg": "Felix Niklas", + "cog.svg": "", + "dashboard.svg": "", + "diagonal-cross.svg": "Felix Niklas", + "download.svg": "Felix Niklas", + "email.svg": "", + "facebook.svg": "Global Domain", + "group.svg": "", + "help.svg": "Felix Niklas", + "important.svg": "", + "in-process.svg": "", + "list.svg": "Felix Niklas", + "loading.svg": "Felix Niklas", + "lock-open.svg": "Felix Niklas", + "lock.svg": "Felix Niklas", + "logo.svg": "", + "long-arrow-right.svg": "Felix Niklas", + "magnifier.svg": "Felix Niklas", + "marker.svg": "Felix Niklas", + "message.svg": "Felix Niklas", + "mood-bad.svg": "", + "mood-good.svg": "", + "mood-ok.svg": "", + "mood-super-bad.svg": "", + "mood-supergood.svg": "", + "note.svg": "", + "one-ticket.svg": "", + "organization.svg": "", + "outbound-calls.svg": "", + "overviews.svg": "", + "package.svg": "Felix Niklas", + "paperclip.svg": "Felix Niklas", + "pen.svg": "Felix Niklas", + "person.svg": "", + "phone.svg": "", + "plus.svg": "Felix Niklas", + "priority-modified-inner-circle.svg": "Felix Niklas", + "priority-modified-outer-circle.svg": "Felix Niklas", + "priority.svg": "Felix Niklas", + "radio-checked.svg": "Felix Niklas", + "radio.svg": "Felix Niklas", + "received-calls.svg": "", + "reopening.svg": "", + "reply-all.svg": "Felix Niklas", + "reply.svg": "Felix Niklas", + "signout.svg": "", + "split.svg": "", + "stopwatch.svg": "", + "switchView.svg": "", + "team.svg": "", + "templates.svg": "Felix Niklas", + "tools.svg": "", + "total-tickets.svg": "", + "trash.svg": "Felix Niklas", + "twitter.svg": "", + "user.svg": "" +} \ No newline at end of file diff --git a/extras/icon_authors/store.php b/extras/icon_authors/store.php new file mode 100644 index 000000000..e46315749 --- /dev/null +++ b/extras/icon_authors/store.php @@ -0,0 +1,9 @@ + \ No newline at end of file