diff --git a/app/styles/app/layouts/buildheader.sass b/app/styles/app/layouts/buildheader.sass index 1abad603..c7fbaa0d 100644 --- a/app/styles/app/layouts/buildheader.sass +++ b/app/styles/app/layouts/buildheader.sass @@ -2,8 +2,8 @@ .repo font-size: $font-size-normal color: $grey - a - color: $grey + // a + // color: $grey .repo-header header @@ -44,7 +44,6 @@ @extend %inline-block .repo-menus - @media #{$medium-up} .dropdown float: right @@ -79,6 +78,8 @@ line-height: 1.8 .icon margin-right: .3em + height: 1.3em + vertical-align: middle .repo-main-tools position: absolute diff --git a/app/styles/app/modules/dropdown.sass b/app/styles/app/modules/dropdown.sass index 145bc599..e9765b25 100644 --- a/app/styles/app/modules/dropdown.sass +++ b/app/styles/app/modules/dropdown.sass @@ -90,15 +90,15 @@ $dropdown-border: #C3D9DB position: relative .dropdown--classic width: 10.7rem - overflow: auto .dropdown-button + height: 30px background-color: $grey border: none color: $white font-size: $font-size-normal &:hover - background-color: darken($grey, 10) + background-color: lighten($grey, 10) .icon-arrow-down border-top-color: $white @@ -109,10 +109,12 @@ $dropdown-border: #C3D9DB @include resetul @include border-bottom-radius(4px) position: absolute - top: 29px // height of the button + top: 31px // height of the button +1 width: 100% + z-index: 70 overflow: hidden background-color: $grey + display: none a @extend %inline-block width: 100% @@ -120,5 +122,5 @@ $dropdown-border: #C3D9DB color: $white &:hover background-color: darken($grey, 10) - - display: none + &.display + display: block diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass index f41ae728..33ddac39 100644 --- a/app/styles/app/modules/icons.sass +++ b/app/styles/app/modules/icons.sass @@ -8,15 +8,15 @@ .icon-cal, .icon--cal - background-image: inline-image('dashboard/cal.svg') + background-image: inline-image('svg/finished-icon.svg') .icon-clock, .icon--clock - background-image: inline-image('ui/clock.svg') + background-image: inline-image('svg/duration-icon.svg') .icon-github, .icon--github - background-image: inline-image('dashboard/github.svg') + background-image: inline-image('svg/commit-icon.svg') .icon--github-circle background-image: inline-image('icons/github.svg') @@ -27,7 +27,7 @@ .icon-hash, .icon--hash - background-image: inline-image('dashboard/hash.svg') + background-image: inline-image('svg/build-number-icon.svg') .icon-cog, .icon--cog diff --git a/app/styles/app/modules/tabs.sass b/app/styles/app/modules/tabs.sass index 56fc22f1..375b61b4 100644 --- a/app/styles/app/modules/tabs.sass +++ b/app/styles/app/modules/tabs.sass @@ -38,7 +38,7 @@ &:after content: "" position: relative - left: 1.35em + left: 1.3em display: inline-block width: 2px height: 10px diff --git a/app/styles/app/tabs.sass b/app/styles/app/tabs.sass index 94a1c02c..4b639352 100644 --- a/app/styles/app/tabs.sass +++ b/app/styles/app/tabs.sass @@ -96,25 +96,25 @@ @media #{$medium-up} display: inline-block - .tab - margin-top: 15px - ul.navigation - @include resetul - border-bottom: 1px solid #EAEAEA - li - margin-right: 10px - a - color: #ACACAC - font-weight: 600 - font-size: 14px - a.active - color: #55888E - @media #{$small-up} - li - display: inline-block - @media #{$medium-up} - height: 40px - line-height: 40px + // .tab + // margin-top: 15px + // ul.navigation + // @include resetul + // border-bottom: 1px solid #EAEAEA + // li + // margin-right: 10px + // a + // color: #ACACAC + // font-weight: 600 + // font-size: 14px + // a.active + // color: #55888E + // @media #{$small-up} + // li + // display: inline-block + // @media #{$medium-up} + // height: 40px + // line-height: 40px #builds a @@ -146,12 +146,12 @@ @media handheld, only screen and (max-device-width: 980px) #main - .tabs - margin-top: 5px - li - margin-right: 0px - h5 - min-width: 0px + // .tabs + // margin-top: 5px + // li + // margin-right: 0px + // h5 + // min-width: 0px #tab_branches display: none diff --git a/app/templates/build.hbs b/app/templates/build.hbs index ddb6e2b9..1a06b68d 100644 --- a/app/templates/build.hbs +++ b/app/templates/build.hbs @@ -1,67 +1,69 @@ {{#if loading}} - Loading + {{else}} -
-
+
+
+ +
-
-
- {{#link-to "build" repo build}}#{{build.number}} {{humanize-state build.state}}{{/link-to}} -
-
- {{#if build.isFinished}}ran{{else}}running{{/if}} for {{format-duration build.duration}} +
+

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

+
+ 
{{format-message build.commit.body repoBinding=build.repo pre=true}}
- -
- {{format-time build.finishedAt}} +
+ {{#if commit.authorName}} + {{commit.authorName}} authored{{#if commit.authorIsCommitter}} and committed{{/if}} + {{/if}} + {{#unless commit.authorIsCommitter}} + {{#if commit.committerName}} + {{commit.committerName}} committed + {{/if}} + {{/unless}}
+
- {{#if build.tagName}} -
- {{build.tagName}} -
- {{/if}} +
+ + + {{view 'repo-actions'}} +
- -
-
- {{build.commit.branch}} -
- -
- - {{format-message build.commit.subject repoBinding=build.repo}} -
-
- - 
{{format-message build.commit.body repoBinding=build.repo pre=true}}
- -
-
- {{#if commit.authorName}} -
{{commit.authorName}} authored{{#if commit.authorIsCommitter}} and committed{{/if}}
- {{/if}} - {{#unless commit.authorIsCommitter}} - {{#if commit.committerName}} -
{{commit.committerName}} committed
- {{/if}} - {{/unless}} -
-
-
+
{{#unless build.isMatrix}} {{view 'annotations' annotations=build.jobs.firstObject.annotations}} @@ -73,4 +75,5 @@ {{else}} {{view 'log' job=build.jobs.firstObject}} {{/if}} + {{/if}} diff --git a/app/templates/repo.hbs b/app/templates/repo.hbs index 6fd1b535..9f4205d5 100644 --- a/app/templates/repo.hbs +++ b/app/templates/repo.hbs @@ -1,9 +1,10 @@
+ {{#if view.isEmpty}} {{view 'repos-empty'}} {{else}} - {{#if repo.isLoaded}} + {{#if repo.isLoaded}}

{{#link-to "repo" repo}}{{repo.slug}}{{/link-to}}

@@ -22,61 +23,14 @@ {{view 'repo-show-tabs'}}
-
-
- - -
- -
-

master Merge pull request #398 from craigcitro/quieter-mac

-
- Something someting something -
-
- Hiro Asari authored and commited -
-
- -
-
    -
  • 234 passed
    • -
  • Commit 324eabf2
    • -
  • Compare 22323...233
    • -
  • ran for 16 sec
    • -
  • 12 minutes ago
    • -
- - {{view 'repo-actions'}} - -
-
+ {{outlet}}
- - {{!--
-

{{#link-to "repo" repo}}{{repo.slug}}{{/link-to}}

-
-
- - - -
- {{view 'repo-show-tools'}} -
- -

{{description}}

- - {{view 'repo-actions'}} - {{view 'repo-show-tabs'}} - -
- {{outlet}} -
--}} {{else}} {{/if}} + {{/if}}
diff --git a/app/templates/repos/show/actions.hbs b/app/templates/repos/show/actions.hbs index 13a783cb..f04ec7a2 100644 --- a/app/templates/repos/show/actions.hbs +++ b/app/templates/repos/show/actions.hbs @@ -1,84 +1,44 @@
- - {{#if view.displayCancelBuild}} - {{/if}} {{#if view.displayCancelJob}} - {{/if}} {{#if view.displayRequeueBuild}} {{#if view.requeueing}} - + {{else}} - + + + {{/if}} {{/if}} {{#if view.displayRequeueJob}} {{#if view.requeueing}} - + {{else}} - + + + {{/if}} {{/if}} {{#if view.displayCodeClimate}} + {{action "codeClimatePopup" target=view}} class="button-circle" + {{bind-attr class=":open-popup"}} title="Test Coverage with Code Climate"> + + {{/if}} +
-{{!--
- -
--}} - diff --git a/app/templates/repos/show/tools.hbs b/app/templates/repos/show/tools.hbs index 513ac64c..6d8eff6d 100644 --- a/app/templates/repos/show/tools.hbs +++ b/app/templates/repos/show/tools.hbs @@ -1,15 +1,6 @@ -
- - -
- -{{!--
- Settings - -