diff --git a/app/components/requests-item.coffee b/app/components/requests-item.coffee index a80b0d74..39187c7f 100644 --- a/app/components/requests-item.coffee +++ b/app/components/requests-item.coffee @@ -2,7 +2,7 @@ `import config from 'travis/config/environment'` RequestsItemComponent = Ember.Component.extend - classNames: ['tile', 'tile--jobs', 'row'] + classNames: ['request-item'] classNameBindings: ['requestClass'] tagName: 'li' diff --git a/app/components/status-icon.coffee b/app/components/status-icon.coffee index 5ba1a048..0a28162b 100644 --- a/app/components/status-icon.coffee +++ b/app/components/status-icon.coffee @@ -7,11 +7,11 @@ StatusIconComponent = Ember.Component.extend classNameBindings: ['status'] hasPassed: (-> - @get('status') == 'passed' + @get('status') == 'passed' || @get('status') == 'accepted' ).property('status') hasFailed: (-> - @get('status') == 'failed' + @get('status') == 'failed' || @get('status') == 'rejected' ).property('status') hasErrored: (-> diff --git a/app/styles/app/layouts/pull-requests.sass b/app/styles/app/layouts/pull-requests.sass index 7e168c43..c56b92a4 100644 --- a/app/styles/app/layouts/pull-requests.sass +++ b/app/styles/app/layouts/pull-requests.sass @@ -18,6 +18,7 @@ .row-committer padding-left: 1.6em + margin-bottom: 0 .row-message margin-bottom: .5em diff --git a/app/styles/app/layouts/repo.sass b/app/styles/app/layouts/repo.sass index 7a1f26f1..66cfccfb 100644 --- a/app/styles/app/layouts/repo.sass +++ b/app/styles/app/layouts/repo.sass @@ -4,9 +4,11 @@ font-weight: $font-weight-normal a color: #808080 + border-bottom: 2px solid transparent + transition: border-color 100ms ease &:hover, &:active - text-decoration: underline + border-color: #808080 .repo-header header @@ -48,7 +50,6 @@ $dropdown-button-margin: -9px display: block height: $dropdown-button-height padding: 0 0.7em 0 2.3em - margin-top: $dropdown-button-margin background: color: white repeat: no-repeat @@ -79,6 +80,8 @@ $dropdown-button-margin: -9px @extend %icon-line-cog-teal &:after @extend %icon-line-dropdown-teal + @media #{$medium-up} + margin-top: $dropdown-button-margin .settings-dropdown display: none @@ -86,7 +89,7 @@ $dropdown-button-margin: -9px top: $dropdown-button-height + ($dropdown-button-margin * .8) width: 100% padding: 0 - margin: -1px 0 0 + margin: 6px 0 0 list-style: none z-index: 60 background-color: white @@ -99,6 +102,8 @@ $dropdown-button-margin: -9px &:hover color: white background-color: $teal + @media #{$medium-up} + margin-top: -3px .settings-menu position: relative diff --git a/app/styles/app/layouts/requests.sass b/app/styles/app/layouts/requests.sass index ac331376..30b58eff 100644 --- a/app/styles/app/layouts/requests.sass +++ b/app/styles/app/layouts/requests.sass @@ -1,58 +1,62 @@ -@mixin colorRequests($color-bg) - &:hover - background-color: $color-bg - .requests-commit, - .requests-branch, - .requests-message, - .requests-time - &:after - @include fadeOut(right, -90deg, $color-bg, 30%) - +=requestFadeOut($status, $color) + @media #{$medium-up} + &.#{$status}:hover + .fade-out + &:after + @include fadeOut(right, -90deg, $color) .requests - @include resetul + padding: 0 + margin: 0 + list-style: none - .accepted:hover - @include colorRequests(#e5efe4) - .rejected:hover - @include colorRequests(#fbebe6) +.request-item + border: 1px solid $cream-dark + margin-bottom: 5px + font-size: 15px + padding-left: 1em + @include colorJobs($green, 'accepted', 6px, rgba($green, .1)) + @include colorJobs($red, 'rejected', 6px, rgba($red, .1)) - margin-top: 2.5rem - color: #969496 - a:hover + @include requestFadeOut('accepted',#ECF6EF) + @include requestFadeOut('rejected', #FBECEB) + + strong + font-weight: $font-weight-bold + margin-right: .5em + + .status-icon + width: 1.3em + height: 1.3em + vertical-align: middle + + a:hover, + a:active text-decoration: underline - - .requests-commit, - .requests-branch, - .requests-message, - .requests-time - position: relative - &:after - content: "" - @include fadeOut(right, -90deg, $cream-light, 30%) - - .requests-time - @media #{$medium-up} - padding-left: 2em - border-left: 1px solid $cream-dark - - .tile--jobs - padding-left: 2.5em - - .icon.push - width: 1.2em - height: .8em - .icon.pull_request - height: 1.5em @media #{$medium-up} - .requests-time - width: grid-calc(4, 24) - .requests-branch - width: grid-calc(4, 24) - .requests-commit - width: grid-calc(9, 24) - .requests-build - width: grid-calc(2, 24) - .requests-message - width: grid-calc(5, 24) + display: flex + justify-content: space-between + flex-flow: row wrap + align-items: center + padding: .3em 0 + white-space: nowrap + .row-item + overflow: hidden + + .row-item:first-of-type + flex: 0 0 3em + padding-left: .7em + border-right: 1px solid $cream-dark + .row-item:nth-of-type(2) + flex: 1 0 15% + padding-left: 1em + .row-item:nth-of-type(3) + flex: 0 0 15% + .row-item:nth-of-type(4) + flex: 1 0 30% + .row-item:nth-of-type(5) + flex: 0 0 8% + .row-item:last-of-type + flex: 0 0 20% + diff --git a/app/styles/app/misc.sass b/app/styles/app/misc.sass index 96bd2d5b..c5a3dc47 100644 --- a/app/styles/app/misc.sass +++ b/app/styles/app/misc.sass @@ -29,5 +29,5 @@ .monospace font-family: Monaco, monospace - font-size: 14px + font-size: 13px line-height: 1 diff --git a/app/styles/app/modules/buttons.sass b/app/styles/app/modules/buttons.sass index e85a0967..ce748adf 100644 --- a/app/styles/app/modules/buttons.sass +++ b/app/styles/app/modules/buttons.sass @@ -176,7 +176,7 @@ $button-border-color: #d4d4d4 %log-button display: inline-block height: 28px - padding: 0 1.1em 0 2.3em + padding: 0 0.8em 0 2.3em border: 1px solid #f1f1f1 color: #f1f1f1 border-radius: 2px diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass index 001d6d54..8289e8d1 100644 --- a/app/styles/app/modules/icons.sass +++ b/app/styles/app/modules/icons.sass @@ -158,13 +158,13 @@ background-image: url('data:image/svg+xml;utf8,') .icon-github display: inline-block - width: 1em + width: 1.1em height: 1.1em margin-right: 0.3em vertical-align: middle background: repeat: no-repeat - size: auto 23px + size: auto 21px position: -9px -3px @extend %icon-github diff --git a/app/templates/components/dashboard-row.hbs b/app/templates/components/dashboard-row.hbs index 1b8647e2..278177fe 100644 --- a/app/templates/components/dashboard-row.hbs +++ b/app/templates/components/dashboard-row.hbs @@ -21,32 +21,7 @@
- - - - - - - + {{format-sha repo.default_branch.last_build.commit.sha}} @@ -58,22 +33,7 @@
- - - - - - - - - + {{#if repo.default_branch.last_build}} {{format-time repo.default_branch.last_build.finished_at}} diff --git a/app/templates/components/requests-item.hbs b/app/templates/components/requests-item.hbs index a931f716..77410336 100644 --- a/app/templates/components/requests-item.hbs +++ b/app/templates/components/requests-item.hbs @@ -1,30 +1,35 @@ -
- +
+ {{status-icon status=requestClass}}
-

{{format-time request.created_at}}

- -

- +

+ {{request-icon event=request.event_type state=requestClass}} {{#if request.isPullRequest}} - #{{request.pullRequestNumber}} + #{{request.pullRequestNumber}} {{else}} - {{request.branchName}} + {{request.branchName}} {{/if}} - {{github-commit-link request.repo.slug request.commit.sha}} -

+ {{github-commit-link request.repo.slug request.commit.sha}} +
-

+

+ + {{format-time request.created_at}}
+ +
{{{format-message request.commit.message short="true" repoBinding=request.build.repo}}} -

+
-

+

{{#if request.build}} - {{#link-to "build" request.build}} - {{request.build.number}}{{/link-to}} + + {{request.build.number}}{{/link-to}} {{else}} - {{/if}} -

-

{{message}}

+
+ +
+ {{message}} +
diff --git a/app/templates/requests.hbs b/app/templates/requests.hbs index 603b2220..6dff793b 100644 --- a/app/templates/requests.hbs +++ b/app/templates/requests.hbs @@ -1,7 +1,7 @@ {{#if config.pro}}

Travis Lint for clean .yml files - lint.travis-ci.org/{{repo.slug}} + lint.travis-ci.org/{{repo.slug}}

{{/if}}