diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css index 67c34aa6b3..33aa6f6dc7 100644 --- a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css +++ b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css @@ -1,12 +1,12 @@ .promo_aquatic_glass_potions { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -995px 0px; + background-position: -853px 0px; width: 141px; height: 441px; } .promo_armoire_backgrounds_201807 { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -735px; + background-position: -853px -442px; width: 141px; height: 441px; } @@ -18,13 +18,13 @@ } .promo_mystery_201806 { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -1137px -442px; + background-position: -995px -442px; width: 121px; height: 114px; } .promo_seafoam { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -1137px 0px; + background-position: -995px 0px; width: 141px; height: 441px; } @@ -36,43 +36,43 @@ } .promo_seasonal_shop_summer { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -649px -549px; + background-position: -401px -552px; width: 162px; height: 138px; } .promo_splashy_skins { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -477px -362px; + background-position: -142px -365px; width: 375px; height: 186px; } .customize-option.promo_splashy_skins { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -502px -377px; + background-position: -167px -380px; width: 60px; height: 60px; } .promo_summer_splash_2018 { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -853px 0px; + background-position: 0px -365px; width: 141px; height: 588px; } .promo_take_this { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -1137px -557px; + background-position: -995px -557px; width: 96px; height: 69px; } -.scene_party_healing { +.promo_unconventional_armor { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -365px; - width: 393px; - height: 369px; + background-position: -518px -365px; + width: 180px; + height: 180px; } -.scene_reading { +.scene_pomodoro { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -477px -549px; - width: 171px; - height: 144px; + background-position: -142px -552px; + width: 258px; + height: 258px; } diff --git a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png index c2fc98d78e..637d074385 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/raw_sprites/spritesmith_large/promo_unconventional_armor.png b/website/raw_sprites/spritesmith_large/promo_unconventional_armor.png new file mode 100644 index 0000000000..3343520c9a Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_unconventional_armor.png differ diff --git a/website/raw_sprites/spritesmith_large/scene_party_healing.png b/website/raw_sprites/spritesmith_large/scene_party_healing.png deleted file mode 100644 index 5a4765d580..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_party_healing.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/scene_pomodoro.png b/website/raw_sprites/spritesmith_large/scene_pomodoro.png new file mode 100644 index 0000000000..436109602f Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_pomodoro.png differ diff --git a/website/raw_sprites/spritesmith_large/scene_reading.png b/website/raw_sprites/spritesmith_large/scene_reading.png deleted file mode 100644 index 5b708b2c8b..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_reading.png and /dev/null differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index ac7905ad76..0e0bc8593c 100644 --- a/website/server/controllers/api-v3/news.js +++ b/website/server/controllers/api-v3/news.js @@ -3,7 +3,7 @@ import { authWithHeaders } from '../../middlewares/auth'; let api = {}; // @TODO export this const, cannot export it from here because only routes are exported from controllers -const LAST_ANNOUNCEMENT_TITLE = 'NEW PET QUEST: SEA SERPENT!'; +const LAST_ANNOUNCEMENT_TITLE = 'HABITICA COMIC-CON MEETUP AND WIKI SPOTLIGHT ON THE POMODORO TECHNIQUE'; const worldDmg = { // @TODO bailey: false, }; @@ -30,17 +30,25 @@ api.getNews = {

${res.t('newStuff')}

-

7/17/2018 - ${LAST_ANNOUNCEMENT_TITLE}

+

7/19/2018 - ${LAST_ANNOUNCEMENT_TITLE}


-

A submersible expedition launching from the Diligent Docks turns to danger when a mighty Sea Serpent swims into the picture! Get the latest pet quest, Danger in the Depths: Sea Serpent Strike!, and earn some shimmering Sea Serpent pets by completing your real-life tasks.

-
Art by Aries Faries, Witticaster, *~Seraphina~, Mara, and 1920-kun
-
Writing by gwyllgi
+

Habitica at San Diego Comic Con!

+

Beffymaroo will be representing Habitica at San Diego Comic Con this year. If you’d like to meet her, along with other fellow Habiticans, join us at the Habitica SDCC Meetup! Beffymaroo will be handing out Habitica stickers, promo codes for the Unconventional Armor set, and other exciting special swag (quantities limited!).

+

You can find the meetup on Saturday, July 21, at the San Diego Bayfront Hilton lobby from 12:00-1:00 PM! Look for the purple Gryphon banner. Can’t wait to meet you :)

+
+
+
+
+
+
+

Wiki Spotlight: The Pomodoro Technique

+

This month's featured Wiki article is about the Pomodoro Technique! We hope that it will help you as you look for new productivity strategies. Be sure to check it out, and let us know what you think by reaching out on Twitter, Tumblr, and Facebook.

+
by shanaqui and the Wiki Wizards
-
`,