From 1ba9548ad0ad09d8a6da28ee489eb161c3ac64c8 Mon Sep 17 00:00:00 2001 From: Lisa P Date: Tue, 24 Nov 2015 14:56:17 +0100 Subject: [PATCH] first iteration build header styles build header styles 2nd iteration make job header use component too cleanup templates and markup for repo page styles for the repo header rewrite styles for repo header, cleanup tabs --- app/components/build-header.coffee | 4 + app/components/repo-show-tabs.coffee | 5 + app/components/repo-show-tools.coffee | 4 +- app/controllers/repo.coffee | 2 + app/styles/app/_mixins/colors.sass | 4 +- app/styles/app/_mixins/mixins.sass | 15 +- app/styles/app/base.sass | 5 + app/styles/app/layouts/repo.sass | 41 +++++ app/styles/app/layouts/sidebar.sass | 7 +- app/styles/app/misc.sass | 6 +- app/styles/app/modules/build-header.sass | 106 +++++++++++- app/styles/app/modules/buttons.sass | 50 +++++- app/styles/app/modules/icons.sass | 52 +++--- app/styles/app/modules/row.sass | 18 +- app/styles/app/modules/tabs.sass | 105 ++++-------- app/templates/components/build-header.hbs | 20 ++- .../components/build-repo-actions.hbs | 8 +- app/templates/components/job-repo-actions.hbs | 8 +- app/templates/components/repo-actions.hbs | 5 +- app/templates/components/repo-show-tabs.hbs | 159 +++++++++--------- app/templates/components/repo-show-tools.hbs | 31 ++-- app/templates/job.hbs | 61 +------ app/templates/repo.hbs | 68 ++++---- public/images/line-icons/icon-cal.svg | 13 +- public/images/line-icons/icon-clock.svg | 13 +- public/images/line-icons/icon-commit.svg | 53 +++--- public/images/line-icons/icon-failed.svg | 12 +- public/images/line-icons/icon-trigger.svg | 17 +- 28 files changed, 520 insertions(+), 372 deletions(-) diff --git a/app/components/build-header.coffee b/app/components/build-header.coffee index 8f85adb8..61c4a7cb 100644 --- a/app/components/build-header.coffee +++ b/app/components/build-header.coffee @@ -16,4 +16,8 @@ BuildHeaderComponent = Ember.Component.extend gravatarImage(@get('commit.authorEmail'), 40) ).property('commit.authorEmail') + isJob: (-> + if @get('item.build') then true else false + ).property('item') + `export default BuildHeaderComponent` diff --git a/app/components/repo-show-tabs.coffee b/app/components/repo-show-tabs.coffee index aa15b348..8bbf8e46 100644 --- a/app/components/repo-show-tabs.coffee +++ b/app/components/repo-show-tabs.coffee @@ -1,6 +1,11 @@ `import Ember from 'ember'` RepoShowTabsComponent = Ember.Component.extend + + tagName: 'nav' + classNames: ['tabnav'] + ariaRole: 'tablist' + # hrm. how to parametrize bind-attr? classCurrent: (-> 'active' if @get('tab') == 'current' diff --git a/app/components/repo-show-tools.coffee b/app/components/repo-show-tools.coffee index c5101af8..0fd8f4bb 100644 --- a/app/components/repo-show-tools.coffee +++ b/app/components/repo-show-tools.coffee @@ -4,6 +4,8 @@ RepoShowToolsComponent = Ember.Component.extend popup: Ember.inject.service() + classNames: ['dropdown', 'dropdown--classic'] + click: (event) -> if $(event.target).is('a') && $(event.target).parents('.dropdown-menu').length @closeMenu() @@ -14,7 +16,7 @@ RepoShowToolsComponent = Ember.Component.extend actions: menu: -> @get('popup').close() - $('#tools .menu').toggleClass('display') + $('.menu.display').toggleClass('display') return false hasPermission: (-> diff --git a/app/controllers/repo.coffee b/app/controllers/repo.coffee index 6ae60aa3..4c4be4cd 100644 --- a/app/controllers/repo.coffee +++ b/app/controllers/repo.coffee @@ -5,6 +5,8 @@ Controller = Ember.Controller.extend needs: ['repos', 'currentUser', 'build', 'job'] currentUserBinding: 'controllers.currentUser.model' + classNames: ['repo'] + build: Ember.computed.alias('controllers.build.build') job: Ember.computed.alias('controllers.job.job') diff --git a/app/styles/app/_mixins/colors.sass b/app/styles/app/_mixins/colors.sass index ad84d218..74987765 100644 --- a/app/styles/app/_mixins/colors.sass +++ b/app/styles/app/_mixins/colors.sass @@ -5,6 +5,8 @@ $yellow: #e5da3f $red: #d94341 $grey: #666 +$grey-light: #f1f1f1 + $teal-light: $teal $teal-dark: $teal $green-dark: $green @@ -12,7 +14,7 @@ $red-dark: $red $white: #fff $color-text: $grey -$color-text-log: #F1F1F1 +$color-text-log: $grey-light $color-bg-log-hover: #444 $color-bg-log-highlight: $grey $color-bg-log-fold: #333 diff --git a/app/styles/app/_mixins/mixins.sass b/app/styles/app/_mixins/mixins.sass index 21481fdf..48374955 100644 --- a/app/styles/app/_mixins/mixins.sass +++ b/app/styles/app/_mixins/mixins.sass @@ -57,9 +57,6 @@ // @todo simplyfiy coloring mixins -@mixin colorRows($color, $status) - - @mixin colorStatusIcons($color, $status) .status-icon.#{$status} svg g > * @@ -79,9 +76,9 @@ color: $color @include colorStatusIcons($color, $status) -@mixin statusColors($color, $status, $color2: $color) +@mixin statusColors($color, $status, $width, $color2: $color) &.#{$status} - background: linear-gradient(to right, $color2 0%, $color2 9px, white 9px, white 100%) no-repeat + background: linear-gradient(to right, $color2 0%, $color2 $width, white $width, white 100%) no-repeat .row-name, .row-request a, .row-color a @@ -100,3 +97,11 @@ .build-status color: $color @include colorStatusIcons($color, $status) + +@mixin colorRows($color, $status, $width, $color2: $color) + &.#{$status} + background: linear-gradient(to right, $color2 0%, $color2 $width, white $width, white 100%) no-repeat + .#{$status}, + .#{$status} a, + color: $color + @include colorStatusIcons($color, $status) diff --git a/app/styles/app/base.sass b/app/styles/app/base.sass index eeb1c84b..c6107005 100644 --- a/app/styles/app/base.sass +++ b/app/styles/app/base.sass @@ -1,2 +1,7 @@ + +html, +body + line-height: 1.45 !important + strong font-weight: 400 diff --git a/app/styles/app/layouts/repo.sass b/app/styles/app/layouts/repo.sass index e69de29b..48e7fe2a 100644 --- a/app/styles/app/layouts/repo.sass +++ b/app/styles/app/layouts/repo.sass @@ -0,0 +1,41 @@ +.repo-title + margin: 0 + font-size: 36px + font-weight: $font-weight-normal + a + color: #808080 + &:hover, + &:active + text-decoration: underline + +.repo-header + header + @media #{$medium-up} + display: flex + flex-flow: row wrap + justify-content: flex-start + align-items: center + +.repo-gh + width: 28px + height: 28px + flex: 0 0 28px + margin: 0 1.2em + overflow: hidden + text-indent: 999% + white-space: nowrap + a + @extend %icon-github-circle + display: block + height: 100% + background: + size: 100% + repeat: no-repeat + +.repo-navigation + margin: 1.9em 0 1.2em + @media #{$medium-up} + display: flex + flex-flow: row-reverse wrap + justify-content: space-between + border-bottom: 2px $cream-dark diff --git a/app/styles/app/layouts/sidebar.sass b/app/styles/app/layouts/sidebar.sass index 1e133d45..78c069f7 100644 --- a/app/styles/app/layouts/sidebar.sass +++ b/app/styles/app/layouts/sidebar.sass @@ -47,7 +47,7 @@ $sb-font-size: 14px .active a:after, a:hover:after - bottom: -3px + bottom: -1px .icon--plus &:after @@ -58,13 +58,11 @@ $sb-font-size: 14px .icon--plus:after color: $teal-light &:after - bottom: -2px + bottom: -1px @media (min-width: #{lower-bound($large-range)}) ul height: 2em - li - padding-right: 1em @media #{$xxlarge-up} li @@ -78,7 +76,6 @@ $sb-font-size: 14px padding: 0 0 .35em margin-bottom: .8em - .sidebar-list margin-top: 1.4rem color: $grey-medium diff --git a/app/styles/app/misc.sass b/app/styles/app/misc.sass index 414a75c8..96bd2d5b 100644 --- a/app/styles/app/misc.sass +++ b/app/styles/app/misc.sass @@ -19,7 +19,6 @@ color: #c00 text-decoration: underline - .small-title font-size: 18px color: $teal-light @@ -27,3 +26,8 @@ .blank-list @include resetul + +.monospace + font-family: Monaco, monospace + font-size: 14px + line-height: 1 diff --git a/app/styles/app/modules/build-header.sass b/app/styles/app/modules/build-header.sass index d2cfa72e..fca55303 100644 --- a/app/styles/app/modules/build-header.sass +++ b/app/styles/app/modules/build-header.sass @@ -1,3 +1,107 @@ - .build-header + font-size: 16px + border: 1px solid $cream-dark clear: both + + @include colorRows($green, 'passed', 12px) + @include colorRows($red, 'failed', 12px) + @include colorRows($red, 'errored', 12px) + @include colorRows($grey, 'canceled', 12px) + @include colorRows($yellow, 'started', 12px, #e5da3f) + @include colorRows($yellow, 'queued', 12px, #e5da3f) + @include colorRows($yellow, 'booting', 12px, #e5da3f) + @include colorRows($yellow, 'received', 12px, #e5da3f) + @include colorRows($yellow, 'created', 12px, #e5da3f) + + @media #{$medium-up} + display: flex + flex-flow: row no-wrap + justify-content: space-between + +.build-commit, +.build-tools + padding-left: 2rem + +.build-commit + @media #{$medium-up} + flex: 1 1 65% + padding-left: 2.5rem + +.build-tools + padding: 1rem 0 1rem 3rem + overflow: auto + @media #{$medium-up} + flex: 0 0 40px + padding: 1rem 0 0 + +.build-info + padding-left: 3rem + @media #{$medium-up} + flex: 1 1 35% + +.build-title, +.build-status + margin: 1rem 0 + padding-left: 1rem + font-weight: $font-weight-normal + font-size: 16px + + .status-icon + width: 1.7rem + height: 1.8rem + vertical-align: middle + +.build-title + .status-icon + margin-left: -2rem + +.commit-info + padding-left: 1rem + +.commit-branch + margin-right: .5em + font-weight: $font-weight-bold + font-size: 16px + +.build-status + padding-left: 0 + +.commit-author + margin: 1rem 0 .7rem + img + width: 20px + height: 20px + margin-right: .3em + border-radius: 50% + +.commit-description + margin: 1rem 0 + +.list-icon + padding: 0 + margin: 1rem 0 + list-style: none + + .commit-commit, + .commit-compare + @extend %icon-line-commit + padding-left: 1.5em + background: + size: auto 23px + repeat: no-repeat + position: -11px -1px + .commit-clock + @extend %icon-line-clock + padding-left: 1.5em + background: + size: auto 22px + repeat: no-repeat + position: 0 0 + .commit-calendar + @extend %icon-line-calendar + padding-left: 1.5em + background: + size: auto 20px + repeat: no-repeat + position: 1px 1px + diff --git a/app/styles/app/modules/buttons.sass b/app/styles/app/modules/buttons.sass index 72d14d9b..00261145 100644 --- a/app/styles/app/modules/buttons.sass +++ b/app/styles/app/modules/buttons.sass @@ -122,11 +122,6 @@ $button-border-color: #d4d4d4 &:focus background-color: #696867 -.button-circle - width: 28px - height: 28px - border-radius: 50% - .button--showmore height: auto padding: 0.3em 0.7em @@ -148,3 +143,48 @@ $button-border-color: #d4d4d4 &:focus, &:hover background-color: lighten(#CD3A36, 10) + + + +// new stuff + + +%circle-button + display: block + text-indent: 999% + overflow: hidden + width: 28px + height: 28px + border: solid 1px #E4E6E6 + border-radius: 50% + &:hover + background-color: $teal + + float: left + margin-right: 1rem + @media #{$medium-up} + float: none + margin-right: 0 + margin-bottom: .5em + +.button-circle-codeclimate + @extend %circle-button + background: + image: inline-image('icons/code-climate-icon.svg') + repeat: no-repeat + size: auto 100% + +.button-circle-cancel + @extend %circle-button + @extend %icon-line-cross + background: + repeat: no-repeat + size: auto 100% + +.button-circle-trigger + @extend %circle-button + @extend %icon-line-trigger + background: + position: 2px 1px + repeat: no-repeat + size: 24px 24px diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass index 434b2e6b..dddf90de 100644 --- a/app/styles/app/modules/icons.sass +++ b/app/styles/app/modules/icons.sass @@ -9,6 +9,7 @@ height: 1em @extend %icon + .icon-cal, .icon--cal, .icon-calendar @@ -26,9 +27,6 @@ .icon--github background-image: inline-image('svg/commit-icon.svg') -.icon--github-circle - background-image: inline-image('icons/github.svg') - .icon-hash, .icon--hash background-image: inline-image('svg/build-number-icon.svg') @@ -87,29 +85,6 @@ background-image: inline-image('icons/remove-log-icon.svg') .icon--down background-image: inline-image('icons/end-of-log-icon.svg') -.icon--codeclimate - background-image: inline-image('icons/code-climate-icon.svg') - - -.icon-status.errored - background-image: inline-image('dashboard/status-errored.svg') - -.icon-status.failed - background-image: inline-image('dashboard/status-failed.svg') - -.icon-status.canceled - background-image: inline-image('dashboard/status-cancelled.svg') - -.icon-status.passed - background-image: inline-image('dashboard/status-passed.svg') - -.icon-status.started, -.icon-status.queued, -.icon-status.booting, -.icon-status.received, -.icon-status.created, - background-image: inline-image('dashboard/status-pending.svg') - .icon--env background-image: inline-image('svg/icon-environment-dark2.svg') @@ -182,15 +157,36 @@ background-image: inline-image('svg/fingerprint.svg') +%icon-line-calendar + background-image: inline-image('line-icons/icon-cal.svg') .icon-line-cal @extend %icon - background-image: inline-image('line-icons/icon-cal.svg') + @extend %icon-line-calendar + +%icon-line-clock + background-image: inline-image('line-icons/icon-clock.svg') +.icon-line-clock + @extend %icon + @extend %icon-line-clock + .icon-line-build @extend %icon background-image: inline-image('line-icons/icon-build.svg') + +%icon-line-commit + background-image: inline-image('line-icons/icon-commit.svg') .icon-line-commit @extend %icon - background-image: inline-image('line-icons/icon-commit.svg') + @extend %icon-line-commit + +%icon-line-cross + background-image: inline-image('line-icons/icon-failed.svg') + +%icon-line-trigger + background-image: inline-image('line-icons/icon-trigger.svg') + +%icon-github-circle + background-image: inline-image('icons/github.svg') .icon--plus &:after diff --git a/app/styles/app/modules/row.sass b/app/styles/app/modules/row.sass index 06fd5619..7a5d5392 100644 --- a/app/styles/app/modules/row.sass +++ b/app/styles/app/modules/row.sass @@ -76,12 +76,12 @@ display: inline-block vertical-align: middle - @include statusColors($green-dark, 'passed') - @include statusColors($red-dark, 'failed') - @include statusColors($red-dark, 'errored') - @include statusColors($grey-medium, 'canceled') - @include statusColors(#bfb502, 'started', #e5da3f) - @include statusColors(#bfb502, 'queued', #e5da3f) - @include statusColors(#bfb502, 'booting', #e5da3f) - @include statusColors(#bfb502, 'received', #e5da3f) - @include statusColors(#bfb502, 'created', #e5da3f) + @include statusColors($green, 'passed', 10px) + @include statusColors($red, 'failed', 10px) + @include statusColors($red, 'errored', 10px) + @include statusColors($grey, 'canceled', 10px) + @include statusColors($yellow, 'started', 10px, #e5da3f) + @include statusColors($yellow, 'queued', 10px, #e5da3f) + @include statusColors($yellow, 'booting', 10px, #e5da3f) + @include statusColors($yellow, 'received', 10px, #e5da3f) + @include statusColors($yellow, 'created', 10px, #e5da3f) diff --git a/app/styles/app/modules/tabs.sass b/app/styles/app/modules/tabs.sass index 1423673c..b2350cd1 100644 --- a/app/styles/app/modules/tabs.sass +++ b/app/styles/app/modules/tabs.sass @@ -4,59 +4,43 @@ font-size: $font-size-sm ul @include resetul + margin-top: 2em + display: flex + flex-flow: row wrap + justify-content: space-between width: 100% - clear: both - @media #{$small-only} - margin-top: 2em + @media #{$medium-up} + margin-top: 0 + display: block li - @media #{$small-only} - margin-bottom: .8em + flex: 0 0 8em + text-align: center + margin: .5em 0 + @media #{$medium-up} + display: inline-block + text-align: left + margin: 0 1.5em 0 0 + a @extend %inline-block width: 100% color: $grey-light - padding: .2em 0 + padding: 3px 0 4px .active a, a:hover position: relative - color: $teal-dark + color: $teal &:after content: "" position: absolute left: 0 - bottom: -0.25em + bottom: -3px width: 100% height: 2px - background-color: $teal-dark + background-color: $teal .active a - font-weight: 600 - - @media #{$medium-up} - ul - display: block - li - float: left - padding-right: 2em - -// todo: switch to icon -#tab_build - position: relative - padding-left: 1em - &:before - content: "" - display: block - position: absolute - color: $grey-lighter - top: 0.4em - left: -0.7em - width: .7em - height: 1.3em - background: - size: 100% - repeat: no-repeat - @extend .icon-tab-arrow - + font-weight: $font-weight-bold .tabbody position: relative @@ -76,35 +60,6 @@ float: left margin-right: 1em - -#main - .tabs - border-bottom: 3px solid #f5f5f6 - li - height: 29px - background-color: #f5f5f6 - margin-right: 0 - overflow: hidden - &:hover - background-color: #e1e8eb - a - text-decoration: none - - .active - display: block - background-color: $tab-active-bg - border-bottom-color: $tab-active-bg - &:hover - background-color: $tab-active-bg - a - color: #6c878e - @media #{$medium-up} - display: inline-block - - #builds - a - display: inline - .tabs--main #tab_build, #tab_job, @@ -116,7 +71,19 @@ &.active display: inline-block -#profile - #main - .tab - margin: 30px 0 0 12px +#tab_build + position: relative + @media #{$medium-up} + left: .5em + + .tab-arrow + display: inline-block + position: absolute + top: 5px + left: -19px + width: .7em + height: 1.3em + background: + size: 100% + repeat: no-repeat + @extend .icon-tab-arrow diff --git a/app/templates/components/build-header.hbs b/app/templates/components/build-header.hbs index 05133880..12db6e64 100644 --- a/app/templates/components/build-header.hbs +++ b/app/templates/components/build-header.hbs @@ -34,11 +34,11 @@

