From 3f8f20f9d0602f78d629948136d6d4d1555a92d6 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Fri, 10 Apr 2015 14:27:17 +0200 Subject: [PATCH] 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}}