fix button alignment bug

This commit is contained in:
Lisa P 2015-11-23 12:47:57 +01:00
parent 466588d1d6
commit 787b2fa4d1
6 changed files with 18 additions and 13 deletions

View File

@ -2,7 +2,7 @@
LoadingIndicatorComponent = Ember.Component.extend
tagName: 'div'
classNameBindings: ['center:loading-container', 'inline:inline-block']
classNameBindings: ['center:loading-container', 'inline:inline-block', 'height:icon-height']
center: false
`export default LoadingIndicatorComponent`

View File

@ -32,4 +32,9 @@
.loading-indicator--white
@extend .loading-indicator
i
background-color: $white
background-color: $white
.icon-height
.loading-indicator
height: 28px
margin-bottom: .5em

View File

@ -129,12 +129,12 @@
&:hover
background-color: darken($grey-medium, 10)
.icon--trigger
width: .95em
height: 1.3em
width: 15px
height: 19px
margin-left: 6px
.icon--cancel
width: 1em
height: 1em
width: 16px
height: 16px
margin-left: 6px
.icon--codeclimate
width: 1.2em

View File

@ -2,6 +2,7 @@
@include resetul
font-size: 18px
text-align: center
height: 0
li
top: 0
position: relative
@ -22,7 +23,7 @@
height: 1.1rem
p
padding: .7em 0
padding: .4em 0
margin: 0
li.broadcast p

View File

@ -1,9 +1,8 @@
{{#if canCancel}}
{{#if cancelling}}
{{loading-indicator}}
{{loading-indicator height=true}}
{{else}}
<a href="#" {{action "cancel"}} class="button-circle"
title="Cancel Build">
<a href="#" {{action "cancel"}} class="button-circle" title="Cancel Build">
<span class="icon icon--cancel"></span>
</a>
{{/if}}
@ -11,7 +10,7 @@
{{#if canRestart}}
{{#if restarting}}
{{loading-indicator}}
{{loading-indicator height=true}}
{{else}}
<a href="#" {{action "restart"}} class="button-circle" title="Restart Build">
<span class="icon icon--trigger"></span>

View File

@ -1,6 +1,6 @@
{{#if canCancel}}
{{#if cancelling}}
{{loading-indicator}}
{{loading-indicator height=true}}
{{else}}
<a href="#" {{action "cancel"}} class="button-circle" title="Cancel Job">
<span class="icon icon--cancel"></span>
@ -10,7 +10,7 @@
{{#if canRestart}}
{{#if restarting}}
{{loading-indicator}}
{{loading-indicator height=true}}
{{else}}
<a href="#" {{action "restart"}} class="button-circle" title="Restart Job">
<span class="icon icon--trigger"></span>