{{#if commit.authorName}} - {{commit.authorName}} authored{{#if commit.authorIsCommitter}} and committed{{/if}} + {{commit.authorName}} authored{{#if commit.authorIsCommitter}} and committed{{/if}} {{/if}} {{#unless commit.authorIsCommitter}} {{#if commit.committerName}} - {{commit.committerName}} committed + {{commit.committerName}} committed {{/if}} {{/unless}}

@@ -47,8 +47,13 @@

- {{#link-to "build" repo item}} - {{status-icon status=item.state}} #{{item.number}} {{humanize-state item.state}}{{/link-to}} + {{#if isJob}} + {{#link-to "job" repo item}} + {{status-icon status=item.state}} #{{item.number}} {{humanize-state item.state}}{{/link-to}} + {{else}} + {{#link-to "build" repo item}} + {{status-icon status=item.state}} #{{item.number}} {{humanize-state item.state}}{{/link-to}} + {{/if}}

-
- {{repo-actions build=item repo=item.repo user=user}} + {{#if isJob}} + {{repo-actions job=item repo=item.repo user=auth.currentUser}} + {{else}} + {{repo-actions build=item repo=item.repo user=user}} + {{/if}}
diff --git a/app/templates/components/build-repo-actions.hbs b/app/templates/components/build-repo-actions.hbs index d1534e80..ab51a2ff 100644 --- a/app/templates/components/build-repo-actions.hbs +++ b/app/templates/components/build-repo-actions.hbs @@ -2,8 +2,8 @@ {{#if cancelling}} {{loading-indicator height=true}} {{else}} - - + + Cancel build {{/if}} {{/if}} @@ -12,8 +12,8 @@ {{#if restarting}} {{loading-indicator height=true}} {{else}} - - + + Trigger build {{/if}} {{/if}} diff --git a/app/templates/components/job-repo-actions.hbs b/app/templates/components/job-repo-actions.hbs index 62548e53..dd9830f7 100644 --- a/app/templates/components/job-repo-actions.hbs +++ b/app/templates/components/job-repo-actions.hbs @@ -2,8 +2,8 @@ {{#if cancelling}} {{loading-indicator height=true}} {{else}} - - + + Cancel Job {{/if}} {{/if}} @@ -12,8 +12,8 @@ {{#if restarting}} {{loading-indicator height=true}} {{else}} - - + + Restart Job {{/if}} {{/if}} diff --git a/app/templates/components/repo-actions.hbs b/app/templates/components/repo-actions.hbs index 3ba1fddd..c0df0fad 100644 --- a/app/templates/components/repo-actions.hbs +++ b/app/templates/components/repo-actions.hbs @@ -10,9 +10,8 @@ {{#if displayCodeClimate}} - + {{action "codeClimatePopup"}} class="button-circle-codeclimate open-popup" + title="Test Coverage with Code Climate">Code Climate {{/if}} diff --git a/app/templates/components/repo-show-tabs.hbs b/app/templates/components/repo-show-tabs.hbs index 670869db..8070abee 100644 --- a/app/templates/components/repo-show-tabs.hbs +++ b/app/templates/components/repo-show-tabs.hbs @@ -1,83 +1,82 @@ -
-
+ {{/if}} + +
  • + {{#if request.id}} + {{#if repo.slug}} + {{#link-to "request" repo request}} + Request #{{request.id}} + {{/link-to}} + {{/if}} + {{/if}} +
    • + diff --git a/app/templates/components/repo-show-tools.hbs b/app/templates/components/repo-show-tools.hbs index 5300edd9..dc12461c 100644 --- a/app/templates/components/repo-show-tools.hbs +++ b/app/templates/components/repo-show-tools.hbs @@ -1,18 +1,17 @@ -
    - Settings -
    + {{/if}} +
  • + {{#link-to "requests" repo}}Requests{{/link-to}} +
    • + {{#if displayCachesLink}} +
  • + {{#link-to "caches" repo}}Caches{{/link-to}} +
    • + {{/if}} + diff --git a/app/templates/job.hbs b/app/templates/job.hbs index 62d4c79f..84af3edc 100644 --- a/app/templates/job.hbs +++ b/app/templates/job.hbs @@ -1,65 +1,6 @@ {{#if job.isLoaded}} -
    -
    - - -
    - -
    -

    - {{job.commit.branch}} - {{format-message job.commit.subject repoBinding=job.repo}} -

    -
    - 
    {{format-message job.commit.body repoBinding=job.repo pre=true}}
    -
    -
    - {{#if job.commit.authorName}} - {{job.commit.authorName}} authored{{#if job.commit.authorIsCommitter}} and committed{{/if}} - {{/if}} - {{#unless job.commit.authorIsCommitter}} - {{#if job.commit.committerName}} - {{job.commit.committerName}} committed - {{/if}} - {{/unless}} -
    -
    - -
    - - - {{repo-actions job=job repo=job.repo user=auth.currentUser}} - -
    -
    + {{build-header item=job user=auth.currentUser commit=job.commit}} {{view 'annotations' annotations=view.annotations}} diff --git a/app/templates/repo.hbs b/app/templates/repo.hbs index 6aacd734..dd441bb0 100644 --- a/app/templates/repo.hbs +++ b/app/templates/repo.hbs @@ -1,44 +1,42 @@ -
    - {{#if view.isEmpty}} - {{repos-empty}} - {{else}} +{{#if view.isEmpty}} + {{repos-empty}} +{{else}} - {{#if repo.isLoaded}} -
    -
    -

    {{#link-to "owner" repo.owner}}{{repo.owner}}{{/link-to}} / {{#link-to "repo" repo}}{{repo.name}}{{/link-to}}

    -
    - - - - -
    -

    {{description}}

    -
    -
    -
    - {{repo-show-tools repo=repo build=build job=job tab=tab currentUser=auth.currentUser}} + {{#if repo.isLoaded}} +
    +
    +

    {{#link-to "owner" repo.owner}}{{repo.owner}}{{/link-to}} / {{#link-to "repo" repo}}{{repo.name}}{{/link-to}}

    +
    + {{repo.name}} on Github +
    +
    + + Build Status Images + +
    +
    +
    +
    + {{repo-show-tools repo=repo build=build job=job tab=tab currentUser=auth.currentUser}} - {{repo-show-tabs repo=repo tab=tab build=build job=job}} -
    -
    - {{#if repo.active}} + {{repo-show-tabs repo=repo tab=tab build=build job=job}} +
    +
    + {{#if repo.active}} + {{outlet}} + {{else}} + {{#if repo.lastBuildId}} {{outlet}} {{else}} - {{#if repo.lastBuildId}} - {{outlet}} - {{else}} - {{not-active user=currentUser repo=repo}} - {{/if}} + {{not-active user=currentUser repo=repo}} {{/if}} -
    + {{/if}}
    -
    - - {{else}} - {{loading-indicator}} - {{/if}} + + + {{else}} + {{loading-indicator}} {{/if}} -
    +{{/if}} diff --git a/public/images/line-icons/icon-cal.svg b/public/images/line-icons/icon-cal.svg index 7b6846b1..96d40ad6 100644 --- a/public/images/line-icons/icon-cal.svg +++ b/public/images/line-icons/icon-cal.svg @@ -1,14 +1,23 @@ - - + + + + + + + + + + diff --git a/public/images/line-icons/icon-clock.svg b/public/images/line-icons/icon-clock.svg index 132af39a..b2834604 100644 --- a/public/images/line-icons/icon-clock.svg +++ b/public/images/line-icons/icon-clock.svg @@ -1,9 +1,18 @@ - + + + + - + + + diff --git a/public/images/line-icons/icon-commit.svg b/public/images/line-icons/icon-commit.svg index 0e73d9cf..946930c9 100644 --- a/public/images/line-icons/icon-commit.svg +++ b/public/images/line-icons/icon-commit.svg @@ -1,24 +1,31 @@ - - - - + + + + + + + diff --git a/public/images/line-icons/icon-failed.svg b/public/images/line-icons/icon-failed.svg index c524eaaa..4ace72b8 100644 --- a/public/images/line-icons/icon-failed.svg +++ b/public/images/line-icons/icon-failed.svg @@ -1,8 +1,10 @@ + + - - - + + + diff --git a/public/images/line-icons/icon-trigger.svg b/public/images/line-icons/icon-trigger.svg index 92930768..804aab41 100644 --- a/public/images/line-icons/icon-trigger.svg +++ b/public/images/line-icons/icon-trigger.svg @@ -1,8 +1,11 @@ - - - - + + + + + +