From 4af822d13a0750cb39716d12c88bceb3be19d786 Mon Sep 17 00:00:00 2001 From: phoenixeliot Date: Fri, 29 Jul 2016 11:21:57 -0700 Subject: [PATCH] Revert "Add game UI programming language label" This reverts commit b7f916116dd1d06ece4a2fe24ca126a4bf4b2d97. Some heights in gameplay were made worse by this; needs some more work. --- app/locale/en.coffee | 1 - .../play/level/tome/spell-top-bar-view.sass | 19 ++----------------- .../play/level/tome/spell-top-bar-view.jade | 10 ---------- .../play/level/tome/SpellTopBarView.coffee | 1 + 4 files changed, 3 insertions(+), 28 deletions(-) diff --git a/app/locale/en.coffee b/app/locale/en.coffee index b4435e47c..9c8770392 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -437,7 +437,6 @@ done: "Done" next_level: "Next Level" next_game: "Next game" - programming_language: "Programming language" show_menu: "Show game menu" home: "Home" # Not used any more, will be removed soon. level: "Level" # Like "Level: Dungeons of Kithgard" diff --git a/app/styles/play/level/tome/spell-top-bar-view.sass b/app/styles/play/level/tome/spell-top-bar-view.sass index 9d00710c6..39207901d 100644 --- a/app/styles/play/level/tome/spell-top-bar-view.sass +++ b/app/styles/play/level/tome/spell-top-bar-view.sass @@ -2,8 +2,7 @@ @import "app/styles/bootstrap/variables" #spell-top-bar-view - $control-yellow-highlight: rgb(243, 211, 59) - $height: 107px + $height: 87px $paddingTop: 10px $paddingBottom: 25px $childSize: $height - $paddingTop - $paddingBottom @@ -51,24 +50,10 @@ float: left 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 position: absolute right: 0px - top: 30px + top: 0px .reload-code float: right diff --git a/app/templates/play/level/tome/spell-top-bar-view.jade b/app/templates/play/level/tome/spell-top-bar-view.jade index 6540236a9..2af252e1e 100644 --- a/app/templates/play/level/tome/spell-top-bar-view.jade +++ b/app/templates/play/level/tome/spell-top-bar-view.jade @@ -35,13 +35,3 @@ span(data-i18n='sharing.webpage') .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 diff --git a/app/views/play/level/tome/SpellTopBarView.coffee b/app/views/play/level/tome/SpellTopBarView.coffee index a3cddf06e..7c8051f86 100644 --- a/app/views/play/level/tome/SpellTopBarView.coffee +++ b/app/views/play/level/tome/SpellTopBarView.coffee @@ -39,6 +39,7 @@ module.exports = class SpellTopBarView extends CocoView afterRender: -> super() + @$el.addClass 'spell-tab' @attachTransitionEventListener() onDisableControls: (e) -> @toggleControls e, false