diff --git a/app/styles/app/layouts/buildheader.sass b/app/styles/app/layouts/buildheader.sass index 580f908e..efd5530e 100644 --- a/app/styles/app/layouts/buildheader.sass +++ b/app/styles/app/layouts/buildheader.sass @@ -12,7 +12,7 @@ .repo-header header - margin: 1rem 0 2.3rem + margin: 1rem 0 3rem > * vertical-align: middle @@ -93,17 +93,6 @@ white-space: pre-wrap color: $grey2 -.repo-main-author - img - width: 22px - height: 22px - margin-right: .4em - vertical-align: top - border-radius: 50% - @media #{$medium-up} - position: absolute - bottom: 0 - .repo-main-info @include resetul padding-right: 2em @@ -116,11 +105,6 @@ &:hover text-decoration: underline - .icon - margin-right: .3em - height: 1.3em - vertical-align: middle - .repo-main-tools position: absolute top: 0 diff --git a/app/styles/app/modules/tiles.sass b/app/styles/app/modules/tiles.sass index c74021aa..de16e3fc 100644 --- a/app/styles/app/modules/tiles.sass +++ b/app/styles/app/modules/tiles.sass @@ -3,6 +3,9 @@ position: relative padding: .8rem .8rem .8rem 3rem background-color: $cream-light + p + margin: 0 + white-space: nowrap @media #{$medium-up} height: 145px @@ -10,12 +13,42 @@ .tile-main height: 100% + +.tile--small + margin-bottom: 1em + @media #{$medium-up} + height: 70px + overflow: hidden + // todo refactor .tile-main + h2, + small + margin: 0 + font-weight: 400 + font-size: 15px + color: $grey3 + line-height: 1 + small + margin-right: .3em + font-weight: 600 + @media #{$xlarge-up} @include grid-column(9) .tile-additional + position: relative + p, li + padding: .1em 0 + .icon + margin-right: .3em + height: 1.3em + vertical-align: middle + a + color: $grey1 + &:hover + color: $grey1 + text-decoration: underline @media #{$small-only} margin-top: 1em @media #{$xlarge-up} @@ -35,13 +68,35 @@ display: block width: 1.1em height: 1.2em - margin: .5em auto 1.1em + margin: .8em auto 1.1em .request-kind display: block width: 1.4em height: 1.1em margin: .5em auto 1.1em +.tile-author + img + width: 22px + height: 22px + margin-right: .4em + vertical-align: top + border-radius: 50% + @media #{$medium-up} + position: absolute + bottom: 0 -.tile-additional - position: relative + +// repo header +.tile--repo + +// build history etc +.tile--build + .tile-main + @media #{$medium-up} + border-right: solid 1px $grey1 + @media #{$xlarge-up} + @include grid-column(8) + .tile-additional + @media #{$xlarge-up} + @include grid-column(4) diff --git a/app/templates/build.hbs b/app/templates/build.hbs index dd3385d6..de5d2c8b 100644 --- a/app/templates/build.hbs +++ b/app/templates/build.hbs @@ -15,7 +15,7 @@
{{format-message build.commit.body repoBinding=build.repo pre=true}}
-
+
{{#if commit.authorName}} {{commit.authorName}} authored{{#if commit.authorIsCommitter}} and committed{{/if}} {{/if}} diff --git a/app/templates/builds.hbs b/app/templates/builds.hbs index 7978bf25..b6ddb795 100644 --- a/app/templates/builds.hbs +++ b/app/templates/builds.hbs @@ -1,72 +1,62 @@ {{#if content.isLoaded}} - - - - - - - - {{#if isPullRequestsList}} - - {{/if}} - - - - - - - {{#each build in controller itemController="buildsItem"}} - -
BuildMessage - Commit - - Committer - - PR - DurationFinished
- +{{!-- --}} + {{#each build in controller itemController="buildsItem"}} +
+
+ + +
+
+

+ {{#if isPullRequestsList}} + PR #{{build.pullRequestNumber}} + {{else}} + + insert branch + + {{/if}} + {{{format-message build.commit.message short="true" repoBinding=build.repo}}} +

+

{{build.commit.committerName}} commited

+
+
+
+

{{#if build.id}} {{#link-to "build" build.repo build}} - {{build.number}} + + {{build.number}} {{build.status}} {{/link-to}} {{/if}} - -

- - - {{#if isPullRequestsList}} - - {{/if}} - - - - {{/each}} - -
- {{{format-message build.commit.message short="true" repoBinding=build.repo}}} - +

+

+ {{format-commit build.commit}} -

- {{build.commit.committerName}} - - - #{{build.pullRequestNumber}} - - +

+ +
+

+ {{format-duration build.duration}} -

+

+

+ {{format-time build.finishedAt}} -

+

+ + + + {{/each}} {{#if displayShowMoreButton}}

{{view 'show-more-button'}} {{#if isLoading}} - + {{/if}}

{{/if}} {{else}} -
Loading
+ {{/if}}