mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2024-11-28 01:55:38 -05:00
Fixed a bug, colored a badge.
This commit is contained in:
parent
cdaf2ebfaf
commit
7ccaa8c843
2 changed files with 4 additions and 1 deletions
|
@ -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
|
||||||
|
|
|
@ -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: ->
|
||||||
|
|
Loading…
Reference in a new issue