codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-13 01:01:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
phoenixeliot 2016-07-29 16:22:02 -07:00
commit a6d31d3064
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/lib/Angel.coffee
View file

@ -151,7 +151,7 @@ module.exports = class Angel extends CocoClass
if @work?.indefiniteLength and world.victory? if @work?.indefiniteLength and world.victory?
finished = true finished = true
world.totalFrames = world.frames.length world.totalFrames = world.frames.length
firstChangedFrame = if @work.indefiniteLength then 0 else world.findFirstChangedFrame @shared.world firstChangedFrame = if @work?.indefiniteLength then 0 else world.findFirstChangedFrame @shared.world
eventType = if finished then 'new-world-created' else 'streaming-world-updated' eventType = if finished then 'new-world-created' else 'streaming-world-updated'
if finished if finished
@shared.world = world @shared.world = world

2
app/styles/courses/teacher-dashboard-nav.sass
View file

@ -11,7 +11,6 @@
background: $navy background: $navy
.navbar-toggle .navbar-toggle
margin-top:
border-color: white border-color: white
.icon-bar .icon-bar
@ -43,4 +42,3 @@
margin-right: 0.6em margin-right: 0.6em
border-bottom: 4px solid white border-bottom: 4px solid white
border-radius: 0 border-radius: 0

4
app/styles/style-flat.sass
View file

@ -119,6 +119,10 @@ body[lang='ru'], body[lang='uk'], body[lang='bg'], body[lang^='mk'], body[lang='
.navbar-toggle .navbar-toggle
color: black color: black
margin: 30px 25px 0 margin: 30px 25px 0
border-color: $navy
.icon-bar
background-color: $navy
@media (min-width: $screen-lg-min) @media (min-width: $screen-lg-min)
#navbar-collapse #navbar-collapse

2
app/views/play/level/LevelLoadingView.coffee
View file

@ -61,7 +61,7 @@ module.exports = class LevelLoadingView extends CocoView
for goalID, goal of @level.get('goals') when (not goal.team or goal.team is (e.team or 'humans')) and not goal.hiddenGoal for goalID, goal of @level.get('goals') when (not goal.team or goal.team is (e.team or 'humans')) and not goal.hiddenGoal
continue if goal.optional and @level.isType('course') continue if goal.optional and @level.isType('course')
name = utils.i18n goal, 'name' name = utils.i18n goal, 'name'
goalList.append $('<li>' + name + '</li>') goalList.append $('<li>').text(name)
++goalCount ++goalCount
if goalCount if goalCount
goalContainer.removeClass('secret') goalContainer.removeClass('secret')