diff --git a/app/controllers/request.coffee b/app/controllers/request.coffee index 3d70cda0..59173b06 100644 --- a/app/controllers/request.coffee +++ b/app/controllers/request.coffee @@ -10,9 +10,9 @@ Controller = Ember.ObjectController.extend type: (-> if @get('isPullRequest') - 'Pull request' + 'pull_request' else - 'Push' + 'push' ).property('isPullRequest') status: (-> @@ -26,6 +26,8 @@ Controller = Ember.ObjectController.extend message = @get('model.message') if @config.pro && message == "private repository" '' + else if !message + 'Build created successfully ' else message ).property('model.message') diff --git a/app/styles/app.scss b/app/styles/app.scss index 48ce79f7..962b7488 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -30,7 +30,7 @@ @import "app/pro"; // @import "app/profile/hooks"; // @import "app/profile"; -@import "app/requests"; +// @import "app/requests"; // @import "app/right/lists"; // @import "app/right/sponsors"; // @import "app/right"; @@ -68,3 +68,4 @@ // @import "app/top"; @import "app/landing"; +@import "app/layouts/requests"; diff --git a/app/styles/app/_mixins/mixins.sass b/app/styles/app/_mixins/mixins.sass index ac4e134f..9b31edf3 100644 --- a/app/styles/app/_mixins/mixins.sass +++ b/app/styles/app/_mixins/mixins.sass @@ -8,7 +8,7 @@ background-clip: padding-box border-radius 4px -@mixin fadeOut($position, $angle, $color) +@mixin fadeOut($position, $angle, $color, $width: 0%) content: "" display: block position: absolute @@ -23,7 +23,7 @@ width: 2em height: 100% - background: linear-gradient($angle, rgba($color, 1) 0%, rgba($color, 0) 100%) + background: linear-gradient($angle, rgba($color, 1) $width, rgba($color, 0) 100%) @mixin clearfix &:before, diff --git a/app/styles/app/layouts/requests.sass b/app/styles/app/layouts/requests.sass new file mode 100644 index 00000000..9b3b9339 --- /dev/null +++ b/app/styles/app/layouts/requests.sass @@ -0,0 +1,58 @@ +@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%) + + +.requests + @include resetul + + .accepted:hover + @include colorRequests(#e5efe4) + .rejected:hover + @include colorRequests(#fbebe6) + + margin-top: 2.5rem + color: #969496 + a:hover + 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 $grey4 + + .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) diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass index 8ad82bd9..d4782b33 100644 --- a/app/styles/app/modules/icons.sass +++ b/app/styles/app/modules/icons.sass @@ -77,6 +77,11 @@ .icon.pull_request background-image: inline-image('svg/pull-request-icon.svg') +.icon--grey.push + background-image: inline-image('svg/icon-request-push.svg') +.icon--grey.pull_request + background-image: inline-image('svg/icon-request-pull.svg') + .icon-lock background-image: inline-image('dashboard/private-icon.svg') @@ -105,10 +110,12 @@ .icon--env background-image: inline-image('svg/icon-environment-dark2.svg') .icon--cross-red, -.icon--job.failed +.icon--job.failed, +.icon--job.rejected background-image: inline-image('svg/icon-job-failed.svg') .icon--check-green, -.icon--job.passed +.icon--job.passed, +.icon--job.accepted background-image: inline-image('svg/icon-job-passed.svg') .icon--error-grey, .icon--job.errored diff --git a/app/templates/requests.hbs b/app/templates/requests.hbs index 5d9c7e9f..8eb4c5c3 100644 --- a/app/templates/requests.hbs +++ b/app/templates/requests.hbs @@ -6,37 +6,39 @@ {{/if}} - - - - - - - - - - - + - {{#each controller itemController="request"}} - - - - - - - - - {{/each}} - -
RequestCommitBuildCommit messageTypeMessage
- - {{id}} - {{github-commit-link repo.slug commit.sha}} - {{#if build}} - {{#link-to "build" build}}#{{build.number}}{{/link-to}} - {{else}} - - - {{/if}} - {{{format-message commit.message short="true" repoBinding=build.repo}}}{{type}}{{message}}
+

{{format-time created_at}}

+ +

+ + {{#if isPullRequest}} + #{{pullRequestNumber}} + {{else}} + {{branchName}} + {{/if}} + {{github-commit-link repo.slug commit.sha}} +

+ +

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

+ +

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

+

{{message}}

+ + {{/each}} + diff --git a/public/images/svg/icon-request-pull.svg b/public/images/svg/icon-request-pull.svg new file mode 100644 index 00000000..cd15209f --- /dev/null +++ b/public/images/svg/icon-request-pull.svg @@ -0,0 +1,18 @@ + + + + + + + + + diff --git a/public/images/svg/icon-request-push.svg b/public/images/svg/icon-request-push.svg new file mode 100644 index 00000000..c163e515 --- /dev/null +++ b/public/images/svg/icon-request-push.svg @@ -0,0 +1,11 @@ + + + + + +