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

chore(Merge): remote-tracking branch 'PeterHatch/develop' into develop

Browse source 
Conflicts:
	dist/customizer.css
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith.css
	dist/spritesmith.png
This commit is contained in:
Tyler Renelle 2014-03-21 20:07:19 -06:00
commit 7147287164
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dist/customizer.css vendored
View file

@ -3410,7 +3410,7 @@
.shield_rogue_4 {
background-image: url(spritesmith.png);
background-position: -2143px -2152px;
width: 100px;
width: 96px;
height: 90px;
background-size: 2878px 2870px;
}
@ -4109,14 +4109,14 @@
}
.shop_weapon_special_1 {
background-image: url(spritesmith.png);
background-position: -2244px -2193px;
background-position: -2240px -2193px;
width: 40px;
height: 40px;
background-size: 2878px 2870px;
}
.shop_weapon_special_2 {
background-image: url(spritesmith.png);
background-position: -2244px -2152px;
background-position: -2240px -2152px;
width: 40px;
height: 40px;
background-size: 2878px 2870px;

2
dist/habitrpg-shared.css vendored
View file

File diff suppressed because one or more lines are too long

6
dist/spritesmith.css vendored
View file

@ -3410,7 +3410,7 @@
.shield_rogue_4 {
background-image: url(spritesmith.png);
background-position: -2143px -2152px;
width: 100px;
width: 96px;
height: 90px;
background-size: 2878px 2870px;
}
@ -4109,14 +4109,14 @@
}
.shop_weapon_special_1 {
background-image: url(spritesmith.png);
background-position: -2244px -2193px;
background-position: -2240px -2193px;
width: 40px;
height: 40px;
background-size: 2878px 2870px;
}
.shop_weapon_special_2 {
background-image: url(spritesmith.png);
background-position: -2244px -2152px;
background-position: -2240px -2152px;
width: 40px;
height: 40px;
background-size: 2878px 2870px;

BIN
dist/spritesmith.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 519 KiB

After

Width:  |  Height:  |  Size: 519 KiB

BIN
img/sprites/spritesmith/gear/shield/shield_rogue_4.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 272 B

BIN
img/sprites/spritesmith/gear/weapon/weapon_rogue_4.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 276 B