suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix button alignment bug

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/loading-indicator.coffee
View File

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

7
app/styles/app/components/loading-indicator.sass
View File

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

8
app/styles/app/layouts/buildheader.sass
View File

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

3
app/styles/app/modules/flash.sass
View File

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

7
app/templates/components/build-repo-actions.hbs
View File

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

4
app/templates/components/job-repo-actions.hbs
View File

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