diff --git a/app/assets/javascripts/app/controllers/navigation.js.coffee b/app/assets/javascripts/app/controllers/navigation.js.coffee index eb093e450..d88ee233a 100644 --- a/app/assets/javascripts/app/controllers/navigation.js.coffee +++ b/app/assets/javascripts/app/controllers/navigation.js.coffee @@ -213,18 +213,18 @@ class App.Navigation extends App.Controller ) # remove search result - @$('#global-search').bind( 'focusout', (e) => - @delay( - => - @$('.search').removeClass('focused') + # @$('#global-search').bind( 'focusout', (e) => + # @delay( + # => + # @$('.search').removeClass('focused') - # remove not needed popovers - $('.popover').remove() + # # remove not needed popovers + # $('.popover').remove() - @renderResult() - 320 - ) - ) + # @renderResult() + # 320 + # ) + # ) # prevent submit of search box @$('form.search').bind( 'submit', (e) => 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/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/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/navigation/result.jst.eco b/app/assets/javascripts/app/views/navigation/result.jst.eco index 322dad88a..9c6d08259 100644 --- a/app/assets/javascripts/app/views/navigation/result.jst.eco +++ b/app/assets/javascripts/app/views/navigation/result.jst.eco @@ -3,7 +3,7 @@ <% for item in area.result: %>
  • - + <%= item.display %>
    • 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/profile/avatar-holder.jst.eco b/app/assets/javascripts/app/views/profile/avatar-holder.jst.eco index 42906ed28..ee503ead9 100644 --- a/app/assets/javascripts/app/views/profile/avatar-holder.jst.eco +++ b/app/assets/javascripts/app/views/profile/avatar-holder.jst.eco @@ -1,4 +1,6 @@
    -
    +
    + +
    \ No newline at end of file diff --git a/app/assets/javascripts/app/views/profile/avatar.jst.eco b/app/assets/javascripts/app/views/profile/avatar.jst.eco index 666ceace7..53d72acfc 100644 --- a/app/assets/javascripts/app/views/profile/avatar.jst.eco +++ b/app/assets/javascripts/app/views/profile/avatar.jst.eco @@ -9,7 +9,7 @@
    -
    +
    <% for avatar in @avatars: %>
    <% if avatar.initial: %> @@ -17,11 +17,13 @@ <% if avatar.default: %> <% cssClass = 'is-active' %> <% end %> - <%- App.Session.get().avatar('50', '', cssClass, true, avatar) %> + <%- App.Session.get().avatar('80', '', cssClass, true, avatar) %> <% else: %> - + <% if avatar.deletable: %> -
    +
    + +
    <% end %> <% end %>
    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/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/ticket_zoom.jst.eco index d2e983158..f3bcbd0de 100644 --- a/app/assets/javascripts/app/views/ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom.jst.eco @@ -31,7 +31,7 @@ - +
    @@ -40,7 +40,7 @@ - +
    @@ -50,7 +50,7 @@ - +
    @@ -58,7 +58,7 @@ - +
    diff --git a/app/assets/javascripts/app/views/ticket_zoom/overview_navigator.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/overview_navigator.jst.eco index 9cbe43986..feea2879a 100644 --- a/app/assets/javascripts/app/views/ticket_zoom/overview_navigator.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom/overview_navigator.jst.eco @@ -4,10 +4,10 @@
    • class="disabled"<% end %> title="<%- @Ti( 'previous in Overview' ) %>">
    • class="disabled"<% end %> title="<%- @Ti( 'next in Overview' ) %>">
    \ No newline at end of file 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/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 b0e66af82..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; } @@ -60,5 +59,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 f46f2cd5c..91777a1f5 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; @@ -808,7 +813,7 @@ textarea, padding-right: 34px; } - .form-control + .arrow { + .form-control + .icon-arrow-down { position: absolute; right: 12px; top: 50%; @@ -1305,7 +1310,10 @@ ol.tabs li { */ -.arrow { +.icon-arrow-down, +.icon-arrow-up, +.icon-arrow-left, +.icon-arrow-right { fill: black; opacity: 0.39; } @@ -1314,18 +1322,6 @@ ol.tabs li { opacity: 0.23; } -.arrow--down, -.arrow--up { - width: 13px; - height: 7px; -} - -.arrow--left, -.arrow--right { - width: 7px; - height: 13px; -} - .icon-checkmark { fill: #38AE6A; } @@ -1702,7 +1698,7 @@ footer { background-color: #972e29; } - .nav-tab-close .icon { + .nav-tab-close svg { width: 13px; height: 13px; fill: white; @@ -1710,7 +1706,7 @@ footer { transform: scale(0.7); } - .nav-tab-close:hover .icon { + .nav-tab-close:hover svg { opacity: 1; } @@ -1762,7 +1758,7 @@ footer { justify-content: center; } - .empty-search .icon-close { + .empty-search .icon-diagonal-cross { fill: white; opacity: 0.5; } @@ -3453,8 +3449,6 @@ footer { justify-content: center; .icon { - width: 13px; - height: 13px; fill: black; } } @@ -3825,10 +3819,8 @@ footer { align-items: center; justify-content: center; - .icon { + svg { fill: white; - width: 13px; - height: 13px; } } @@ -3875,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 { @@ -4061,8 +4051,6 @@ footer { } .recipientList-arrow { - width: 7px; - height: 13px; fill: white; opacity: 0.39; } @@ -4506,19 +4494,23 @@ label + .wizard-buttonList { } } +.avatar-gallery { + display: flex; + flex-wrap: wrap; +} + .avatar-holder { display: inline-block; position: relative; - margin: 0 15px 15px 0; + margin: 0 32px 32px 0; border-radius: 100%; + box-shadow: 0 0 0 4px white; .avatar { @extend .u-clickable; - opacity: .33; &.is-active { - opacity: 1; - box-shadow: 0 0 0 3px hsl(200,71%,59%); + box-shadow: 0 0 0 4px hsl(200,71%,59%); } } } @@ -4530,23 +4522,28 @@ label + .wizard-buttonList { .avatar-holder .avatar-delete { position: absolute; - right: -18px; - top: -18px; - width: 30px; - height: 30px; + right: -15px; + top: -15px; + width: 40px; + height: 40px; pointer-events: none; visibility: hidden; - opacity: 0.5; - @extend .u-clickable; + background: white; + display: flex; + align-items: center; + justify-content: center; + border-radius: 100%; + box-shadow: 0 1px 5px rgba(0,0,0,.05); - &:hover { - opacity: 1; - } + @extend .u-clickable; - .icon { - position: absolute; - left: 8px; - bottom: 8px; + svg { + opacity: 0.5; + fill: hsl(234,10%,19%); + } + + &:hover svg { + opacity: 1; } } @@ -4624,6 +4621,7 @@ label + .wizard-buttonList { .profile { padding: 60px; overflow: auto; + flex: 1; h1 { margin: 18px 0 0; @@ -4756,8 +4754,9 @@ label + .wizard-buttonList { border-radius: 100%; opacity: 0.4; - .icon { - transform: scale(1.6); + svg { + width: 32px; + height: 32px; } } 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 diff --git a/public/assets/images/icons.svg b/public/assets/images/icons.svg index 47b0115af..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-ticketstwitteruser \ 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 diff --git a/public/assets/images/icons/priority.svg b/public/assets/images/icons/priority.svg index fb3aec111..7a32bf4e8 100644 --- a/public/assets/images/icons/priority.svg +++ b/public/assets/images/icons/priority.svg @@ -6,7 +6,7 @@ - + \ 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