krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore(event): GaymerX armor & news

Browse Source
This commit is contained in:
Sabe Jones
2016-09-29 16:16:43 +00:00
parent c2eb113672
commit ca935670f7
6 changed files with 102 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
website/assets/sprites/dist/spritesmith-largeSprites-0.css vendored
View File

@@ -1,54 +1,30 @@
.2014_Fall_HealerPROMO2 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1212px -1488px;
width: 90px;
height: 90px;
}
.2014_Fall_Mage_PROMO9 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -452px -884px;
width: 120px;
height: 90px;
}
.2014_Fall_RoguePROMO3 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -558px -1385px;
width: 105px;
height: 90px;
}
.2014_Fall_Warrior_PROMO {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -848px -1488px;
width: 90px;
height: 90px;
}
.promo_android {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -978px -573px;
background-position: -1094px -151px;
width: 175px;
height: 175px;
}
.promo_backgrounds_armoire_201602 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1417px -103px;
background-position: -1275px -103px;
width: 141px;
height: 294px;
}
.promo_backgrounds_armoire_201603 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1275px -103px;
background-position: -1417px -103px;
width: 141px;
height: 294px;
}
.promo_backgrounds_armoire_201604 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -452px -442px;
background-position: -593px 0px;
width: 140px;
height: 441px;
}
.promo_backgrounds_armoire_201605 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -593px 0px;
background-position: -281px -525px;
width: 140px;
height: 441px;
}
@@ -78,7 +54,7 @@
}
.promo_backtoschool {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -151px -1488px;
background-position: -1522px -712px;
width: 150px;
height: 150px;
}
@@ -120,13 +96,13 @@
}
.promo_cow {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -281px -525px;
background-position: -452px 0px;
width: 140px;
height: 441px;
}
.promo_dilatoryDistress {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1316px -1385px;
background-position: -904px -1385px;
width: 90px;
height: 90px;
}
@@ -144,7 +120,7 @@
}
.promo_enchanted_armoire_201507 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -289px -1294px;
background-position: -507px -1294px;
width: 217px;
height: 90px;
}
@@ -156,7 +132,7 @@
}
.promo_enchanted_armoire_201509 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -666px -1488px;
background-position: -995px -1385px;
width: 90px;
height: 90px;
}
@@ -168,7 +144,7 @@
}
.promo_enchanted_armoire_201601 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -939px -1488px;
background-position: -1450px -1385px;
width: 90px;
height: 90px;
}
@@ -180,13 +156,13 @@
}
.promo_ghost_potions {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -452px 0px;
background-position: -452px -442px;
width: 140px;
height: 441px;
}
.promo_habitica {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1094px -151px;
background-position: -978px -573px;
width: 175px;
height: 175px;
}
@@ -210,7 +186,7 @@
}
.promo_mystery_201405 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1589px -1385px;
background-position: -1177px -1385px;
width: 90px;
height: 90px;
}
@@ -222,7 +198,7 @@
}
.promo_mystery_201407 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1064px -1114px;
background-position: -1107px -1114px;
width: 42px;
height: 62px;
}
@@ -234,25 +210,25 @@
}
.promo_mystery_201409 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1030px -1488px;
background-position: -1268px -1385px;
width: 90px;
height: 90px;
}
.promo_mystery_201410 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1131px -840px;
background-position: -1202px -840px;
width: 72px;
height: 63px;
}
.promo_mystery_201411 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1225px -1385px;
background-position: -1359px -1385px;
width: 90px;
height: 90px;
}
.promo_mystery_201412 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1021px -1114px;
background-position: -1064px -1114px;
width: 42px;
height: 66px;
}
@@ -264,13 +240,13 @@
}
.promo_mystery_201502 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -393px -1488px;
background-position: -1485px -1294px;
width: 90px;
height: 90px;
}
.promo_mystery_201503 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -575px -1488px;
background-position: -631px -1385px;
width: 90px;
height: 90px;
}
@@ -282,43 +258,43 @@
}
.promo_mystery_201505 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -757px -1488px;
background-position: -449px -1385px;
width: 90px;
height: 90px;
}
.promo_mystery_201506 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -654px -1030px;
background-position: -1021px -1114px;
width: 42px;
height: 69px;
}
.promo_mystery_201507 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1601px -1081px;
background-position: -302px -1488px;
width: 90px;
height: 105px;
}
.promo_mystery_201508 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -664px -1385px;
background-position: -1203px -1294px;
width: 93px;
height: 90px;
}
.promo_mystery_201509 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1121px -1488px;
background-position: -1541px -1385px;
width: 90px;
height: 90px;
}
.promo_mystery_201510 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -758px -1385px;
background-position: -1391px -1294px;
width: 93px;
height: 90px;
}
.promo_mystery_201511 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1134px -1385px;
background-position: -540px -1385px;
width: 90px;
height: 90px;
}
@@ -330,31 +306,31 @@
}
.promo_mystery_201601 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -452px -975px;
background-position: -452px -884px;
width: 120px;
height: 90px;
}
.promo_mystery_201602 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1407px -1385px;
background-position: -813px -1385px;
width: 90px;
height: 90px;
}
.promo_mystery_201603 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1498px -1385px;
background-position: -722px -1385px;
width: 90px;
height: 90px;
}
.promo_mystery_201604 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -852px -1385px;
background-position: -1109px -1294px;
width: 93px;
height: 90px;
}
.promo_mystery_201605 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -302px -1488px;
background-position: -1576px -1294px;
width: 90px;
height: 90px;
}
@@ -366,25 +342,25 @@
}
.promo_mystery_201607 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -484px -1488px;
background-position: -1086px -1385px;
width: 90px;
height: 90px;
}
.promo_mystery_201608 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1040px -1385px;
background-position: -1297px -1294px;
width: 93px;
height: 90px;
}
.promo_mystery_201609 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -946px -1385px;
background-position: -1015px -1294px;
width: 93px;
height: 90px;
}
.promo_mystery_3014 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -507px -1294px;
background-position: -289px -1294px;
width: 217px;
height: 90px;
}
@@ -430,6 +406,12 @@
width: 60px;
height: 60px;
}
.promo_rainbow_armor {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1601px -1081px;
width: 92px;
height: 103px;
}
.promo_shimmer_hair {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: 0px -1210px;
@@ -456,13 +438,13 @@
}
.promo_springclasses2014 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: 0px -1294px;
background-position: -978px -749px;
width: 288px;
height: 90px;
}
.promo_springclasses2015 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -978px -749px;
background-position: 0px -1294px;
width: 288px;
height: 90px;
}
@@ -504,22 +486,28 @@
}
.promo_takeThis_gear {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -306px -431px;
background-position: -452px -975px;
width: 114px;
height: 87px;
}
.promo_takethis_armor {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -906px -1294px;
background-position: -306px -431px;
width: 114px;
height: 87px;
}
.promo_unconventional_armor {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1204px -840px;
background-position: -654px -1030px;
width: 60px;
height: 60px;
}
.promo_unconventional_armor2 {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1131px -840px;
width: 70px;
height: 74px;
}
.promo_updos {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1522px -546px;
@@ -558,7 +546,7 @@
}
.npc_viirus {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -449px -1385px;
background-position: -906px -1294px;
width: 108px;
height: 90px;
}
@@ -576,7 +564,7 @@
}
.scene_phone_peek {
background-image: url(/spritesmith-largeSprites-0.png);
background-position: -1522px -712px;
background-position: -151px -1488px;
width: 150px;
height: 150px;
}

