Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert

Browse Source 
Conflicts:
	common/img/sprites/spritesmith/npcs/npc_ian.png
	common/img/sprites/spritesmith/npcs/seasonalshop_winter2015.png
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
This commit is contained in:
Blade Barringer
2015-02-03 19:26:14 -06:00
parent 88be8f3274 7d63c9f8b2
commit 6f4fbfeaeb
118 changed files with 709 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/css/index.css
+2 -2
View File
@@ -2,12 +2,12 @@
margin-left: 1.25em;
}*/
/* Comment out for holiday events
/* Comment out for holiday events */
.npc_ian {
background: url("../img/sprites/npc_ian.gif") no-repeat;
width: 78px;
height: 135px;
} */
}
.Gems {
display:inline-block;