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

moar alignment fun

Browse Source
This commit is contained in:
Lisa P 2015-09-17 14:49:35 +02:00
parent b74aa037d5
commit ac8765f0f1
5 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@
@media #{$medium-up} @media #{$medium-up}
& > div:first-of-type & > div:first-of-type
width: 25% width: 26%
position: relative position: relative
&:after &:after
content: "" content: ""
@ -222,7 +222,7 @@
bottom: -4px bottom: -4px
@media #{$medium-up} @media #{$medium-up}
top: -2.3em top: -2.3em
width: 4em width: 4.1em
padding: .1em .1em padding: .1em .1em
white-space: nowrap white-space: nowrap
font-size: 14px; font-size: 14px;
@ -235,6 +235,10 @@
path path
fill: $teal-dark fill: $teal-dark
.label-align
vertical-align: middle
line-height: 1.4
// @todo refactor to status-icon module // @todo refactor to status-icon module
.status-icon .status-icon
.is-rotating .is-rotating

12
app/styles/app/modules/tiles.sass
View File

@ -3,7 +3,7 @@
svg g > * svg g > *
fill: $color fill: $color
@mixin colorTiles($color, $status) @mixin colorTiles($color, $status, $extra-bg: $color)
&.#{$status} &.#{$status}
.tile-status .tile-status
background-color: $color background-color: $color
@ -34,11 +34,11 @@
@include colorTiles($red-dark, 'failed') @include colorTiles($red-dark, 'failed')
@include colorTiles($red-dark, 'errored') @include colorTiles($red-dark, 'errored')
@include colorTiles($grey-medium, 'canceled') @include colorTiles($grey-medium, 'canceled')
@include colorTiles(#bfb502, 'started') @include colorTiles(#bfb502, 'started', #e5da3f)
@include colorTiles(#bfb502, 'queued') @include colorTiles(#bfb502, 'queued', #e5da3f)
@include colorTiles(#bfb502, 'booting') @include colorTiles(#bfb502, 'booting', #e5da3f)
@include colorTiles(#bfb502, 'received') @include colorTiles(#bfb502, 'received', #e5da3f)
@include colorTiles(#bfb502, 'created') @include colorTiles(#bfb502, 'created', #e5da3f)
.status-icon .is-rotating .status-icon .is-rotating
width: 17px; width: 17px;

2
app/templates/branches.hbs
View File

@ -22,7 +22,7 @@
<h2 class="small-title">Inactive Branches</h2> <h2 class="small-title">Inactive Branches</h2>
<ul class="blank-list"> <ul class="blank-list">
{{#each branch in inactiveBranches}} {{#each branch in inactiveBranches}}
{{branch-row build=branch}} {{branch-row build=branch inactive=true}}
{{/each}} {{/each}}
</ul> </ul>
</section> </section>

18
app/templates/components/branch-row.hbs
View File

@ -19,6 +19,7 @@
l0.5,0.1V4c-0.1,0-0.4-0.1-0.9-0.2c0,0-0.1,0-0.1,0L6.4,3.5V4.7z"/> l0.5,0.1V4c-0.1,0-0.4-0.1-0.9-0.2c0,0-0.1,0-0.1,0L6.4,3.5V4.7z"/>
</g> </g>
</svg></span> </svg></span>
<span class="label-align">
{{#if build.last_build}} {{#if build.last_build}}
{{#if getLast5Builds.isLoading}} {{#if getLast5Builds.isLoading}}
{{loading-indicator inline=true}} {{loading-indicator inline=true}}
@ -27,7 +28,7 @@
{{/if}} {{/if}}
{{else}} {{else}}
0 builds 0 builds
{{/if}} {{/if}}</span>
</div> </div>
</div> </div>
</div> </div>
@ -37,7 +38,7 @@
{{#if build.last_build}} {{#if build.last_build}}
{{#link-to "build" build.repository.slug build.last_build.id}} {{#link-to "build" build.repository.slug build.last_build.id}}
{{request-icon build=build}} {{request-icon build=build}}
#{{build.last_build.number}} {{build.last_build.state}} <span class="label-align">#{{build.last_build.number}} {{build.last_build.state}}</span>
{{/link-to}} {{/link-to}}
{{else}} {{else}}
{{request-icon build=build}} - {{request-icon build=build}} -
@ -62,11 +63,12 @@
</g> </g>
</svg> </svg>
</span> </span>
<span class="label-align">
{{#if build.last_build}} {{#if build.last_build}}
{{format-time build.last_build.finished_at}} {{format-time build.last_build.finished_at}}
{{else}} {{else}}
- -
{{/if}} {{/if}}</span>
</div> </div>
</div> </div>
</div> </div>
@ -100,24 +102,27 @@
</g> </g>
</svg> </svg>
</span> </span>
<span class="label-align">
{{#if build.last_build}} {{#if build.last_build}}
{{format-sha build.last_build.commit.sha}} {{format-sha build.last_build.commit.sha}}
{{else}} {{else}}
- -
{{/if}} {{/if}}</span>
</a></div> </a></div>
</div> </div>
<div class="branch-commiter"> <div class="branch-commiter">
<div class="row-item"> <div class="row-item">
{{#if build.last_build}} {{#if build.last_build}}
<img src="{{build.last_build.commit.committer.avatar_url}}" alt="avatar" class="avatar">{{build.last_build.commit.committer.name}} <img src="{{build.last_build.commit.committer.avatar_url}}" alt="avatar" class="avatar">
<span class="label-align">{{build.last_build.commit.committer.name}}</span>
{{else}} {{else}}
<div class="avatar"></div> no commits yet <div class="avatar"></div><span class="label-align">no commits yet</span>
{{/if}} {{/if}}
</div> </div>
</div> </div>
</div> </div>
<div class="one-line is-relative"> <div class="one-line is-relative">
{{#unless inactive}}
{{#if build.last_build}} {{#if build.last_build}}
<div class="branch-nav dropup-trigger"> <div class="branch-nav dropup-trigger">
<div class="row-item"> <div class="row-item">
@ -185,6 +190,7 @@
</ul> </ul>
</div> </div>
{{/if}} {{/if}}
{{/unless}}
</div> </div>
<div class="one-line is-relative"> <div class="one-line is-relative">
<ul class="build-tiles"> <ul class="build-tiles">

2
app/templates/components/build-tile.hbs
View File

@ -4,7 +4,7 @@
{{build.last_build.state}} {{build.last_build.state}}
<div class="dropup--status"> <div class="dropup--status">
{{request-icon build=build}} #{{build.number}} {{request-icon build=build}} <span class="label-align">#{{build.number}}</span>
</div> </div>
{{/link-to}} {{/link-to}}
{{/if}} {{/if}}