From d6ef8ac6e1a922e3f58f40eac1adc6d92dbfef25 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Fri, 22 May 2015 12:36:12 +0200 Subject: [PATCH] adjust tab loading icon --- .../app/controllers/taskbar_widget.js.coffee | 2 +- .../javascripts/app/views/task_widget_tasks.jst.eco | 2 +- app/assets/stylesheets/svg-dimensions.css | 2 +- app/assets/stylesheets/zammad.css.scss | 8 ++++++-- public/assets/images/icons.svg | 2 +- public/assets/images/icons/loading.svg | 12 ++++++++++++ public/assets/images/icons/mail.svg | 12 ------------ public/assets/images/icons/mood-happy.svg | 12 ------------ public/assets/images/icons/mood-super-happy.svg | 12 ------------ 9 files changed, 22 insertions(+), 42 deletions(-) create mode 100644 public/assets/images/icons/loading.svg delete mode 100644 public/assets/images/icons/mail.svg delete mode 100644 public/assets/images/icons/mood-happy.svg delete mode 100644 public/assets/images/icons/mood-super-happy.svg diff --git a/app/assets/javascripts/app/controllers/taskbar_widget.js.coffee b/app/assets/javascripts/app/controllers/taskbar_widget.js.coffee index ce6bd0cc6..7321b597e 100644 --- a/app/assets/javascripts/app/controllers/taskbar_widget.js.coffee +++ b/app/assets/javascripts/app/controllers/taskbar_widget.js.coffee @@ -29,7 +29,7 @@ class App.TaskbarWidget extends App.Controller data = url: '#' id: false - iconClass: 'loading dot' + iconClass: 'loading' title: App.i18n.translateInline('Loading...') head: App.i18n.translateInline('Loading...') worker = App.TaskManager.worker( task.key ) 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 79b68f3e0..81fce0b6b 100644 --- a/app/assets/javascripts/app/views/task_widget_tasks.jst.eco +++ b/app/assets/javascripts/app/views/task_widget_tasks.jst.eco @@ -1,6 +1,6 @@ <% for item in @item_list: %> - + <% if item.task.notify && item.data.iconClass is 'priority': %> diff --git a/app/assets/stylesheets/svg-dimensions.css b/app/assets/stylesheets/svg-dimensions.css index 2d77e1d20..77b61a6f8 100644 --- a/app/assets/stylesheets/svg-dimensions.css +++ b/app/assets/stylesheets/svg-dimensions.css @@ -1 +1 @@ -.icon-arrow-down { width: 13px; height: 7px; } .icon-arrow-left { width: 7px; height: 13px; } .icon-arrow-right { width: 7px; height: 13px; } .icon-arrow-up { width: 13px; height: 7px; } .icon-checkbox-checked { width: 10px; height: 10px; } .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; } .icon-diagonal-cross { width: 13px; height: 13px; } .icon-download { width: 14px; height: 13px; } .icon-email { width: 17px; height: 17px; } .icon-facebook { width: 17px; height: 17px; } .icon-group { width: 24px; height: 24px; } .icon-important { width: 16px; height: 16px; } .icon-in-process { width: 64px; height: 64px; } .icon-list { width: 16px; height: 16px; } .icon-lock-open { width: 16px; height: 16px; } .icon-lock { width: 16px; height: 16px; } .icon-logo { width: 42px; height: 36px; } .icon-long-arrow-right { width: 11px; height: 11px; } .icon-magnifier { width: 15px; height: 15px; } .icon-mail { width: 17px; height: 17px; } .icon-marker { width: 17px; height: 19px; } .icon-message { width: 24px; height: 24px; } .icon-mood-bad { width: 60px; height: 59px; } .icon-mood-good { width: 60px; height: 59px; } .icon-mood-happy { width: 60px; height: 59px; } .icon-mood-ok { width: 60px; height: 59px; } .icon-mood-super-bad { width: 60px; height: 59px; } .icon-mood-super-happy { width: 60px; height: 59px; } .icon-mood-supergood { width: 60px; height: 59px; } .icon-note { width: 17px; height: 16px; } .icon-one-ticket { width: 48px; height: 10px; } .icon-organization { width: 16px; height: 16px; } .icon-outbound-calls { width: 17px; height: 17px; } .icon-overviews { width: 24px; height: 24px; } .icon-package { width: 16px; height: 16px; } .icon-pen { width: 16px; height: 16px; } .icon-person { width: 24px; height: 24px; } .icon-phone { width: 17px; height: 17px; } .icon-plus { width: 20px; height: 20px; } .icon-priority-modified-inner-circle { width: 16px; height: 16px; } .icon-priority-modified-outer-circle { width: 16px; height: 16px; } .icon-priority { width: 16px; height: 16px; } .icon-received-calls { width: 17px; height: 17px; } .icon-reopening { width: 68px; height: 47px; } .icon-reply-all { width: 16px; height: 16px; } .icon-reply { width: 16px; height: 16px; } .icon-signout { width: 15px; height: 19px; } .icon-split { width: 16px; height: 16px; } .icon-stopwatch { width: 77px; height: 83px; } .icon-switchView { width: 19px; height: 18px; } .icon-team { width: 16px; height: 16px; } .icon-templates { width: 24px; height: 24px; } .icon-tools { width: 24px; height: 24px; } .icon-total-tickets { width: 48px; height: 83px; } .icon-twitter { width: 17px; height: 17px; } .icon-user { width: 16px; height: 16px; } \ No newline at end of file +.icon-arrow-down { width: 13px; height: 7px; } .icon-arrow-left { width: 7px; height: 13px; } .icon-arrow-right { width: 7px; height: 13px; } .icon-arrow-up { width: 13px; height: 7px; } .icon-checkbox-checked { width: 10px; height: 10px; } .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; } .icon-diagonal-cross { width: 13px; height: 13px; } .icon-download { width: 14px; height: 13px; } .icon-email { width: 17px; height: 17px; } .icon-facebook { width: 17px; height: 17px; } .icon-group { width: 24px; height: 24px; } .icon-important { width: 16px; height: 16px; } .icon-in-process { width: 64px; height: 64px; } .icon-list { width: 16px; height: 16px; } .icon-loading { width: 16px; height: 16px; } .icon-lock-open { width: 16px; height: 16px; } .icon-lock { width: 16px; height: 16px; } .icon-logo { width: 42px; height: 36px; } .icon-long-arrow-right { width: 11px; height: 11px; } .icon-magnifier { width: 15px; height: 15px; } .icon-marker { width: 17px; height: 19px; } .icon-message { width: 24px; height: 24px; } .icon-mood-bad { width: 60px; height: 59px; } .icon-mood-good { width: 60px; height: 59px; } .icon-mood-ok { width: 60px; height: 59px; } .icon-mood-super-bad { width: 60px; height: 59px; } .icon-mood-supergood { width: 60px; height: 59px; } .icon-note { width: 17px; height: 16px; } .icon-one-ticket { width: 48px; height: 10px; } .icon-organization { width: 16px; height: 16px; } .icon-outbound-calls { width: 17px; height: 17px; } .icon-overviews { width: 24px; height: 24px; } .icon-package { width: 16px; height: 16px; } .icon-pen { width: 16px; height: 16px; } .icon-person { width: 24px; height: 24px; } .icon-phone { width: 17px; height: 17px; } .icon-plus { width: 20px; height: 20px; } .icon-priority-modified-inner-circle { width: 16px; height: 16px; } .icon-priority-modified-outer-circle { width: 16px; height: 16px; } .icon-priority { width: 16px; height: 16px; } .icon-received-calls { width: 17px; height: 17px; } .icon-reopening { width: 68px; height: 47px; } .icon-reply-all { width: 16px; height: 16px; } .icon-reply { width: 16px; height: 16px; } .icon-signout { width: 15px; height: 19px; } .icon-split { width: 16px; height: 16px; } .icon-stopwatch { width: 77px; height: 83px; } .icon-switchView { width: 19px; height: 18px; } .icon-team { width: 16px; height: 16px; } .icon-templates { width: 24px; height: 24px; } .icon-tools { width: 24px; height: 24px; } .icon-total-tickets { width: 48px; height: 83px; } .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 4079dc3b0..7d370817f 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -2215,7 +2215,6 @@ footer { } .nav-tab-icon .inner-circle { - will-change: opacity; animation: fade 3s ease-in-out infinite; } @@ -2225,6 +2224,11 @@ footer { to { opacity: 1 } } + .nav-tab-icon.icon-loading { + animation: rotateplane 1.2s infinite ease-in-out; + fill: $supergood-color; + } + .nav-tab-close { position: absolute; right: 0; @@ -2290,7 +2294,7 @@ footer { } .search { - padding: 14px 2px 10px 10px; + padding: 9px 2px 10px 10px; border-bottom: 1px solid rgba(240, 250, 255, .05); flex-shrink: 0; } diff --git a/public/assets/images/icons.svg b/public/assets/images/icons.svg index 3c14c1650..e0b227248 100644 --- a/public/assets/images/icons.svg +++ b/public/assets/images/icons.svg @@ -1 +1 @@ -arrow-downarrow-leftarrow-rightarrow-upcheckbox-checkedcheckboxcheckmarkclockclosecloudcogdashboarddiagonal-crossdownloademailfacebookgroupimportantin-processlistlock-openlocklong-arrow-rightmagnifiermailmarkermessagemood-badmood-goodmood-happymood-okmood-super-badmood-super-happymood-supergoodnoteone-ticketorganizationoutbound-callsoverviewspackagepenpersonphonepluspriority-modified-inner-circlepriority-modified-outer-circlepriorityreceived-callsreopeningreply-allreplysignoutsplitstopwatchswitchViewteamtemplatestoolstotal-ticketstwitteruser \ No newline at end of file +arrow-downarrow-leftarrow-rightarrow-upcheckbox-checkedcheckboxcheckmarkclockclosecloudcogdashboarddiagonal-crossdownloademailfacebookgroupimportantin-processlistloadinglock-openlocklong-arrow-rightmagnifiermarkermessagemood-badmood-goodmood-okmood-super-badmood-supergoodnoteone-ticketorganizationoutbound-callsoverviewspackagepenpersonphonepluspriority-modified-inner-circlepriority-modified-outer-circlepriorityreceived-callsreopeningreply-allreplysignoutsplitstopwatchswitchViewteamtemplatestoolstotal-ticketstwitteruser \ No newline at end of file diff --git a/public/assets/images/icons/loading.svg b/public/assets/images/icons/loading.svg new file mode 100644 index 000000000..396bbd4a1 --- /dev/null +++ b/public/assets/images/icons/loading.svg @@ -0,0 +1,12 @@ + + + + loading + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/public/assets/images/icons/mail.svg b/public/assets/images/icons/mail.svg deleted file mode 100644 index a197c1310..000000000 --- a/public/assets/images/icons/mail.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - mail - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/public/assets/images/icons/mood-happy.svg b/public/assets/images/icons/mood-happy.svg deleted file mode 100644 index d52d2e77a..000000000 --- a/public/assets/images/icons/mood-happy.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - mood-happy - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/public/assets/images/icons/mood-super-happy.svg b/public/assets/images/icons/mood-super-happy.svg deleted file mode 100644 index d99cda1a0..000000000 --- a/public/assets/images/icons/mood-super-happy.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - mood-super-happy - Created with Sketch. - - - - - - - \ No newline at end of file