diff --git a/app/assets/images/pages/play/modal/inventory-background.png b/app/assets/images/pages/play/modal/inventory-background.png new file mode 100644 index 000000000..9217b51d9 Binary files /dev/null and b/app/assets/images/pages/play/modal/inventory-background.png differ diff --git a/app/styles/game-menu/inventory-modal.sass b/app/styles/game-menu/inventory-modal.sass index be8bd00cd..3dfc2df37 100644 --- a/app/styles/game-menu/inventory-modal.sass +++ b/app/styles/game-menu/inventory-modal.sass @@ -40,7 +40,7 @@ $itemSlotGridHeight: 70px #gems-count-container position: absolute - left: 213px + left: 374px top: 10px width: 160px height: 66px @@ -49,7 +49,7 @@ $itemSlotGridHeight: 70px #gems-count position: absolute left: 75px - top: 17px + top: 14px font-size: 25px color: rgb(1,64,91) @@ -58,8 +58,8 @@ $itemSlotGridHeight: 70px #close-modal position: absolute - left: 390px - top: 23px + left: 551px + top: 21px width: 60px height: 60px color: white @@ -77,11 +77,9 @@ $itemSlotGridHeight: 70px #equipped width: 330px - background: white - border: 3px solid black position: absolute left: 20px - top: 112px + top: 122px height: 450px overflow: hidden @@ -307,14 +305,12 @@ $itemSlotGridHeight: 70px position: absolute #unequipped - width: 222px + width: 245px position: absolute left: 370px - top: 112px - height: 450px - border: 3px solid black + top: 135px + height: 435px padding: 9px 0 9px 9px - background-color: white #double-click-hint margin: 20px 0 70px @@ -387,12 +383,12 @@ $itemSlotGridHeight: 70px //- Hero/Play buttons #choose-hero-button, #play-level-button - top: 572px + top: 582px position: absolute background: url(/images/pages/play/modal/confirm-button.png) width: 209px - height: 65px - background-size: 209px 65px + height: 55px + background-size: 209px 55px border: 0 &:disabled diff --git a/app/templates/game-menu/inventory-modal.jade b/app/templates/game-menu/inventory-modal.jade index 846d23173..0503d2664 100644 --- a/app/templates/game-menu/inventory-modal.jade +++ b/app/templates/game-menu/inventory-modal.jade @@ -1,6 +1,6 @@ .modal-dialog .modal-content - img(src="/images/pages/play/modal/items-background-narrow.png")#play-items-modal-narrow-bg + img(src="/images/pages/play/modal/inventory-background.png")#play-items-modal-narrow-bg div#gems-count-container span#gems-count.big-font= gems diff --git a/app/views/game-menu/InventoryModal.coffee b/app/views/game-menu/InventoryModal.coffee index 9b89b7e67..d23be3c8d 100644 --- a/app/views/game-menu/InventoryModal.coffee +++ b/app/views/game-menu/InventoryModal.coffee @@ -124,7 +124,7 @@ module.exports = class InventoryModal extends ModalView @itemDetailsView = new ItemDetailsView() @insertSubView(@itemDetailsView) @requireLevelEquipment() - @$el.find('.nano').nanoScroller() + @$el.find('.nano').nanoScroller({alwaysVisible: true}) afterInsert: -> super()