Revert "Add game UI programming language label"

This reverts commit b7f916116d.

Some heights in gameplay were made worse by this; needs some more work.
This commit is contained in:
phoenixeliot 2016-07-29 11:21:57 -07:00
parent 488e533e4e
commit 4af822d13a
4 changed files with 3 additions and 28 deletions
app
locale
styles/play/level/tome
templates/play/level/tome
views/play/level/tome

View file

@ -437,7 +437,6 @@
done: "Done" done: "Done"
next_level: "Next Level" next_level: "Next Level"
next_game: "Next game" next_game: "Next game"
programming_language: "Programming language"
show_menu: "Show game menu" show_menu: "Show game menu"
home: "Home" # Not used any more, will be removed soon. home: "Home" # Not used any more, will be removed soon.
level: "Level" # Like "Level: Dungeons of Kithgard" level: "Level" # Like "Level: Dungeons of Kithgard"

View file

@ -2,8 +2,7 @@
@import "app/styles/bootstrap/variables" @import "app/styles/bootstrap/variables"
#spell-top-bar-view #spell-top-bar-view
$control-yellow-highlight: rgb(243, 211, 59) $height: 87px
$height: 107px
$paddingTop: 10px $paddingTop: 10px
$paddingBottom: 25px $paddingBottom: 25px
$childSize: $height - $paddingTop - $paddingBottom $childSize: $height - $paddingTop - $paddingBottom
@ -51,24 +50,10 @@
float: left float: left
margin-top: 5px margin-top: 5px
.programming-language-container
position: absolute
padding-top: $paddingTop
right: 20px
font-family: "Open Sans Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif
.programming-language-label
color: $control-yellow-highlight
font-size: 12px
font-weight: bold
text-transform: uppercase
.programming-language
color: white
font-size: 16px
.spell-tool-buttons .spell-tool-buttons
position: absolute position: absolute
right: 0px right: 0px
top: 30px top: 0px
.reload-code .reload-code
float: right float: right

View file

@ -35,13 +35,3 @@
span(data-i18n='sharing.webpage') span(data-i18n='sharing.webpage')
.clearfix .clearfix
.programming-language-container
span.programming-language-label(data-i18n='play_level.programming_language')
span.programming-language-label.spr :
if view.spell.language === 'html' || view.spell.language === 'javascript'
span.programming-language JavaScript
else if view.spell.language === 'python'
span.programming-language Python
else
span.programming-language= view.spell.language

View file

@ -39,6 +39,7 @@ module.exports = class SpellTopBarView extends CocoView
afterRender: -> afterRender: ->
super() super()
@$el.addClass 'spell-tab'
@attachTransitionEventListener() @attachTransitionEventListener()
onDisableControls: (e) -> @toggleControls e, false onDisableControls: (e) -> @toggleControls e, false