diff --git a/app/assets/javascripts/app/controllers/taskbar_widget.js.coffee b/app/assets/javascripts/app/controllers/taskbar_widget.js.coffee index 8eaa14778..2cbd715e2 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' + iconClass: 'loading dot' title: App.i18n.translateInline('Loading...') head: App.i18n.translateInline('Loading...') worker = App.TaskManager.worker( task.key ) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 88eb92e81..84499f35a 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -1797,7 +1797,7 @@ ol.tabs li { .loading.icon { width: 30px; height: 30px; - background: hsl(339,80%,62%); + background: hsl(145,51%,45%); -webkit-animation: rotateplane 1.2s infinite ease-in-out; animation: rotateplane 1.2s infinite ease-in-out; } @@ -1808,27 +1808,28 @@ ol.tabs li { } @-webkit-keyframes rotateplane { - 0% { -webkit-transform: perspective(120px); background: hsl(202,68%,54%); } - 50% { -webkit-transform: perspective(120px) rotateY(180deg); background: hsl(145,51%,45%); } - 100% { -webkit-transform: perspective(120px) rotateY(180deg) rotateX(180deg); background: hsl(202,68%,54%); } + 0% { -webkit-transform: perspective(120px); } + 50% { -webkit-transform: perspective(120px) rotateY(180deg); } + 100% { -webkit-transform: perspective(120px) rotateY(180deg) rotateX(180deg); } } @keyframes rotateplane { 0% { transform: perspective(120px) rotateX(0deg) rotateY(0deg); -webkit-transform: perspective(120px) rotateX(0deg) rotateY(0deg); - background: hsl(202,68%,54%); } 50% { transform: perspective(120px) rotateX(-180.1deg) rotateY(0deg); -webkit-transform: perspective(120px) rotateX(-180.1deg) rotateY(0deg); - background: hsl(145,51%,45%); } 100% { transform: perspective(120px) rotateX(-180deg) rotateY(-179.9deg); -webkit-transform: perspective(120px) rotateX(-180deg) rotateY(-179.9deg); - background: hsl(202,68%,54%); } } + .loading.dot.icon { + border-radius: 100%; + } + /* * removed margin of forms to not break the layout with submit buttons within
area e. g. for modal dialogs @@ -2097,15 +2098,6 @@ footer { &.loading { width: 10px; height: 10px; - border-radius: 100%; - position: absolute; - left: 50%; - top: 50%; - margin: -6px 0 0 -5px; - - &:after { - @extend .priority.icon:after; - } } &.error { @@ -2127,8 +2119,7 @@ footer { .task.active .priority.icon, .task.active .modified.priority.icon, - .task.active .modified.priority.icon:after, - .task.active .loading.icon:after { + .task.active .modified.priority.icon:after { background-color: white; border-color: white; } @@ -2146,8 +2137,7 @@ footer { .level-1.active, .level-1.active .priority.icon:after, .level-1 .modified.priority.icon, - .level-1 .modified.priority.icon:after, - .level-1.active .loading.icon:after { + .level-1 .modified.priority.icon:after { background-color: #38ae6a; border-color: #38ae6a; color: #38ae6a; @@ -2162,8 +2152,7 @@ footer { .level-2.active, .level-2.active .priority.icon:after, .level-2 .modified.priority.icon, - .level-2 .modified.priority.icon:after, - .level-2.active .loading.icon:after { + .level-2 .modified.priority.icon:after { background-color: #f35910; border-color: #f35910; color: #f35910; @@ -2178,8 +2167,7 @@ footer { .level-3.active, .level-3.active .priority.icon:after, .level-3 .modified.priority.icon, - .level-3 .modified.priority.icon:after, - .level-3.active .loading.icon:after { + .level-3 .modified.priority.icon:after { background-color: #faab00; border-color: #faab00; }