diff --git a/app/styles/app/layouts/branches.sass b/app/styles/app/layouts/branches.sass index aeb10414..b8809ff4 100644 --- a/app/styles/app/layouts/branches.sass +++ b/app/styles/app/layouts/branches.sass @@ -52,7 +52,7 @@ @media #{$medium-up} & > div:first-of-type - width: 25% + width: 26% position: relative &:after content: "" @@ -222,7 +222,7 @@ bottom: -4px @media #{$medium-up} top: -2.3em - width: 4em + width: 4.1em padding: .1em .1em white-space: nowrap font-size: 14px; @@ -235,6 +235,10 @@ path fill: $teal-dark +.label-align + vertical-align: middle + line-height: 1.4 + // @todo refactor to status-icon module .status-icon .is-rotating diff --git a/app/styles/app/modules/tiles.sass b/app/styles/app/modules/tiles.sass index c73b6a79..47bd5af9 100644 --- a/app/styles/app/modules/tiles.sass +++ b/app/styles/app/modules/tiles.sass @@ -3,7 +3,7 @@ svg g > * fill: $color -@mixin colorTiles($color, $status) +@mixin colorTiles($color, $status, $extra-bg: $color) &.#{$status} .tile-status background-color: $color @@ -34,11 +34,11 @@ @include colorTiles($red-dark, 'failed') @include colorTiles($red-dark, 'errored') @include colorTiles($grey-medium, 'canceled') - @include colorTiles(#bfb502, 'started') - @include colorTiles(#bfb502, 'queued') - @include colorTiles(#bfb502, 'booting') - @include colorTiles(#bfb502, 'received') - @include colorTiles(#bfb502, 'created') + @include colorTiles(#bfb502, 'started', #e5da3f) + @include colorTiles(#bfb502, 'queued', #e5da3f) + @include colorTiles(#bfb502, 'booting', #e5da3f) + @include colorTiles(#bfb502, 'received', #e5da3f) + @include colorTiles(#bfb502, 'created', #e5da3f) .status-icon .is-rotating width: 17px; diff --git a/app/templates/branches.hbs b/app/templates/branches.hbs index 650a6cc4..d423b0d8 100644 --- a/app/templates/branches.hbs +++ b/app/templates/branches.hbs @@ -22,7 +22,7 @@

Inactive Branches

diff --git a/app/templates/components/branch-row.hbs b/app/templates/components/branch-row.hbs index 3ba2ffa4..2a90f88d 100644 --- a/app/templates/components/branch-row.hbs +++ b/app/templates/components/branch-row.hbs @@ -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"/> + {{#if build.last_build}} {{#if getLast5Builds.isLoading}} {{loading-indicator inline=true}} @@ -27,7 +28,7 @@ {{/if}} {{else}} 0 builds - {{/if}} + {{/if}} @@ -37,7 +38,7 @@ {{#if build.last_build}} {{#link-to "build" build.repository.slug build.last_build.id}} {{request-icon build=build}} - #{{build.last_build.number}} {{build.last_build.state}} + #{{build.last_build.number}} {{build.last_build.state}} {{/link-to}} {{else}} {{request-icon build=build}} - @@ -62,11 +63,12 @@ + {{#if build.last_build}} {{format-time build.last_build.finished_at}} {{else}} - - {{/if}} + {{/if}} @@ -100,24 +102,27 @@ + {{#if build.last_build}} {{format-sha build.last_build.commit.sha}} {{else}} - - {{/if}} + {{/if}}
{{#if build.last_build}} - avatar{{build.last_build.commit.committer.name}} + avatar + {{build.last_build.commit.committer.name}} {{else}} -
no commits yet +
no commits yet {{/if}}
+{{#unless inactive}} {{#if build.last_build}}
@@ -185,6 +190,7 @@
{{/if}} +{{/unless}}