sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 03:52:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'issue#4556' of https://github.com/matttelliott/habitrpg into border

Browse source
This commit is contained in:
Blade Barringer 2015-01-27 09:10:46 -06:00
commit 58650baba3
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
public/css/game-pane.styl
View file

@ -1,6 +1,9 @@
.border-right
border-right 1px solid #ddd
.border-left
border-left 1px solid #ddd
.tab-notification
color #fff
background-color #51a351

4
views/options/inventory/inventory.jade
View file

@ -94,7 +94,7 @@ script(type='text/ng-template', id='partials/options.inventory.timetravelers.htm
script(type='text/ng-template', id='partials/options.inventory.drops.html')
.container-fluid
.row
.col-md-6.border-right
.col-md-6
h2=env.t('inventory')
p.well=env.t('inventoryText')
menu.inventory-list(type='list')
@ -156,7 +156,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html')
button.customize-option(popover="New Year's Card from {{User.user.items.special.nyeReceived[0]}}", popover-trigger='mouseenter', popover-placement='right', ng-click='openModal("nye")', class='inventory_special_nye')
.badge.badge-info.stack-count {{user.items.special.nyeReceived.length}}
.col-md-6
.col-md-6.border-left
h2=env.t('market')
.row-fluid
table.npc_alex_container