diff --git a/package-lock.json b/package-lock.json index 9832631a2b..83b2f35162 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.13.3", + "version": "4.13.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index d763863544..34f8fa9316 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.13.3", + "version": "4.13.4", "main": "./website/server/index.js", "dependencies": { "@slack/client": "^3.8.1", diff --git a/webpack/webpack.base.conf.js b/webpack/webpack.base.conf.js index 8ad3c973e2..773d3bbd80 100644 --- a/webpack/webpack.base.conf.js +++ b/webpack/webpack.base.conf.js @@ -11,7 +11,7 @@ const IS_PROD = process.env.NODE_ENV === 'production'; const baseConfig = { entry: { - app: './website/client/main.js', + app: ['babel-polyfill', './website/client/main.js'], }, output: { path: config.build.assetsRoot, diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css index 86e566cc06..bc6e77dc53 100644 --- a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css +++ b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css @@ -1,18 +1,12 @@ -.promo_armoire_backgrounds_201712 { - background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -352px; - width: 141px; - height: 441px; -} .promo_take_this { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -142px -352px; + background-position: -437px 0px; width: 114px; height: 87px; } -.scene_bug { +.scene_calendar { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); background-position: 0px 0px; - width: 477px; - height: 351px; + width: 436px; + height: 368px; } diff --git a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png index cf7bc5045c..08b583245d 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/components/static/newStuff.vue b/website/client/components/static/newStuff.vue index ff4b2d97ae..74b86d2525 100644 --- a/website/client/components/static/newStuff.vue +++ b/website/client/components/static/newStuff.vue @@ -4,16 +4,11 @@ .align-self-center.right-margin(:class='baileyClass') .media-body h1.align-self-center(v-markdown='$t("newStuff")') - h2 12/12/2017 - BATTLE FOR THE NET: HELP PROTECT HABITICA + h2 12/13/2017 - BLOG POST: THE HABITICA PLANNER hr - .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 + p(v-markdown='"This month\'s [featured Wiki article](https://habitica.wordpress.com/2017/12/13/the-habitica-planner/) is about the Habitica Planner! We hope that it will help you as you find new ways to use Habitica for your task-management needs! Be sure to check it out, and let us know what you think by reaching out on [Twitter](https://twitter.com/habitica), [Tumblr](http://blog.habitrpg.com), and [Facebook](https://facebook.com/habitica)."') + .small by Beffymaroo and the Wiki Wizards + .scene_calendar.center-block br diff --git a/website/client/components/static/staticWrapper.vue b/website/client/components/static/staticWrapper.vue index 0796140033..732ab2e8c1 100644 --- a/website/client/components/static/staticWrapper.vue +++ b/website/client/components/static/staticWrapper.vue @@ -1,6 +1,6 @@