From 3940e43886df176c0ac304f16f33072be13a0680 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Thu, 9 Apr 2015 18:17:06 +0200 Subject: [PATCH 1/9] 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}} + From 75ca9860935b4945e97e6a76a8c51756d598ce30 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Fri, 10 Apr 2015 12:01:30 +0200 Subject: [PATCH 2/9] add grey icons --- app/styles/app/layouts/requests.sass | 8 +++++++- app/styles/app/modules/icons.sass | 5 +++++ app/templates/requests.hbs | 2 +- public/images/svg/icon-request-pull.svg | 18 ++++++++++++++++++ public/images/svg/icon-request-push.svg | 11 +++++++++++ 5 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 public/images/svg/icon-request-pull.svg create mode 100644 public/images/svg/icon-request-push.svg diff --git a/app/styles/app/layouts/requests.sass b/app/styles/app/layouts/requests.sass index d4aae4ae..358dc904 100644 --- a/app/styles/app/layouts/requests.sass +++ b/app/styles/app/layouts/requests.sass @@ -12,4 +12,10 @@ padding-left: 1em .tile--jobs - padding-left: 2.5em \ No newline at end of file + padding-left: 2.5em + + .icon.push + width: 1.2em + height: .8em + .icon.pull_request + height: 1.5em diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass index 58b04079..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') diff --git a/app/templates/requests.hbs b/app/templates/requests.hbs index 0a054526..e8647271 100644 --- a/app/templates/requests.hbs +++ b/app/templates/requests.hbs @@ -18,7 +18,7 @@

{{format-time created_at}}

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

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

{{!-- commit message --}} 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 @@ + + + + + + From 3f8f20f9d0602f78d629948136d6d4d1555a92d6 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Fri, 10 Apr 2015 14:27:17 +0200 Subject: [PATCH 3/9] some hbs and style stuff --- app/styles/app/_mixins/mixins.sass | 4 ++-- app/styles/app/layouts/requests.sass | 12 ++++++++---- app/templates/requests.hbs | 11 ++++++++--- 3 files changed, 18 insertions(+), 9 deletions(-) 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 index 358dc904..97ddacc4 100644 --- a/app/styles/app/layouts/requests.sass +++ b/app/styles/app/layouts/requests.sass @@ -1,15 +1,19 @@ .requests @include resetul + + color: #969496 - .requests-commit + .requests-commit, + .requests-branch position: relative &:after content: "" - @include fadeOut(right, -90deg, $cream-light) + @include fadeOut(right, -90deg, $cream-light, 20%) .requests-time - border-left: 1px solid $grey4 - padding-left: 1em + @media #{$medium-up} + padding-left: 2em + border-left: 1px solid $grey4 .tile--jobs padding-left: 2.5em diff --git a/app/templates/requests.hbs b/app/templates/requests.hbs index e8647271..a245a65c 100644 --- a/app/templates/requests.hbs +++ b/app/templates/requests.hbs @@ -17,12 +17,17 @@ {{!-- time --}}

{{format-time created_at}}

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

+

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

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

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

+

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

{{!-- job id --}}

