From 26fe355e4075294bf97002c2942c6b26f088125d Mon Sep 17 00:00:00 2001 From: Lisa P Date: Mon, 14 Sep 2015 14:56:02 +0200 Subject: [PATCH] get icon coloring right --- app/components/branch-row.coffee | 1 + app/components/status-icon.coffee | 2 +- app/styles/app/components/build-tile.sass | 3 ++- app/styles/app/layouts/branches.sass | 4 ++-- app/templates/components/branch-row.hbs | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/components/branch-row.coffee b/app/components/branch-row.coffee index b9219ca7..8393eb5e 100644 --- a/app/components/branch-row.coffee +++ b/app/components/branch-row.coffee @@ -55,6 +55,7 @@ BranchRowComponent = Ember.Component.extend viewAllBuilds: (branch) -> console.log('view all builds') + @transitionToRoute('builds') # updateFilter: (value) -> # @set('_lastFilterValue', value) # Ember.run.throttle this, @updateFilter, [], 200, false diff --git a/app/components/status-icon.coffee b/app/components/status-icon.coffee index a19d9c0e..b16168fb 100644 --- a/app/components/status-icon.coffee +++ b/app/components/status-icon.coffee @@ -4,7 +4,7 @@ StatusIconComponent = Ember.Component.extend tagName: 'span' classNames: ['status-icon'] - classNameBindings: ['build.last_build.state'] + classNameBindings: ['build.last_build.state', 'build.state'] hasPassed: (-> @get('build.last_build.state') == 'passed' || diff --git a/app/styles/app/components/build-tile.sass b/app/styles/app/components/build-tile.sass index 3ee34ad8..ece849fa 100644 --- a/app/styles/app/components/build-tile.sass +++ b/app/styles/app/components/build-tile.sass @@ -1,7 +1,8 @@ @mixin buildTileColors($color, $bg, $status) > .#{$status} background-color: $bg - .icon-request g > * + .icon-request g > *, + .status-icon g > * fill: $color &:hover background-color: $color diff --git a/app/styles/app/layouts/branches.sass b/app/styles/app/layouts/branches.sass index d5ba8e02..3237fc50 100644 --- a/app/styles/app/layouts/branches.sass +++ b/app/styles/app/layouts/branches.sass @@ -6,8 +6,8 @@ color: $color &:hover border-color: $color - .status-icon g > *, - .icon-request g > * + .branch-name .status-icon g > *, + .branch-request .icon-request g > * fill: $color .branches diff --git a/app/templates/components/branch-row.hbs b/app/templates/components/branch-row.hbs index 5998addd..abd4cf93 100644 --- a/app/templates/components/branch-row.hbs +++ b/app/templates/components/branch-row.hbs @@ -135,7 +135,7 @@