BIN
website/assets/sprites/dist/spritesmith-largeSprites-0.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 692 KiB

After

Width:  |  Height:  |  Size: 640 KiB

BIN
website/assets/sprites/spritesmith_large/promo/promo_rainbow_armor.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
website/assets/sprites/spritesmith_large/promo/promo_unconventional_armor2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

2
website/common/script/content/constants.js
View File

@@ -21,7 +21,7 @@ export const EVENTS = {
spring2015: { start: '2015-03-20', end: '2015-05-02' },
summer2015: { start: '2015-06-20', end: '2015-08-02' },
fall2015: { start: '2015-09-21', end: '2015-11-01' },
gaymerx: { start: '2015-12-01', end: '2015-12-14' },
gaymerx: { start: '2016-09-29', end: '2016-10-03' },
winter2016: { start: '2015-12-18', end: '2016-02-02' },
spring2016: { start: '2016-03-18', end: '2016-05-02' },
summer2016: { start: '2016-06-21', end: '2016-08-02' },

52
website/views/shared/new-stuff.jade
View File

@@ -1,5 +1,49 @@
h2 9/27/2016 - USER SPOTLIGHT AND FEATURED WIKI ARTICLE
h2 9/29/2016 - WIDGETS ON ANDROID APP, TAG MANAGEMENT ON iOS APP, GAYMERX ARMOR, AND LAST CHANCE FOR COW COSTUME
hr
tr
td
h3 Android Update: Widgets, Tag Editing, and More!
p We've released <a href='https://play.google.com/store/apps/details?id=com.habitrpg.android.habitica&hl=en' target='_blank'>a new Android update</a> which includes a much-requested feature.... WIDGETS! Now you can easily score a Habit, check out your Dailies, and view your avatar and stats.
br
p This update also includes the ability to edit/delete tags, the ability to select your language options and which day your week starts, and various bug fixes. Be sure to download it now for a better Habitica experience!
br
p If you like the improvements that we’ve been making to our app, please consider reviewing this new version. It really helps us out! We hope you enjoy the update.
p.small.muted by Viirus, DanielKaparunakis, and jbillings
tr
td
h3 iOS Update: Tag Management, Expanded Profile, and More!
p We've released <a href='https://itunes.apple.com/us/app/habitica/id994882113?ls=1&mt=8' target='_blank'>a new iOS update</a> with lots of new features!
br
p Now you can create, edit, and delete tags directly from the app, just by tapping on the Filter button. Plus, we've expanded the profile display to show blurbs, gear, and stats when you click on someone's name. Finally, we've fixed a variety of crashes. Be sure to download it now for a better Habitica experience!
br
p If you like the improvements that we’ve been making to our app, please consider reviewing this new version. It really helps us out! Old reviews get hidden with each update, but if you go to the review section you can re-post them again with a single tap. We hope you enjoy the update!
p.small.muted by Viirus
tr
td
.promo_unconventional_armor2.pull-right
.promo_rainbow_armor.pull-left.slight-right-margin
h3 GaymerX Armor
p In honor of Habitica's partnership with the <a href='http://gaymerx.com' target='_blank'>GX4 Conference by GaymerX</a>, the Rainbow Warrior set is now available from the Rewards column! It will only be available until October 2nd, so be sure to get it now.
br
p For those of you in the Bay Area, the Unconventional Armor set will be available at the conference, so don't forget to pick up a promo card if you attend! There will also be a limited number of <a href='https://www.stickermule.com/uk/marketplace/9317-habitica-gryphon-sticker' target='_blank'>Habitica stickers</a>.
br
p We hope you enjoy your new armor!
p.small.muted by Lemoness and JJSpace
tr
td
.promo_mystery_201609.pull-right
h3 Last Chance for Cow Costume
p Reminder: this is the final day to <a href='/#/options/settings/subscription'>subscribe</a> and receive the Cow Costume Set! Subscribing also lets you buy gems for gold. The longer your subscription, the more gems you get!
br
p Thanks so much for your support! You help keep Habitica running.
p.small.muted by Lemoness
if menuItem !== 'oldNews'
hr
a(href='/static/old-news', target='_blank') Read older news
mixin oldNews
h2 9/27/2016 - USER SPOTLIGHT AND FEATURED WIKI ARTICLE
tr
td
h3 User Spotlight: Thomas Frank, Creator of College Info Geek
@@ -10,12 +54,6 @@ h2 9/27/2016 - USER SPOTLIGHT AND FEATURED WIKI ARTICLE
h3 Blog Post: Boss Battles
p This month's <a href='https://habitica.wordpress.com/2016/09/21/boss-battles/' target='_blank'>featured Wiki article</a> is about Boss Battles! We hope that it will help you as you fight monsters with your friends. Be sure to check it out, and let us know what you think by reaching out on <a href='https://twitter.com/habitica' target='_blank'>Twitter</a>, <a href='https://www.facebook.com/Habitica' target='_blank'>Facebook</a>, and <a href='http://habitica.tumblr.com/' target='_blank'>Tumblr</a>.
p.small.muted by Redphoenix and the Wiki Wizards
if menuItem !== 'oldNews'
hr
a(href='/static/old-news', target='_blank') Read older news
mixin oldNews
h2 9/22/2016 - MAGIC HATCHING POTIONS AND SEPTEMBER MYSTERY ITEMS
tr
td