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

implement all of josh\'s feedback

Browse Source
This commit is contained in:
Lisa Passing 2015-05-04 18:16:50 +02:00
parent fe13a44237
commit c2226f14f7
3 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/owner.coffee
View File

@ -33,10 +33,9 @@ Controller = Ember.Controller.extend
data = @get('model') data = @get('model')
repos = data.repositories.filter (item, index) -> repos = data.repositories.filter (item, index) ->
if item.active && item.default_branch.last_build != null if item.active && item.default_branch.last_build
item item
console.log(item) repos.sortBy('default_branch.last_build.finished_at').reverse()
repos.reverse()
).property('model') ).property('model')

21
app/styles/app/layouts/owner.sass
View File

@ -48,14 +48,14 @@
white-space: nowrap white-space: nowrap
.tile-status .icon-status .tile-status .icon-status
margin-top: 1.3em margin-top: 2.1em
width: 1.2em
height: 1.3em
.tile-single .tile-single,
position: relative .tile-double
color: $grey1 color: $grey1
p
padding: .1em 0 padding: .1em 0
line-height: 3em
font-size: $font-size-m font-size: $font-size-m
.icon .icon
margin-right: .3em margin-right: .3em
@ -65,19 +65,28 @@
&.icon-github &.icon-github
width: .9em width: .9em
height: 1.2em height: 1.2em
&.push
width: 1.1em
height: .6em
margin: 0
a a
color: $grey1 color: $grey1
&:hover &:hover
color: $grey1 color: $grey1
text-decoration: underline text-decoration: underline
.tile-single
line-height: 3em
.tile-double
line-height: 1.5em
.tile-main .tile-main
position: relative position: relative
overflow: hidden overflow: hidden
&:after &:after
content: "" content: ""
@include fadeOut(right, -90deg, $cream-light, 20%) @include fadeOut(right, -90deg, $cream-light, 20%)
& ~ .tile-single & ~ div
@media #{$medium-up} @media #{$medium-up}
padding-left: 2em padding-left: 2em
border-left: 1px solid $grey4 border-left: 1px solid $grey4

17
app/templates/components/owner-repo-tile.hbs
View File

@ -3,31 +3,32 @@
{{/if}} {{/if}}
<div class="tile-status"> <div class="tile-status">
<span {{bind-attr class=":icon :icon-status repo.default_branch.last_build.state"}}></span> <span {{bind-attr class=":icon :icon-status repo.default_branch.last_build.state"}}></span>
<span {{bind-attr class=":icon :request-kind repo.default_branch.last_build.event_type"}}></span>
</div> </div>
<div class="tile-main tile-header column medium-3"> <div class="tile-main tile-header column medium-3">
<h3>{{ownerName}}</h3> <h3>{{ownerName}}</h3>
<h2>{{#link-to "repo" ownerName repoName }}{{repoName}}{{/link-to}}</h2> <h2>{{#link-to "repo" ownerName repoName }}{{repoName}}{{/link-to}}</h2>
</div> </div>
<div class="tile-single column medium-9 end"> <div class="column medium-9 end">
{{#if repo.default_branch.last_build}} {{#if repo.default_branch.last_build}}
<p class="tile-job build-status column medium-3 small-6"><span class="icon icon-hash"></span> <p class="tile-single tile-job build-status column medium-4 small-6"><span class="icon icon-hash"></span>
{{#link-to "build" ownerName repoName repo.default_branch.last_build.number}} {{#link-to "build" ownerName repoName repo.default_branch.last_build.number}}
{{!-- {{repo.last_build.number}} {{repo.last_build.state}} --}} {{!-- {{repo.last_build.number}} {{repo.last_build.state}} --}}
{{repo.default_branch.last_build.number}} {{repo.default_branch.last_build.state}} {{repo.default_branch.last_build.number}} {{repo.default_branch.last_build.state}}
{{/link-to}}</p> {{/link-to}}</p>
<div class="column medium-9"> <div class="column medium-8 tile-double">
<div class="column medium-6"> <div class="column medium-6">
<p>{{repo.default_branch.name}}</p> <p class="tile-branch">
<p class="tile-commit column medium-3 small-6"> <span {{bind-attr class=":icon :icon--grey :request-kind repo.default_branch.last_build.event_type"}}></span>
{{repo.default_branch.name}}</p>
<p class="tile-commit">
<span class="icon icon-github"></span><a {{bind-attr href="repo.default_branch.last_build.commit.compare_url"}}>{{format-sha repo.default_branch.last_build.commit.sha}}</a></p> <span class="icon icon-github"></span><a {{bind-attr href="repo.default_branch.last_build.commit.compare_url"}}>{{format-sha repo.default_branch.last_build.commit.sha}}</a></p>
</div> </div>
<div class="column medium-6"> <div class="column medium-6">
<p class="tile-duration column medium-3 small-6"> <p class="tile-duration">
<span class="icon icon-clock"></span> <span class="icon icon-clock"></span>
{{format-duration repo.default_branch.last_build.duration}}</p> {{format-duration repo.default_branch.last_build.duration}}</p>
<p class="tile-timeago column medium-2 small-6"> <p class="tile-timeago">
<span class="icon icon-cal"></span> <span class="icon icon-cal"></span>
{{format-time repo.default_branch.last_build.finished_at}}</p> {{format-time repo.default_branch.last_build.finished_at}}</p>
</div> </div>