diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css index cd9be183aa..86e566cc06 100644 --- a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css +++ b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css @@ -1,12 +1,18 @@ .promo_armoire_backgrounds_201712 { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px 0px; + background-position: 0px -352px; width: 141px; height: 441px; } .promo_take_this { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -142px 0px; + background-position: -142px -352px; width: 114px; height: 87px; } +.scene_bug { + background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: 0px 0px; + width: 477px; + height: 351px; +} diff --git a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png index 2f007b9bca..cf7bc5045c 100644 Binary files a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png and b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png differ diff --git a/website/client/assets/images/sprites/spritesmith-main-5.png b/website/client/assets/images/sprites/spritesmith-main-5.png index 42a23f2286..1b9aa7c3c3 100644 Binary files a/website/client/assets/images/sprites/spritesmith-main-5.png and b/website/client/assets/images/sprites/spritesmith-main-5.png differ diff --git a/website/client/components/static/newStuff.vue b/website/client/components/static/newStuff.vue index 32ee00647c..ff4b2d97ae 100644 --- a/website/client/components/static/newStuff.vue +++ b/website/client/components/static/newStuff.vue @@ -4,20 +4,16 @@ .align-self-center.right-margin(:class='baileyClass') .media-body h1.align-self-center(v-markdown='$t("newStuff")') - h2 12/5/2017 - ARMOIRE ITEMS, BACKGROUNDS, AND TAKE THIS CHALLENGE + h2 12/12/2017 - BATTLE FOR THE NET: HELP PROTECT HABITICA hr - .media - .media-body - h3 December Backgrounds and Armoire Items! - p We’ve added three new backgrounds to the Background Shop! Now your avatar can admire a Starry Winter Night, bask in the wonder of a Toymaker's Workshop, and glide along a Cross-Country Ski Trail. You can find them under User Icon > Backgrounds! - p Plus, there’s new gold-purchasable equipment in the Enchanted Armoire, including the Lamp-Lighter Set. Better work hard on your real-life tasks to earn all the pieces! Enjoy :) - .small by Vampitch, AnnDeLune, CitrineSun, and Hachiseiko - h3 Take This Challenge for December - p(v-markdown='"The next Take This Challenge has launched, [It\'s Dangerous to Go Alone!](https://habitica.com/challenges/5f70ce5b-2d82-4114-8e44-ca65615aae62), with a focus on maintaining offline relationships. Be sure to check it out to earn additional pieces of the Take This armor set!"') - p(v-markdown='"[Take This](http://www.takethis.org/) is a nonprofit that seeks to inform the gamer community about mental health issues, to provide education about mental disorders and mental illness prevention, and to reduce the stigma of mental illness."') - .promo_armoire_backgrounds_201712.left-margin - p(v-markdown='"Congratulations to the winners of the last Take This Challenge, \'Notice Me, Senpai!\': grand prize winner M L, and runners-up Trompadour, Eule, mizuki_F, PhiaFox, and Dragon. Plus, all participants in that Challenge have received a piece of the [Take This item set](http://habitica.wikia.com/wiki/Event_Item_Sequences#Take_This_Armor_Set) if they hadn\'t collected all the pieces already. It is located in your Rewards column. Enjoy!"') - .small by Doctor B, the Take This team, Lemoness, and SabreCat + .scene_bug.center-block + p What would you do if you couldn't access your favorite websites, including Habitica, without paying an exorbitant amount to your internet service provider? In the United States, where Habitica is based, that is now a very real danger. + p The USA's Federal Communications Commission (FCC) is about to vote on its plan to kill net neutrality, which will let internet service providers charge extra fees, throttle internet speeds, and block access to websites like this one. This could kill a small company like Habitica. + p.strong Congress can stop them, but only if US citizens flood them with calls right now, asking them to defend net neutrality by stopping the FCC's vote BEFORE December 14th. Help keep Habitica free to access for everybody! + p(v-markdown='"**US Habiticans can call Congress using the phone numbers found [here](https://www.callmycongress.com). You can also learn more at https://www.battleforthenet.com.** Non-US Habiticans can still help us by spreading the word."') + p Thank you for helping protect Habitica. + p Warmly, + p Vicky, Leslie, Sabe, Phillip, Matteo, Keith, and Beth br diff --git a/website/raw_sprites/spritesmith/gear/armoire/body_armoire_cozyScarf.png b/website/raw_sprites/spritesmith/gear/armoire/body_armoire_cozyScarf.png index 6be6e92841..8f1ec2f3f6 100644 Binary files a/website/raw_sprites/spritesmith/gear/armoire/body_armoire_cozyScarf.png and b/website/raw_sprites/spritesmith/gear/armoire/body_armoire_cozyScarf.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_lamplightersGreatcoat.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_lamplightersGreatcoat.png index 3dcb04822f..6fbfcfe0e3 100644 Binary files a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_lamplightersGreatcoat.png and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_lamplightersGreatcoat.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/head_armoire_lamplightersTopHat.png b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_lamplightersTopHat.png index c8e9ff4ffb..7c7cc17d80 100644 Binary files a/website/raw_sprites/spritesmith/gear/armoire/head_armoire_lamplightersTopHat.png and b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_lamplightersTopHat.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_lamplightersGreatcoat.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_lamplightersGreatcoat.png index 5c78fa243c..a7dc7d057d 100644 Binary files a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_lamplightersGreatcoat.png and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_lamplightersGreatcoat.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_lamplighter.png b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_lamplighter.png index 72b85daec4..89202354b1 100644 Binary files a/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_lamplighter.png and b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_lamplighter.png differ diff --git a/website/raw_sprites/spritesmith_large/scene_bug.png b/website/raw_sprites/spritesmith_large/scene_bug.png new file mode 100644 index 0000000000..b436cef8b5 Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_bug.png differ