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

A few fixes for PlayHeroesModal and InventoryModal.

Browse source
This commit is contained in:
Nick Winter 2014-11-30 14:00:29 -08:00
parent 68559a3aa5
commit 9471beafd9
6 changed files with 46 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/styles/game-menu/inventory-modal.sass
View file

@ -37,6 +37,20 @@ $itemSlotGridHeight: 51px
left: -8px
//- Header
h1
position: absolute
left: 109px
top: 22px
margin: 0
width: 255px
text-align: center
color: rgb(254,188,68)
font-size: 38px
text-shadow: black 4px 4px 0, black -4px -4px 0, black 4px -4px 0, black -4px 4px 0, black 4px 0px 0, black 0px -4px 0, black -4px 0px 0, black 0px 4px 0
//- Gems count
#gems-count-container

17
app/styles/play/modal/play-heroes-modal.sass
View file

@ -28,13 +28,26 @@ $heroCanvasHeight: 265px
left: 154px
top: 25px
margin: 0
width: 450px
width: 350px
text-align: center
color: rgb(254,188,68)
font-size: 38px
text-shadow: black 4px 4px 0, black -4px -4px 0, black 4px -4px 0, black -4px 4px 0, black 4px 0px 0, black 0px -4px 0, black -4px 0px 0, black 0px 4px 0
//- Gems count
#gems-count-container
position: absolute
right: 39px
top: 470px
#gems-count
font-family: 'Open Sans Condensed'
font-size: 24.5px
color: lighten(rgb(1,64,91), 50%)
//- Close modal button
#close-modal
@ -248,7 +261,7 @@ $heroCanvasHeight: 265px
//- Different footer states
#purchasable-hero-explanation
#purchasable-hero-explanation, #loading-hero-explanation
position: absolute
left: 32px
top: 532px

3
app/styles/play/world-map-view.sass
View file

@ -158,6 +158,9 @@ $gameControlMargin: 30px
margin-top: 2 * -0.5 * $levelClickRadius
border-radius: 2 * $levelClickRadius
.tooltip
z-index: 2
.level-info-container
display: none
position: absolute

2
app/templates/play/menu/inventory-modal.jade
View file

@ -2,6 +2,8 @@
.modal-content
img(src="/images/pages/play/modal/inventory-background.png", draggable="false")#play-items-modal-narrow-bg
h1(data-i18n="game_menu.inventory_tab")
div#gems-count-container
span#gems-count.big-font= gems

11
app/templates/play/modal/play-heroes-modal.jade
View file

@ -5,6 +5,11 @@
h1(data-i18n="choose_hero.choose_hero")
div#gems-count-container
span#gems-count
.gem.gem-20
span.spl= gems
div#close-modal
span.glyphicon.glyphicon-remove
@ -53,7 +58,11 @@
#hero-footer
if visibleHero
if visibleHero.restricted
if !visibleHero.get('original')
#loading-hero-explanation
h2(data-i18n="common.loading") Loading...
else if visibleHero.restricted
#restricted-hero-explanation
h2
span= visibleHero.name

2
app/views/play/modal/PlayHeroesModal.coffee
View file

@ -68,6 +68,7 @@ module.exports = class PlayHeroesModal extends ModalView
context.codeLanguage = @codeLanguage = @options?.session?.get('codeLanguage') ? me.get('aceConfig')?.language ? 'python'
context.confirmButtonI18N = @confirmButtonI18N
context.visibleHero = @visibleHero
context.gems = me.gems()
context
afterRender: ->
@ -92,6 +93,7 @@ module.exports = class PlayHeroesModal extends ModalView
@formatHero @visibleHero
@renderSelectors '#hero-footer'
@buildCodeLanguages()
@$el.find('#gems-count-container').toggle Boolean @visibleHero.purchasable
initCodeLanguageList: (hadEverChosenHero) ->
if application.isIPadApp