sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-01 03:30:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'shaners/rewrite'

Browse source 
Conflicts:
	dist/spritesheets.css
This commit is contained in:
Tyler Renelle 2013-10-29 23:15:03 -07:00
commit 1bfb6a88fd
6 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
css/backer.css
View file

@ -30,6 +30,12 @@
background: url("../img/sprites/backer-only/BackerOnly-Pet-CerberusPup.gif") no-repeat;
}
.Pet-Dragon-Hydra {
width: 106px;
height: 89px;
background: url("../img/sprites/backer-only/ContributorOnly-Pet-Hydra.png") no-repeat;
}
.shop_shield_6 {background-position: -1040px 0}
.shop_weapon_7 {background-position: -1080px 0}
.shop_armor_6 {background-position: -1160px 0}

2
dist/spritesheets.css vendored
View file

File diff suppressed because one or more lines are too long

BIN
img/sprites/backer-only/ContributorOnly-Pet-Hydra.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
img/sprites/backer-only/ContributorOnly-Shield-Crystal.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
img/sprites/backer-only/ContributorOnly-Weapon-CrystalBlade.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 939 B

BIN
img/sprites/shop_sprites.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 13 KiB