codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-29 18:45:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2014-08-05 15:07:16 -07:00
commit 8d643380a0
6 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/styles/editor/level/thangs_tab.sass
View file

@ -212,6 +212,7 @@ $mobile: 1050px
position: relative position: relative
#canvas-overlay #canvas-overlay
display: none
position: absolute position: absolute
width: 100% width: 100%
height: 100% height: 100%

16
app/styles/play/level/tome/problem_alert.sass
View file

@ -3,18 +3,22 @@
.problem-alert .problem-alert
z-index: 10 z-index: 10
position: absolute position: absolute
bottom: -120px bottom: -135px
left: 10px left: 10px
right: 10px right: 10px
background: transparent background: transparent
border: 0 border: 0
padding: 7px 20px padding: 0
text-shadow: none text-shadow: none
color: white color: white
word-wrap: break-word word-wrap: break-word
border-image: url(/images/level/code_editor_error_background.png) 16 20 fill round border-image: url(/images/level/code_editor_error_background.png) 16 20 fill round
border-width: 16px 20px border-width: 16px 20px
&.no-hint
// Since it's probably only one line, let's make it not look weird by being tiny.
padding: 7px
.close .close
@include opacity(0.80) @include opacity(0.80)
text-shadow: none text-shadow: none
@ -36,10 +40,6 @@
&.alert-info &.alert-info
border-image-source: url(/images/level/code_editor_info_background.png) border-image-source: url(/images/level/code_editor_info_background.png)
&.alert-style
// Do we ever want to do this for style?
border-image-source: url(/images/level/code_editor_info_background.png)
html.no-borderimage html.no-borderimage
.problem-alert .problem-alert
border-width: 0 border-width: 0
@ -53,7 +53,3 @@ html.no-borderimage
&.alert-info &.alert-info
background-image: url(/images/level/code_editor_info_background.png) background-image: url(/images/level/code_editor_info_background.png)
&.alert-style
// Do we ever want to do this for style?
background-image: url(/images/level/code_editor_info_background.png)

2
app/styles/play/level/tome/spell.sass
View file

@ -62,7 +62,7 @@
overflow: visible overflow: visible
&.user-code-problem.spell-cast &.user-code-problem.spell-cast
@include editor-height(40px) @include editor-height(60px)
&.disabled &.disabled
@include opacity(80) @include opacity(80)

2
app/views/editor/level/LevelEditView.coffee
View file

@ -74,7 +74,7 @@ module.exports = class LevelEditView extends RootView
@insertSubView new ScriptsTabView world: @world, supermodel: @supermodel, files: @files @insertSubView new ScriptsTabView world: @world, supermodel: @supermodel, files: @files
@insertSubView new ComponentsTabView supermodel: @supermodel @insertSubView new ComponentsTabView supermodel: @supermodel
@insertSubView new SystemsTabView supermodel: @supermodel @insertSubView new SystemsTabView supermodel: @supermodel
@insertSubView new ComponentDocsView supermodel: @supermodel @insertSubView new ComponentDocsView()
Backbone.Mediator.publish 'level-loaded', level: @level Backbone.Mediator.publish 'level-loaded', level: @level
@showReadOnly() if me.get('anonymous') @showReadOnly() if me.get('anonymous')

2
app/views/editor/level/modals/SaveLevelModal.coffee
View file

@ -47,7 +47,7 @@ module.exports = class SaveLevelModal extends SaveVersionModal
shouldSaveEntity: (m) -> shouldSaveEntity: (m) ->
return false unless m.hasWriteAccess() return false unless m.hasWriteAccess()
return true if m.hasLocalChanges() return false unless m.hasLocalChanges()
return true if (m.get('version').major is 0 and m.get('version').minor is 0) or not m.isPublished() and not m.collection return true if (m.get('version').major is 0 and m.get('version').minor is 0) or not m.isPublished() and not m.collection
# Sometimes we have two versions: one in a search collection and one with a URL. We only save changes to the latter. # Sometimes we have two versions: one in a search collection and one with a URL. We only save changes to the latter.
false false

1
app/views/play/level/tome/ProblemAlertView.coffee
View file

@ -32,6 +32,7 @@ module.exports = class ProblemAlertView extends CocoView
afterRender: -> afterRender: ->
super() super()
@$el.addClass('alert').addClass("alert-#{@problem.aetherProblem.level}").hide().fadeIn('slow') @$el.addClass('alert').addClass("alert-#{@problem.aetherProblem.level}").hide().fadeIn('slow')
@$el.addClass('no-hint') unless @problem.aetherProblem.hint
Backbone.Mediator.publish 'play-sound', trigger: 'error_appear', volume: 1.0 Backbone.Mediator.publish 'play-sound', trigger: 'error_appear', volume: 1.0
onRemoveClicked: -> onRemoveClicked: ->