bring back the cancel build button

This commit is contained in:
Lisa Passing 2015-03-09 15:57:30 +01:00
parent 02a1d2dd8e
commit 8df3ae3499
5 changed files with 30 additions and 7 deletions

View File

@ -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

View File

@ -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
border-top : 5px solid $dashboard-text-color

View File

@ -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

View File

@ -2,11 +2,15 @@
{{#if view.displayCancelBuild}}
<a href="#" {{action "cancelBuild" target=view}} class="button-circle"
{{bind-attr class="view.canCancelBuild::disabled"}} title="Cancel Build"></a>
{{bind-attr class="view.canCancelBuild::disabled"}} title="Cancel Build">
<span class="icon icon--cancel"></span>
</a>
{{/if}}
{{#if view.displayCancelJob}}
<a href="#" {{action "cancelJob" target=view}} class="button-circle"
{{bind-attr class="view.canCancelJob::disabled"}} title="Cancel Job"></a>
{{bind-attr class="view.canCancelJob::disabled"}} title="Cancel Job">
<span class="icon icon--cancel"></span>
</a>
{{/if}}
{{#if view.displayRequeueBuild}}
{{#if view.requeueing}}

15
public/images/svg/off.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="154px" height="154px" viewBox="0 0 154 154" enable-background="new 0 0 154 154" xml:space="preserve">
<path fill="#FFFFFF" d="M0,76.9c0-13.933,3.433-26.783,10.3-38.55S26.483,17.267,38.25,10.4S62.867,0.1,76.8,0.1
c13.934,0,26.784,3.433,38.55,10.3c11.768,6.867,21.084,16.184,27.95,27.95s10.3,24.617,10.3,38.55
c0,13.934-3.434,26.784-10.3,38.55s-16.183,21.083-27.95,27.95c-11.766,6.866-24.616,10.3-38.55,10.3
c-13.933,0-26.783-3.434-38.55-10.3c-11.767-6.867-21.083-16.184-27.95-27.95S0,90.834,0,76.9z M38.7,99.5
c0,1.8,0.633,3.334,1.9,4.6l9,9c1.267,1.268,2.8,1.9,4.6,1.9c1.733,0,3.233-0.633,4.5-1.9L76.8,95L94.9,113.1
c1.266,1.268,2.766,1.9,4.5,1.9c1.8,0,3.333-0.633,4.6-1.9l9-9c1.267-1.266,1.9-2.8,1.9-4.6c0-1.733-0.634-3.233-1.9-4.5L94.9,76.9
L113,58.8c1.267-1.267,1.9-2.767,1.9-4.5c0-1.8-0.634-3.333-1.9-4.6l-9-9c-1.267-1.267-2.8-1.9-4.6-1.9
c-1.734,0-3.234,0.634-4.5,1.9L76.8,58.8L58.7,40.7c-1.267-1.267-2.767-1.9-4.5-1.9c-1.8,0-3.333,0.634-4.6,1.9l-9,9
c-1.267,1.267-1.9,2.8-1.9,4.6c0,1.733,0.633,3.233,1.9,4.5l18.1,18.1L40.6,95C39.333,96.267,38.7,97.767,38.7,99.5z"/>
</svg>

After

Width:  |  Height:  |  Size: 1.4 KiB