Fixed my Camera fix for point/region choosers. Trying to fix #1411 by insisting on monospace fonts in the code editor.

This commit is contained in:
Nick Winter 2014-10-25 11:47:04 -07:00
parent ebd1defbbc
commit 774ae24b41
3 changed files with 5 additions and 1 deletions

View file

@ -196,6 +196,7 @@ module.exports = class Angel extends CocoClass
@worker.postMessage func: 'abort' @worker.postMessage func: 'abort'
fireWorker: (rehire=true) => fireWorker: (rehire=true) =>
return if @destroyed
@aborting = false @aborting = false
@running = false @running = false
_.remove @shared.busyAngels, @ _.remove @shared.busyAngels, @

View file

@ -99,7 +99,8 @@ module.exports = Surface = class Surface extends CocoClass
@normalStage = new createjs.Stage(@normalCanvas[0]) @normalStage = new createjs.Stage(@normalCanvas[0])
@webGLStage = new createjs.SpriteStage(@webGLCanvas[0]) @webGLStage = new createjs.SpriteStage(@webGLCanvas[0])
@normalStage.nextStage = @webGLStage @normalStage.nextStage = @webGLStage
@camera = AudioPlayer.camera = new Camera @webGLCanvas unless @options.choosing @camera = new Camera @webGLCanvas
AudioPlayer.camera = @camera unless @options.choosing
@normalLayers.push @surfaceTextLayer = new Layer name: 'Surface Text', layerPriority: 1, transform: Layer.TRANSFORM_SURFACE_TEXT, camera: @camera @normalLayers.push @surfaceTextLayer = new Layer name: 'Surface Text', layerPriority: 1, transform: Layer.TRANSFORM_SURFACE_TEXT, camera: @camera
@normalLayers.push @gridLayer = new Layer name: 'Grid', layerPriority: 2, transform: Layer.TRANSFORM_SURFACE, camera: @camera @normalLayers.push @gridLayer = new Layer name: 'Grid', layerPriority: 2, transform: Layer.TRANSFORM_SURFACE, camera: @camera

View file

@ -60,6 +60,8 @@
background-color: transparent background-color: transparent
line-height: 20px line-height: 20px
overflow: visible overflow: visible
// https://github.com/codecombat/codecombat/issues/1411#issuecomment-60492750 -- trying to make sure system defaults don't mess up our monospace font.
font-family: Monaco, Menlo, Ubuntu Mono, Consolas, "source-code-pro", monospace !important
&.disabled &.disabled
@include opacity(80) @include opacity(80)