From 38ef4ab6f9e5eb7854f0223120b5b5eaac75430e Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Mon, 13 Apr 2015 13:11:11 +0200 Subject: [PATCH] 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}}