From f3ffcc2885157751de0ae69eb2a5511f06230792 Mon Sep 17 00:00:00 2001 From: phoenixeliot Date: Fri, 29 Jul 2016 14:55:42 -0700 Subject: [PATCH 1/3] Make hamburger more visible --- app/styles/courses/teacher-dashboard-nav.sass | 2 -- app/styles/style-flat.sass | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/styles/courses/teacher-dashboard-nav.sass b/app/styles/courses/teacher-dashboard-nav.sass index 44fa7bc7f..7a1e93de4 100644 --- a/app/styles/courses/teacher-dashboard-nav.sass +++ b/app/styles/courses/teacher-dashboard-nav.sass @@ -11,7 +11,6 @@ background: $navy .navbar-toggle - margin-top: border-color: white .icon-bar @@ -43,4 +42,3 @@ margin-right: 0.6em border-bottom: 4px solid white border-radius: 0 - \ No newline at end of file diff --git a/app/styles/style-flat.sass b/app/styles/style-flat.sass index 814546769..050599954 100644 --- a/app/styles/style-flat.sass +++ b/app/styles/style-flat.sass @@ -119,6 +119,10 @@ body[lang='ru'], body[lang='uk'], body[lang='bg'], body[lang^='mk'], body[lang=' .navbar-toggle color: black margin: 30px 25px 0 + border-color: $navy + + .icon-bar + background-color: $navy @media (min-width: $screen-lg-min) #navbar-collapse From 51706a52be84ead149482e3f4c40d4af229e88d1 Mon Sep 17 00:00:00 2001 From: phoenixeliot Date: Fri, 29 Jul 2016 16:16:50 -0700 Subject: [PATCH 2/3] Fix indefiniteLength error on first frame --- app/lib/Angel.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/Angel.coffee b/app/lib/Angel.coffee index 942329cf8..d440a3086 100644 --- a/app/lib/Angel.coffee +++ b/app/lib/Angel.coffee @@ -151,7 +151,7 @@ module.exports = class Angel extends CocoClass if @work?.indefiniteLength and world.victory? finished = true 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' if finished @shared.world = world From d3889752179fb6f1829a47c311465f0f954f85ec Mon Sep 17 00:00:00 2001 From: phoenixeliot Date: Fri, 29 Jul 2016 16:21:13 -0700 Subject: [PATCH 3/3] Fix unescaped HTML in goal descriptions --- app/views/play/level/LevelLoadingView.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/play/level/LevelLoadingView.coffee b/app/views/play/level/LevelLoadingView.coffee index 6e47711a0..ed97cfb39 100644 --- a/app/views/play/level/LevelLoadingView.coffee +++ b/app/views/play/level/LevelLoadingView.coffee @@ -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 continue if goal.optional and @level.isType('course') name = utils.i18n goal, 'name' - goalList.append $('
  • ' + name + '
  • ') + goalList.append $('
  • ').text(name) ++goalCount if goalCount goalContainer.removeClass('secret')