From e32e2922ded64855bd7dd95537594d46476d0127 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki <drogus@gmail.com> Date: Tue, 28 Oct 2014 14:54:55 +0100 Subject: [PATCH] Change loading spinner type on icons --- assets/scripts/app/templates/repos/show/actions.hbs | 12 ++++++------ assets/styles/main/tools.sass | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/assets/scripts/app/templates/repos/show/actions.hbs b/assets/scripts/app/templates/repos/show/actions.hbs index 2dc8efa6..9a26251e 100644 --- a/assets/scripts/app/templates/repos/show/actions.hbs +++ b/assets/scripts/app/templates/repos/show/actions.hbs @@ -1,11 +1,5 @@ <div id="actions"> <ul> - {{#if view.displayRemoveLog}} - <li class="icon" title="Remove Log"> - <a href="#" {{action "removeLog" target="view"}} - {{bind-attr class="view.canRemoveLog::disabled"}}><img class="icon" src="/images/icons/off.svg" width="20"></a> - </li> - {{/if}} {{#if view.displayCancelBuild}} <li class="icon" title="Cancel Build"> <a href="#" {{action "cancelBuild" target="view"}} @@ -44,6 +38,12 @@ <li class="icon" title="Download Log"> <a class="download-log" {{bind-attr href="view.plainTextLogUrl"}}><img class="icon" src="/images/icons/download-log.svg" width="20"/></a> </li> + {{#if view.displayRemoveLog}} + <li class="icon" title="Remove Log"> + <a href="#" {{action "removeLog" target="view"}} + {{bind-attr class="view.canRemoveLog::disabled"}}><img class="icon" src="/images/icons/delete-log.svg" width="20"></a> + </li> + {{/if}} {{/if}} {{#if view.displayCodeClimate}} <li class="icon" title="Test Coverage with Code Climate"> diff --git a/assets/styles/main/tools.sass b/assets/styles/main/tools.sass index 5afee560..3832ffe8 100644 --- a/assets/styles/main/tools.sass +++ b/assets/styles/main/tools.sass @@ -63,10 +63,12 @@ li.icon span.loading + background: inline-image('ui/round-spinner.svg') no-repeat + background-size: 17px 17px display: inline-block height: 25px position: relative - top: 1px + top: -3px cursor: pointer color: #ffffff background-color: #5e869a