From 3940e43886df176c0ac304f16f33072be13a0680 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Thu, 9 Apr 2015 18:17:06 +0200 Subject: [PATCH] start with requests styles --- app/controllers/request.coffee | 4 +- app/styles/app.scss | 3 +- app/styles/app/layouts/requests.sass | 15 +++++++ app/styles/app/modules/icons.sass | 6 ++- app/templates/requests.hbs | 65 ++++++++++++++-------------- 5 files changed, 55 insertions(+), 38 deletions(-) create mode 100644 app/styles/app/layouts/requests.sass diff --git a/app/controllers/request.coffee b/app/controllers/request.coffee index 3d70cda0..aff18acd 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: (-> 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/layouts/requests.sass b/app/styles/app/layouts/requests.sass new file mode 100644 index 00000000..d4aae4ae --- /dev/null +++ b/app/styles/app/layouts/requests.sass @@ -0,0 +1,15 @@ +.requests + @include resetul + + .requests-commit + position: relative + &:after + content: "" + @include fadeOut(right, -90deg, $cream-light) + + .requests-time + border-left: 1px solid $grey4 + padding-left: 1em + + .tile--jobs + padding-left: 2.5em \ No newline at end of file diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass index 8ad82bd9..58b04079 100644 --- a/app/styles/app/modules/icons.sass +++ b/app/styles/app/modules/icons.sass @@ -105,10 +105,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..0a054526 100644 --- a/app/templates/requests.hbs +++ b/app/templates/requests.hbs @@ -6,37 +6,36 @@ {{/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}}
+ {{!-- icon --}} +
+ +
+ {{!-- time --}} +

{{format-time created_at}}

+ {{!-- request branch commit --}} +

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

+ {{!-- commit message --}} +

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

+ {{!-- job id --}} +

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

+ {{!-- comment --}} +

{{message}}

+ + + {{/each}} +