fix footer columns issue
This commit is contained in:
parent
593602bf49
commit
fe13a44237
app
controllers
routes
styles/app
templates
|
@ -35,7 +35,8 @@ Controller = Ember.Controller.extend
|
||||||
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 != null
|
||||||
item
|
item
|
||||||
repos
|
console.log(item)
|
||||||
|
repos.reverse()
|
||||||
|
|
||||||
).property('model')
|
).property('model')
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
`import Ajax from 'travis/utils/ajax'`
|
`import Ajax from 'travis/utils/ajax'`
|
||||||
|
|
||||||
Route = TravisRoute.extend
|
Route = TravisRoute.extend
|
||||||
needsAuth: true
|
needsAuth: false
|
||||||
# controllerName: 'owner'
|
# controllerName: 'owner'
|
||||||
|
|
||||||
model: (params) ->
|
model: (params) ->
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
|
$font-size-ml: 18px
|
||||||
$font-size-m: 16px
|
$font-size-m: 16px
|
||||||
$font-size-sm: 14px
|
$font-size-sm: 14px
|
||||||
$line-height-m: 1.3
|
$line-height-m: 1.3
|
||||||
|
|
|
@ -5,16 +5,18 @@
|
||||||
a
|
a
|
||||||
color: #969496
|
color: #969496
|
||||||
.owner-title
|
.owner-title
|
||||||
margin: .3em 0 .1em
|
margin: .3em 0 .2em
|
||||||
font-size: 23px
|
font-size: 36px
|
||||||
font-weight: 400
|
font-weight: 400
|
||||||
.owner-handle
|
.owner-handle
|
||||||
margin: 0
|
margin: 0
|
||||||
font-size: $font-size-sm
|
font-size: $font-size-ml
|
||||||
.icon
|
.icon
|
||||||
width: 1.2em
|
width: 1.1em
|
||||||
height: 1.3em
|
height: 1.2em
|
||||||
vertical-align: middle
|
vertical-align: middle
|
||||||
|
a:hover
|
||||||
|
text-decoration: underline
|
||||||
img
|
img
|
||||||
border-radius: 50%
|
border-radius: 50%
|
||||||
|
|
||||||
|
|
|
@ -16,14 +16,22 @@
|
||||||
{{!-- {{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-6">
|
||||||
|
<p>{{repo.default_branch.name}}</p>
|
||||||
<p class="tile-commit column medium-3 small-6">
|
<p class="tile-commit column medium-3 small-6">
|
||||||
<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 class="column medium-6">
|
||||||
<p class="tile-duration column medium-3 small-6">
|
<p class="tile-duration column medium-3 small-6">
|
||||||
<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 column medium-2 small-6">
|
||||||
<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>
|
||||||
{{else}}
|
{{else}}
|
||||||
<p>there is no build</p>
|
<p>there is no build</p>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
|
@ -1,7 +1,14 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
||||||
|
{{#if config.pro}}
|
||||||
|
<div class="small-6 medium-4 large-4 columns">
|
||||||
|
<img src="/images/dashboard/footer-logo.svg">
|
||||||
|
</div>
|
||||||
|
{{else}}
|
||||||
<div class="small-6 medium-6 large-6 columns">
|
<div class="small-6 medium-6 large-6 columns">
|
||||||
<img src="/images/dashboard/footer-logo.svg">
|
<img src="/images/dashboard/footer-logo.svg">
|
||||||
</div>
|
</div>
|
||||||
|
{{/if}}
|
||||||
<div class="small-6 medium-2 large-2 columns">
|
<div class="small-6 medium-2 large-2 columns">
|
||||||
<h3>©Travis CI, GmbH</h3>
|
<h3>©Travis CI, GmbH</h3>
|
||||||
<p>Rigaer Straße 8<br>10247 Berlin, Germany</p>
|
<p>Rigaer Straße 8<br>10247 Berlin, Germany</p>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{{!-- {{outlet}} --}}
|
{{!-- {{outlet}} --}}
|
||||||
|
|
||||||
<header class="owner-header row">
|
<header class="owner-header row">
|
||||||
<section class="columns small-10 medium-5">
|
<section class="columns small-10 medium-6">
|
||||||
<div class="owner-avatar">
|
<div class="owner-avatar">
|
||||||
<img {{bind-attr src="owner.avatarUrl"}} alt="" width="125" height="125">
|
<img {{bind-attr src="owner.avatarUrl"}} alt="" width="125" height="125">
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user