diff --git a/app/lib/LevelSetupManager.coffee b/app/lib/LevelSetupManager.coffee index 691f8837c..b965bf0be 100644 --- a/app/lib/LevelSetupManager.coffee +++ b/app/lib/LevelSetupManager.coffee @@ -20,7 +20,6 @@ module.exports = class LevelSetupManager extends CocoClass @fillSessionWithDefaults() else @loadSession() - #@loadModals() loadSession: -> url = "/db/level/#{@options.levelID}/session" diff --git a/app/schemas/models/thang_type.coffee b/app/schemas/models/thang_type.coffee index e0b41a9f5..3721e7705 100644 --- a/app/schemas/models/thang_type.coffee +++ b/app/schemas/models/thang_type.coffee @@ -145,7 +145,7 @@ _.extend ThangTypeSchema.properties, maleRanger: { type: 'string', format: 'image-file', title: 'Glove (Male Ranger)' } maleRangerThumb: { type: 'string', format: 'image-file', title: 'Thumb (Male Ranger)' } femaleRanger: { type: 'string', format: 'image-file', title: 'Glove (Female Ranger)' } - femaleRangeThumbr: { type: 'string', format: 'image-file', title: 'Thumb (Female Ranger)' } + femaleRangerThumb: { type: 'string', format: 'image-file', title: 'Thumb (Female Ranger)' } maleBack: { type: 'string', format: 'image-file', title: ' Male Back' } femaleBack: { type: 'string', format: 'image-file', title: ' Female Back' } colorGroups: c.object diff --git a/app/styles/game-menu/inventory-modal.sass b/app/styles/game-menu/inventory-modal.sass index 10952c3f3..d4b8e54c1 100644 --- a/app/styles/game-menu/inventory-modal.sass +++ b/app/styles/game-menu/inventory-modal.sass @@ -497,7 +497,7 @@ $itemSlotGridHeight: 51px bottom: 31px &.Ranger - left: -7px + left: -16px #hero-image-head z-index: 16 @@ -531,6 +531,9 @@ $itemSlotGridHeight: 51px &.feet z-index: 13 + &.male.Ranger + bottom: 45px + &.right-hand:not(.Ranger) @include rotate(-15deg) &.female @@ -542,35 +545,38 @@ $itemSlotGridHeight: 51px bottom: 63px @include rotate(-15deg) - &.right-hand.Ranger - &.female - left: -7px - - &.male - left: -7px - &.left-hand z-index: 17 &.torso z-index: 14 - &.gloves:not(.Ranger) + &.gloves z-index: 15 &.female - &.female-thumb + &.female-thumb, &.female-ranger-thumb z-index: 16 - @include rotate(-15deg) - left: 66px - bottom: 54px + &:not(.Ranger) + @include rotate(-15deg) + left: 66px + bottom: 54px &.male - &.male-thumb + &.male-thumb, &.male-ranger-thumb z-index: 16 - @include rotate(-15deg) - left: 53px - bottom: 54px + &:not(.Ranger) + @include rotate(-15deg) + left: 53px + bottom: 54px &.head z-index: 17 + + &.Ranger:not(.feet) + &.female + left: -7px + + &.male + left: -16px +