diff --git a/app/styles/app/layouts/buildheader.sass b/app/styles/app/layouts/buildheader.sass index 12879f24..580f908e 100644 --- a/app/styles/app/layouts/buildheader.sass +++ b/app/styles/app/layouts/buildheader.sass @@ -12,7 +12,7 @@ .repo-header header - margin: 1rem 0 2rem + margin: 1rem 0 2.3rem > * vertical-align: middle @@ -35,7 +35,7 @@ margin: 0 font-weight: 400 font-size: 35px - &:hover + a:hover text-decoration: underline .repo-header-icons @@ -137,5 +137,7 @@ width: 1em height: 1.4em vertical-align: middle + .icon--cancel + height: 1.1em .icon--codeclimate width: 1.2em diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass index b8fb7ff5..254b9695 100644 --- a/app/styles/app/modules/icons.sass +++ b/app/styles/app/modules/icons.sass @@ -66,6 +66,9 @@ &:hover background-image: inline-image('dashboard/burger-hover.svg') +.icon--cancel + background-image: inline-image('svg/off.svg') + .icon-sync, .icon--trigger background-image: inline-image('icons/sync-account-icon.svg') @@ -76,7 +79,6 @@ background-image: inline-image('icons/remove-log-icon.svg') .icon--down background-image: inline-image('icons/end-of-log-icon.svg') - .icon--codeclimate background-image: inline-image('icons/code-climate-icon.svg') @@ -88,4 +90,4 @@ margin-left : 5px border-left : 5px solid transparent border-right : 5px solid transparent - border-top : 5px solid $dashboard-text-color \ No newline at end of file + border-top : 5px solid $dashboard-text-color diff --git a/app/styles/app/modules/tiles.sass b/app/styles/app/modules/tiles.sass index 4f82cebf..c74021aa 100644 --- a/app/styles/app/modules/tiles.sass +++ b/app/styles/app/modules/tiles.sass @@ -38,7 +38,7 @@ margin: .5em auto 1.1em .request-kind display: block - width: 1.5em + width: 1.4em height: 1.1em margin: .5em auto 1.1em diff --git a/app/templates/repos/show/actions.hbs b/app/templates/repos/show/actions.hbs index f04ec7a2..7388b33c 100644 --- a/app/templates/repos/show/actions.hbs +++ b/app/templates/repos/show/actions.hbs @@ -2,11 +2,15 @@ {{#if view.displayCancelBuild}} + {{bind-attr class="view.canCancelBuild::disabled"}} title="Cancel Build"> + + {{/if}} {{#if view.displayCancelJob}} + {{bind-attr class="view.canCancelJob::disabled"}} title="Cancel Job"> + + {{/if}} {{#if view.displayRequeueBuild}} {{#if view.requeueing}} diff --git a/public/images/svg/off.svg b/public/images/svg/off.svg new file mode 100644 index 00000000..e2f1992a --- /dev/null +++ b/public/images/svg/off.svg @@ -0,0 +1,15 @@ + + + + + +