diff --git a/app/styles/app/_mixins/vars.sass b/app/styles/app/_mixins/vars.sass index 99512456..e32c847c 100644 --- a/app/styles/app/_mixins/vars.sass +++ b/app/styles/app/_mixins/vars.sass @@ -4,7 +4,7 @@ $font-size-sm: 14px $line-height-m: 1.3 // colors -$teal1: #5FA5A4 +$teal1: #5BA5A4 $teal2: #63A4A3 $blue-grey: #404650 @@ -68,7 +68,7 @@ $log-header-bg: #444444 // new build header $font-size-xxl: 30px -$grey1: #A5ACAD +$grey1: #A6ADAD $grey2: #969496 $grey3: #808080 $grey4: #e6e8e8 diff --git a/app/styles/app/layouts/buildheader.sass b/app/styles/app/layouts/buildheader.sass index aa938ce6..30429e59 100644 --- a/app/styles/app/layouts/buildheader.sass +++ b/app/styles/app/layouts/buildheader.sass @@ -123,3 +123,7 @@ height: 1.05em .icon--codeclimate width: 1.2em + +.build-title + color: $grey1 + font-size: $font-size-sm diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass index f4f4f981..10033084 100644 --- a/app/styles/app/modules/icons.sass +++ b/app/styles/app/modules/icons.sass @@ -85,9 +85,11 @@ .icon--env background-image: inline-image('svg/icon-environment.svg') -.icon--cross-red +.icon--cross-red, +.icon--job.failed background-image: inline-image('svg/icon-job-failed.svg') -.icon--check-green +.icon--check-green, +.icon--job.passed background-image: inline-image('svg/icon-job-passed.svg') .icon--lang background-image: inline-image('svg/icon-language.svg') diff --git a/app/styles/app/modules/tiles.sass b/app/styles/app/modules/tiles.sass index fd0f93c3..aef4c2bc 100644 --- a/app/styles/app/modules/tiles.sass +++ b/app/styles/app/modules/tiles.sass @@ -14,6 +14,11 @@ p margin: 0 white-space: nowrap + .icon + vertical-align: middle + .icon--lang + width: 1.2em + height: 0.9em &.started, &.created @@ -137,3 +142,25 @@ .tile-additional @media #{$xlarge-up} @include grid-column(4) + +// job matrix +.tile--jobs + margin-bottom: 0.8em + .tile-main + .icon + margin-right: .3em + p + padding: .1em 0 + @media #{$medium-up} + white-space: nowrap + overflow: hidden + border-right: solid 1px $grey4 + &:after + @include fadeOut(right, -90deg, $cream-light) + @media #{$xlarge-up} + @include grid-column(5) + .tile-additional + p + padding: 1em 0 + @media #{$xlarge-up} + @include grid-column(7) diff --git a/app/templates/jobs.hbs b/app/templates/jobs.hbs index adc08d93..ad771c39 100644 --- a/app/templates/jobs.hbs +++ b/app/templates/jobs.hbs @@ -1,47 +1,53 @@ {{#if view.jobs.length}} -
{{key}} | - {{/each}} -
-
- {{#if job.id}}
- {{#if job.repo.slug}}
- {{#link-to "job" repo job}}{{number}}{{/link-to}}
+
+ {{#each job in view.jobs}}
+ {{#view 'jobs-item' context=job}}
+
+
+
+
+
+
+
+
+ insert env +insert language +
+ + + {{#if job.id}} + {{#if job.repo.slug}} + {{#link-to "job" repo job}}{{number}}{{/link-to}} + {{/if}} {{/if}} - {{/if}} - |
- - {{format-duration duration}} - | -- {{format-time finishedAt}} - | - {{#each value in configValues}} -{{value}} | - {{/each}} - {{/view}} - {{/each}} - -
---|
+ + {{format-duration duration}} +
++ + {{format-time finishedAt}} +
+{{configValues.[2]}}
+ + + + {{/view}} + {{job.configKeys}} + {{/each}} + {{#unless view.required}}