fix things iwith Piotr

This commit is contained in:
Lisa Passing 2015-03-10 15:35:00 +01:00
parent 572ac9eb74
commit e1112c73cc
6 changed files with 18 additions and 5 deletions

View File

@ -1,6 +1,7 @@
`import Ember from 'ember'` `import Ember from 'ember'`
`import { colorForState } from 'travis/utils/helpers'` `import { colorForState } from 'travis/utils/helpers'`
`import GithubUrlProperties from 'travis/mixins/github-url-properties'` `import GithubUrlProperties from 'travis/mixins/github-url-properties'`
`import { gravatarImage } from 'travis/utils/urls'`
Controller = Ember.ObjectController.extend(GithubUrlProperties, Controller = Ember.ObjectController.extend(GithubUrlProperties,
needs: ['builds'] needs: ['builds']
@ -10,6 +11,10 @@ Controller = Ember.ObjectController.extend(GithubUrlProperties,
color: (-> color: (->
colorForState(@get('build.state')) colorForState(@get('build.state'))
).property('build.state') ).property('build.state')
urlAuthorGravatarImage: (->
gravatarImage(@get('commit.authorEmail'), 40)
).property('commit.authorEmail')
) )
`export default Controller` `export default Controller`

View File

@ -98,8 +98,16 @@
// build history etc // build history etc
.tile--build .tile--build
.tile-main .tile-main
@media #{$small-only}
h2
line-height: $line-height-m
margin-bottom: 1em
@media #{$medium-up} @media #{$medium-up}
white-space: nowrap
overflow: hidden
border-right: solid 1px $grey4 border-right: solid 1px $grey4
&:after
@include fadeOut(right, -90deg, $cream-light)
@media #{$xlarge-up} @media #{$xlarge-up}
@include grid-column(8) @include grid-column(8)
.tile-additional .tile-additional

View File

@ -17,7 +17,7 @@
{{/if}} {{/if}}
{{{format-message build.commit.message short="true" repoBinding=build.repo}}} {{{format-message build.commit.message short="true" repoBinding=build.repo}}}
</h2> </h2>
<p class="tile-author"><img src="//placehold.it/25x25" alt=""> {{build.commit.committerName}} commited</p> <p class="tile-author"><img {{bind-attr src="build.urlAuthorGravatarImage"}} alt="">{{build.commit.committerName}} commited</p>
</div> </div>
<div class="column tile-additional medium-6 end"> <div class="column tile-additional medium-6 end">
<div class="column small-6"> <div class="column small-6">
@ -32,7 +32,7 @@
<p class=""> <p class="">
<a {{bind-attr href="build.urlGithubCommit"}}> <a {{bind-attr href="build.urlGithubCommit"}}>
<span class="icon icon-github"></span> <span class="icon icon-github"></span>
{{format-commit build.commit}} {{format-sha build.commit.sha}}
</a> </a>
</p> </p>
</div> </div>

View File

@ -34,7 +34,7 @@
{{/if}} {{/if}}
{{#if view.displayCodeClimate}} {{#if view.displayCodeClimate}}
<a href="#" name="code-climate" <a href="#" name="code-climate"
{{action "codeClimatePopup" target=view}} class="button-circle" {{action "codeClimatePopup" target=view}} class="button-circle open-popup"
{{bind-attr class=":open-popup"}} title="Test Coverage with Code Climate"> {{bind-attr class=":open-popup"}} title="Test Coverage with Code Climate">
<span class="icon icon--codeclimate"></span> <span class="icon icon--codeclimate"></span>
</a> </a>

View File

@ -2,9 +2,8 @@
`import BasicView from 'travis/views/basic'` `import BasicView from 'travis/views/basic'`
View = BasicView.extend View = BasicView.extend
classNameBindings: ['color', 'loading'] classNameBindings: ['color']
buildBinding: 'controller.build' buildBinding: 'controller.build'
loadingBinding: 'controller.loading'
color: (-> color: (->
colorForState(@get('build.state')) colorForState(@get('build.state'))

View File

@ -65,6 +65,7 @@ View = BasicView.extend
codeClimatePopup: -> codeClimatePopup: ->
@popupCloseAll() @popupCloseAll()
console.log('repo-actions view')
@popup('code-climate') @popup('code-climate')
return false return false