Fixed a bug, colored a badge.

This commit is contained in:
Scott Erickson 2014-04-17 14:39:52 -07:00
parent cdaf2ebfaf
commit 7ccaa8c843
2 changed files with 4 additions and 1 deletions

View file

@ -52,6 +52,9 @@
cursor: pointer cursor: pointer
&:hover &:hover
background-color: #d3d3d3 background-color: #d3d3d3
.badge
background-color: green
.outer-content .outer-content
background-color: $BG background-color: $BG

View file

@ -21,12 +21,12 @@ module.exports = class DeltaView extends CocoView
if @headModel if @headModel
@headDeltas = @headModel.getExpandedDelta() @headDeltas = @headModel.getExpandedDelta()
@conflicts = deltasLib.getConflicts(@headDeltas, @expandedDeltas) @conflicts = deltasLib.getConflicts(@headDeltas, @expandedDeltas)
DeltaView.deltaCounter += @expandedDeltas.length
getRenderData: -> getRenderData: ->
c = super() c = super()
c.deltas = @expandedDeltas c.deltas = @expandedDeltas
c.counter = DeltaView.deltaCounter c.counter = DeltaView.deltaCounter
DeltaView.deltaCounter += @expandedDeltas.length
c c
afterRender: -> afterRender: ->