From 7ccaa8c843dd8b013d481f03b5a7e63273735ce2 Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Thu, 17 Apr 2014 14:39:52 -0700 Subject: [PATCH] Fixed a bug, colored a badge. --- app/styles/editor/level/edit.sass | 3 +++ app/views/editor/delta.coffee | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/styles/editor/level/edit.sass b/app/styles/editor/level/edit.sass index 3e747368f..7d2b5b962 100644 --- a/app/styles/editor/level/edit.sass +++ b/app/styles/editor/level/edit.sass @@ -52,6 +52,9 @@ cursor: pointer &:hover background-color: #d3d3d3 + + .badge + background-color: green .outer-content background-color: $BG diff --git a/app/views/editor/delta.coffee b/app/views/editor/delta.coffee index 09c0981a6..b79b1cda5 100644 --- a/app/views/editor/delta.coffee +++ b/app/views/editor/delta.coffee @@ -21,12 +21,12 @@ module.exports = class DeltaView extends CocoView if @headModel @headDeltas = @headModel.getExpandedDelta() @conflicts = deltasLib.getConflicts(@headDeltas, @expandedDeltas) - DeltaView.deltaCounter += @expandedDeltas.length getRenderData: -> c = super() c.deltas = @expandedDeltas c.counter = DeltaView.deltaCounter + DeltaView.deltaCounter += @expandedDeltas.length c afterRender: ->