From e1112c73cca1fe3c42f8b03d932c73f3c4d877df Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 10 Mar 2015 15:35:00 +0100 Subject: [PATCH] fix things iwith Piotr --- app/controllers/builds-item.coffee | 5 +++++ app/styles/app/modules/tiles.sass | 8 ++++++++ app/templates/builds.hbs | 4 ++-- app/templates/repos/show/actions.hbs | 2 +- app/views/build.coffee | 3 +-- app/views/repo-actions.coffee | 1 + 6 files changed, 18 insertions(+), 5 deletions(-) diff --git a/app/controllers/builds-item.coffee b/app/controllers/builds-item.coffee index 89fec964..3db4ba54 100644 --- a/app/controllers/builds-item.coffee +++ b/app/controllers/builds-item.coffee @@ -1,6 +1,7 @@ `import Ember from 'ember'` `import { colorForState } from 'travis/utils/helpers'` `import GithubUrlProperties from 'travis/mixins/github-url-properties'` +`import { gravatarImage } from 'travis/utils/urls'` Controller = Ember.ObjectController.extend(GithubUrlProperties, needs: ['builds'] @@ -10,6 +11,10 @@ Controller = Ember.ObjectController.extend(GithubUrlProperties, color: (-> colorForState(@get('build.state')) ).property('build.state') + + urlAuthorGravatarImage: (-> + gravatarImage(@get('commit.authorEmail'), 40) + ).property('commit.authorEmail') ) `export default Controller` diff --git a/app/styles/app/modules/tiles.sass b/app/styles/app/modules/tiles.sass index 3ecd6870..6b48f6bf 100644 --- a/app/styles/app/modules/tiles.sass +++ b/app/styles/app/modules/tiles.sass @@ -98,8 +98,16 @@ // build history etc .tile--build .tile-main + @media #{$small-only} + h2 + line-height: $line-height-m + margin-bottom: 1em @media #{$medium-up} + white-space: nowrap + overflow: hidden border-right: solid 1px $grey4 + &:after + @include fadeOut(right, -90deg, $cream-light) @media #{$xlarge-up} @include grid-column(8) .tile-additional diff --git a/app/templates/builds.hbs b/app/templates/builds.hbs index 9c335092..00158c41 100644 --- a/app/templates/builds.hbs +++ b/app/templates/builds.hbs @@ -17,7 +17,7 @@ {{/if}} {{{format-message build.commit.message short="true" repoBinding=build.repo}}} -

{{build.commit.committerName}} commited

+

{{build.commit.committerName}} commited

diff --git a/app/templates/repos/show/actions.hbs b/app/templates/repos/show/actions.hbs index 7388b33c..fdc68e49 100644 --- a/app/templates/repos/show/actions.hbs +++ b/app/templates/repos/show/actions.hbs @@ -34,7 +34,7 @@ {{/if}} {{#if view.displayCodeClimate}} diff --git a/app/views/build.coffee b/app/views/build.coffee index c1921190..10792cdb 100644 --- a/app/views/build.coffee +++ b/app/views/build.coffee @@ -2,9 +2,8 @@ `import BasicView from 'travis/views/basic'` View = BasicView.extend - classNameBindings: ['color', 'loading'] + classNameBindings: ['color'] buildBinding: 'controller.build' - loadingBinding: 'controller.loading' color: (-> colorForState(@get('build.state')) diff --git a/app/views/repo-actions.coffee b/app/views/repo-actions.coffee index 66656445..53b98acf 100644 --- a/app/views/repo-actions.coffee +++ b/app/views/repo-actions.coffee @@ -65,6 +65,7 @@ View = BasicView.extend codeClimatePopup: -> @popupCloseAll() + console.log('repo-actions view') @popup('code-climate') return false