{{#if build}} @@ -34,7 +39,7 @@ {{/if}}

{{!-- comment --}} -

{{message}}

+

{{message}}

{{/each}} From c116cc3bbe24bfd916e3b74f439d6920fe62711a Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Fri, 10 Apr 2015 15:13:49 +0200 Subject: [PATCH 4/9] get request links hover right --- app/styles/app/layouts/requests.sass | 18 +++++++++++++++++- app/templates/requests.hbs | 4 ++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/styles/app/layouts/requests.sass b/app/styles/app/layouts/requests.sass index 97ddacc4..0a18b290 100644 --- a/app/styles/app/layouts/requests.sass +++ b/app/styles/app/layouts/requests.sass @@ -1,14 +1,30 @@ +@mixin colorRequests($color-bg) + &:hover + background-color: $color-bg + .requests-commit, + .requests-branch + &:after + @include fadeOut(right, -90deg, $color-bg, 30%) + + .requests @include resetul + .accepted:hover + @include colorRequests(#e5efe4) + .rejected:hover + @include colorRequests(#fbebe6) + color: #969496 + a:hover + text-decoration: underline .requests-commit, .requests-branch position: relative &:after content: "" - @include fadeOut(right, -90deg, $cream-light, 20%) + @include fadeOut(right, -90deg, $cream-light, 30%) .requests-time @media #{$medium-up} diff --git a/app/templates/requests.hbs b/app/templates/requests.hbs index a245a65c..e2cb22f7 100644 --- a/app/templates/requests.hbs +++ b/app/templates/requests.hbs @@ -20,9 +20,9 @@

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

From 11966b1445424280804197380d1eb33a8e71c745 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Fri, 10 Apr 2015 15:23:54 +0200 Subject: [PATCH 5/9] set a successful message for requests --- app/controllers/request.coffee | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/request.coffee b/app/controllers/request.coffee index aff18acd..59173b06 100644 --- a/app/controllers/request.coffee +++ b/app/controllers/request.coffee @@ -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') From b65209e3b132d0f600e84d327a5dea4ac2b48d24 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Fri, 10 Apr 2015 15:57:57 +0200 Subject: [PATCH 6/9] some tweaks on request alignment --- app/styles/app/layouts/requests.sass | 6 +++ app/templates/requests.hbs | 58 ++++++++++++++-------------- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/app/styles/app/layouts/requests.sass b/app/styles/app/layouts/requests.sass index 0a18b290..e27bd1d8 100644 --- a/app/styles/app/layouts/requests.sass +++ b/app/styles/app/layouts/requests.sass @@ -30,6 +30,12 @@ @media #{$medium-up} padding-left: 2em border-left: 1px solid $grey4 + @media #{$xlarge-up} + width: grid-calc(3, 24) + + .requests-branch + @media #{$xlarge-up} + width: grid-calc(5, 24) .tile--jobs padding-left: 2.5em diff --git a/app/templates/requests.hbs b/app/templates/requests.hbs index e2cb22f7..cf8508e4 100644 --- a/app/templates/requests.hbs +++ b/app/templates/requests.hbs @@ -9,38 +9,36 @@
    {{#each controller itemController="request"}}
    +
    + +
    - {{!-- icon --}} -
    - -
    - {{!-- time --}} -

    {{format-time created_at}}

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

    - - {{#if isPullRequest}} - #{{pullRequestNumber}} - {{else}} - {{branchName}} - {{/if}} - {{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}}

    +

    {{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}}
From e973a557da10634edb37c52c90a7c916de041167 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Mon, 13 Apr 2015 12:36:03 +0200 Subject: [PATCH 7/9] hide branch on smaller screens to always have the clickable link --- app/styles/app/layouts/requests.sass | 12 ++++++++++-- app/templates/requests.hbs | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/styles/app/layouts/requests.sass b/app/styles/app/layouts/requests.sass index e27bd1d8..9561f46f 100644 --- a/app/styles/app/layouts/requests.sass +++ b/app/styles/app/layouts/requests.sass @@ -2,7 +2,8 @@ &:hover background-color: $color-bg .requests-commit, - .requests-branch + .requests-branch, + .requests-message &:after @include fadeOut(right, -90deg, $color-bg, 30%) @@ -20,7 +21,8 @@ text-decoration: underline .requests-commit, - .requests-branch + .requests-branch, + .requests-message position: relative &:after content: "" @@ -34,6 +36,12 @@ width: grid-calc(3, 24) .requests-branch + @media #{$medium-only} + strong + display: none + @media #{$large-only} + strong + display: none @media #{$xlarge-up} width: grid-calc(5, 24) diff --git a/app/templates/requests.hbs b/app/templates/requests.hbs index cf8508e4..ccf78012 100644 --- a/app/templates/requests.hbs +++ b/app/templates/requests.hbs @@ -38,7 +38,7 @@ - {{/if}}

-

{{message}}

+

{{message}}

{{/each}} From 38ef4ab6f9e5eb7854f0223120b5b5eaac75430e Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Mon, 13 Apr 2015 13:11:11 +0200 Subject: [PATCH 8/9] more padding and grid nudging --- app/styles/app/layouts/requests.sass | 30 +++++++++++++++++----------- app/templates/requests.hbs | 10 +++++----- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/app/styles/app/layouts/requests.sass b/app/styles/app/layouts/requests.sass index 9561f46f..d56162ee 100644 --- a/app/styles/app/layouts/requests.sass +++ b/app/styles/app/layouts/requests.sass @@ -16,6 +16,7 @@ .rejected:hover @include colorRequests(#fbebe6) + margin-top: 2.5rem color: #969496 a:hover text-decoration: underline @@ -32,18 +33,6 @@ @media #{$medium-up} padding-left: 2em border-left: 1px solid $grey4 - @media #{$xlarge-up} - width: grid-calc(3, 24) - - .requests-branch - @media #{$medium-only} - strong - display: none - @media #{$large-only} - strong - display: none - @media #{$xlarge-up} - width: grid-calc(5, 24) .tile--jobs padding-left: 2.5em @@ -53,3 +42,20 @@ 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) + @media #{$large-up} + .requests-time + width: grid-calc(3, 24) + .requests-branch + width: grid-calc(5, 24) diff --git a/app/templates/requests.hbs b/app/templates/requests.hbs index ccf78012..8eb4c5c3 100644 --- a/app/templates/requests.hbs +++ b/app/templates/requests.hbs @@ -13,9 +13,9 @@ -

{{format-time created_at}}

+

{{format-time created_at}}

-

+

{{#if isPullRequest}} #{{pullRequestNumber}} @@ -25,11 +25,11 @@ {{github-commit-link repo.slug commit.sha}}

-

+

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

-

+

{{#if build}} {{#link-to "build" build}} @@ -38,7 +38,7 @@ - {{/if}}

-

{{message}}

+

{{message}}

{{/each}} From ccd553295690717e0cc0ad003bc615a4abac852c Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Mon, 13 Apr 2015 13:25:09 +0200 Subject: [PATCH 9/9] also fade out time on requests --- app/styles/app/layouts/requests.sass | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/styles/app/layouts/requests.sass b/app/styles/app/layouts/requests.sass index d56162ee..9b3b9339 100644 --- a/app/styles/app/layouts/requests.sass +++ b/app/styles/app/layouts/requests.sass @@ -3,7 +3,8 @@ background-color: $color-bg .requests-commit, .requests-branch, - .requests-message + .requests-message, + .requests-time &:after @include fadeOut(right, -90deg, $color-bg, 30%) @@ -23,7 +24,8 @@ .requests-commit, .requests-branch, - .requests-message + .requests-message, + .requests-time position: relative &:after content: "" @@ -54,8 +56,3 @@ width: grid-calc(2, 24) .requests-message width: grid-calc(5, 24) - @media #{$large-up} - .requests-time - width: grid-calc(3, 24) - .requests-branch - width: grid-calc(5, 24)