Merge branch 'develop' into sabrecat/usernames-master

This commit is contained in:
Sabe Jones
2018-11-08 15:13:28 -06:00
59 changed files with 367 additions and 181 deletions
@@ -1,6 +1,6 @@
.achievement-costumeContest6x {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -142px -727px;
background-position: -437px -727px;
width: 144px;
height: 156px;
}
@@ -30,7 +30,7 @@
}
.promo_mystery_201810 {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -958px -428px;
background-position: -142px -727px;
width: 294px;
height: 168px;
}
@@ -48,10 +48,16 @@
}
.promo_veteran_pets {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -958px -286px;
background-position: -958px -563px;
width: 363px;
height: 141px;
}
.scene_dailies {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -958px -286px;
width: 327px;
height: 276px;
}
.scene_nametag {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -376px -365px;
@@ -66,7 +72,7 @@
}
.scene_veteran_pets {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -958px -597px;
background-position: -582px -727px;
width: 242px;
height: 62px;
}