Compare commits
95 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 02545ae439 | |||
| 5a47f2a19f | |||
| c7a2b69b32 | |||
| b1d06671c8 | |||
| 55111a6ddc | |||
| 7ccbcd7b33 | |||
| 8a4109b9d7 | |||
| 679378331d | |||
| e3c40aa142 | |||
| 725c3b36f3 | |||
| 89822222fe | |||
| fed1eb8c21 | |||
| 858da4f9c9 | |||
| cdeb498c0b | |||
| e7a820e28d | |||
| 395e602cfc | |||
| d50cedfd31 | |||
| a5b2e53914 | |||
| 0e42d6ba32 | |||
| 420cebd93b | |||
| 384783567b | |||
| 64ffa4912d | |||
| 64c8e4d16d | |||
| 0d1bff5dda | |||
| 06cae45ed9 | |||
| 2d553417b4 | |||
| 4df2b723fa | |||
| f92cba6a40 | |||
| 9e16f9dffc | |||
| 72f1114d85 | |||
| 051763bc49 | |||
| 689a321a9b | |||
| bce4f55df5 | |||
| acc9e8ca7f | |||
| 6dfa93dab2 | |||
| 8ffc93f9c5 | |||
| 3efd900a3f | |||
| ff4a3adf7e | |||
| bba56b8c29 | |||
| ae533652c3 | |||
| 77c276fefe | |||
| 05eacc32ba | |||
| 626b87eb79 | |||
| d7c5d05f13 | |||
| 093c5a72df | |||
| ed0055e01b | |||
| 70ee091fa8 | |||
| 2788d64a2b | |||
| 3429f88f5b | |||
| bea4bf80e9 | |||
| ae5b66e248 | |||
| 110a9d52fa | |||
| 725ed22704 | |||
| d1bd63289b | |||
| d7ccf2bbe1 | |||
| d097868cad | |||
| 3a48022878 | |||
| b25ab8ca75 | |||
| 29498976ee | |||
| fb939e0300 | |||
| 2a76f0c8cf | |||
| 4244c7519e | |||
| 063995d5e4 | |||
| d37ee98c6d | |||
| 9a338ef1de | |||
| 60f34dafb0 | |||
| 2a3e3fb9d3 | |||
| d51bd68201 | |||
| a8226b2363 | |||
| 7ad313918a | |||
| 6ce917a0f3 | |||
| e021212481 | |||
| 6859cf1f73 | |||
| 6804125068 | |||
| 6e55be033b | |||
| 084e2e7470 | |||
| 98e74b42e0 | |||
| e52f9bd786 | |||
| 7c579bf850 | |||
| e6dd8cc03a | |||
| 795ea8ba80 | |||
| c7d08a6811 | |||
| 1ed7e21542 | |||
| 40eb74ea1b | |||
| 1ab3725b54 | |||
| 8e2ab11056 | |||
| 1c56648ea4 | |||
| 24d25026cf | |||
| aa00893f6c | |||
| 60367459e8 | |||
| 9d4fa6fd4e | |||
| ef65325f67 | |||
| ee5e94bc35 | |||
| bcd0915c60 | |||
| a798c4ef08 |
@@ -13,13 +13,6 @@ website/client/
|
||||
|
||||
# Temporarilly disabled. These should be removed when the linting errors are fixed
|
||||
common/script/content/index.js
|
||||
common/script/public/**/*.js
|
||||
|
||||
website/server/**/api-v2/**/*.js
|
||||
website/server/routes/payments.js
|
||||
website/server/routes/pages.js
|
||||
website/server/middlewares/apiThrottle.js
|
||||
website/server/middlewares/forceRefresh.js
|
||||
|
||||
debug-scripts/*
|
||||
scripts/*
|
||||
|
||||
@@ -131,7 +131,7 @@ module.exports = function(grunt) {
|
||||
grunt.registerTask('build:test', ['test:prepare:translations', 'build:dev']);
|
||||
|
||||
grunt.registerTask('test:prepare:translations', function() {
|
||||
var i18n = require('./website/server/libs/api-v3/i18n'),
|
||||
var i18n = require('./website/server/libs/i18n'),
|
||||
fs = require('fs');
|
||||
fs.writeFileSync('test/spec/mocks/translations.js',
|
||||
"if(!window.env) window.env = {};\n" +
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
/* Comment out for holiday events */
|
||||
/* .npc_ian {
|
||||
.npc_ian {
|
||||
background: url("/common/img/sprites/npc_ian.gif") no-repeat;
|
||||
width: 78px;
|
||||
height: 135px;
|
||||
} */
|
||||
}
|
||||
|
||||
.quest_burnout {
|
||||
background: url("/common/img/sprites/quest_burnout.gif") no-repeat;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
.2014_Fall_HealerPROMO2 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -922px -1275px;
|
||||
background-position: -1001px -1378px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
@@ -12,19 +12,19 @@
|
||||
}
|
||||
.2014_Fall_RoguePROMO3 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -452px -865px;
|
||||
background-position: -306px -220px;
|
||||
width: 105px;
|
||||
height: 90px;
|
||||
}
|
||||
.2014_Fall_Warrior_PROMO {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -740px -1275px;
|
||||
background-position: -1295px -1275px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.promo_android {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -1278px -199px;
|
||||
background-position: -813px -151px;
|
||||
width: 175px;
|
||||
height: 175px;
|
||||
}
|
||||
@@ -64,6 +64,12 @@
|
||||
width: 139px;
|
||||
height: 588px;
|
||||
}
|
||||
.promo_backgrounds_armoire_201608 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -452px -442px;
|
||||
width: 140px;
|
||||
height: 439px;
|
||||
}
|
||||
.promo_backtoschool {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -1493px -151px;
|
||||
@@ -78,7 +84,7 @@
|
||||
}
|
||||
.promo_chairs_glasses {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -452px -442px;
|
||||
background-position: -452px -882px;
|
||||
width: 51px;
|
||||
height: 210px;
|
||||
}
|
||||
@@ -96,7 +102,7 @@
|
||||
}
|
||||
.promo_dilatoryDistress {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -1195px -1275px;
|
||||
background-position: -1113px -1275px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
@@ -126,7 +132,7 @@
|
||||
}
|
||||
.promo_enchanted_armoire_201509 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -1377px -1275px;
|
||||
background-position: -182px -1378px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
@@ -138,7 +144,7 @@
|
||||
}
|
||||
.promo_enchanted_armoire_201601 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -182px -1378px;
|
||||
background-position: -364px -1378px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
@@ -150,7 +156,7 @@
|
||||
}
|
||||
.promo_habitica {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -813px -151px;
|
||||
background-position: -1278px -199px;
|
||||
width: 175px;
|
||||
height: 175px;
|
||||
}
|
||||
@@ -174,13 +180,13 @@
|
||||
}
|
||||
.promo_mystery_201405 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -273px -1378px;
|
||||
background-position: -637px -1378px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.promo_mystery_201406 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -452px -956px;
|
||||
background-position: 0px -1378px;
|
||||
width: 90px;
|
||||
height: 96px;
|
||||
}
|
||||
@@ -198,7 +204,7 @@
|
||||
}
|
||||
.promo_mystery_201409 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -546px -1378px;
|
||||
background-position: -819px -1378px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
@@ -210,7 +216,7 @@
|
||||
}
|
||||
.promo_mystery_201411 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -455px -1378px;
|
||||
background-position: -910px -1378px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
@@ -228,13 +234,13 @@
|
||||
}
|
||||
.promo_mystery_201502 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -91px -1378px;
|
||||
background-position: -931px -1275px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.promo_mystery_201503 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: 0px -1378px;
|
||||
background-position: -455px -1378px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
@@ -246,7 +252,7 @@
|
||||
}
|
||||
.promo_mystery_201505 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -1286px -1275px;
|
||||
background-position: -273px -1378px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
@@ -258,31 +264,31 @@
|
||||
}
|
||||
.promo_mystery_201507 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -452px -653px;
|
||||
background-position: -306px -417px;
|
||||
width: 90px;
|
||||
height: 105px;
|
||||
}
|
||||
.promo_mystery_201508 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -306px -402px;
|
||||
background-position: -837px -1275px;
|
||||
width: 93px;
|
||||
height: 90px;
|
||||
}
|
||||
.promo_mystery_201509 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -1013px -1275px;
|
||||
background-position: -1386px -1275px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.promo_mystery_201510 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -306px -311px;
|
||||
background-position: -743px -1275px;
|
||||
width: 93px;
|
||||
height: 90px;
|
||||
}
|
||||
.promo_mystery_201511 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -831px -1275px;
|
||||
background-position: -1204px -1275px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
@@ -300,34 +306,40 @@
|
||||
}
|
||||
.promo_mystery_201602 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -364px -1378px;
|
||||
background-position: -1022px -1275px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.promo_mystery_201603 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -1104px -1275px;
|
||||
background-position: -728px -1378px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.promo_mystery_201604 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -306px -220px;
|
||||
background-position: -649px -1275px;
|
||||
width: 93px;
|
||||
height: 90px;
|
||||
}
|
||||
.promo_mystery_201605 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -649px -1275px;
|
||||
background-position: -546px -1378px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.promo_mystery_201606 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -452px -759px;
|
||||
background-position: -306px -311px;
|
||||
width: 90px;
|
||||
height: 105px;
|
||||
}
|
||||
.promo_mystery_201607 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -91px -1378px;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
}
|
||||
.promo_mystery_3014 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -250px -1275px;
|
||||
@@ -402,13 +414,13 @@
|
||||
}
|
||||
.promo_springclasses2014 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -699px -785px;
|
||||
background-position: -699px -876px;
|
||||
width: 288px;
|
||||
height: 90px;
|
||||
}
|
||||
.promo_springclasses2015 {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -699px -876px;
|
||||
background-position: -699px -785px;
|
||||
width: 288px;
|
||||
height: 90px;
|
||||
}
|
||||
@@ -516,7 +528,7 @@
|
||||
}
|
||||
.welcome_basic_avatars {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -994px -642px;
|
||||
background-position: -1241px -642px;
|
||||
width: 246px;
|
||||
height: 165px;
|
||||
}
|
||||
@@ -528,7 +540,7 @@
|
||||
}
|
||||
.welcome_sample_tasks {
|
||||
background-image: url(spritesmith-largeSprites-0.png);
|
||||
background-position: -1241px -642px;
|
||||
background-position: -994px -642px;
|
||||
width: 246px;
|
||||
height: 165px;
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 384 KiB After Width: | Height: | Size: 397 KiB |
|
Before Width: | Height: | Size: 335 KiB After Width: | Height: | Size: 342 KiB |
|
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 66 KiB |
|
Before Width: | Height: | Size: 147 KiB After Width: | Height: | Size: 146 KiB |
|
Before Width: | Height: | Size: 151 KiB After Width: | Height: | Size: 152 KiB |
|
Before Width: | Height: | Size: 156 KiB After Width: | Height: | Size: 163 KiB |
|
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 80 KiB |
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 130 KiB After Width: | Height: | Size: 126 KiB |
|
Before Width: | Height: | Size: 134 KiB After Width: | Height: | Size: 134 KiB |
|
Before Width: | Height: | Size: 175 KiB After Width: | Height: | Size: 149 KiB |
|
Before Width: | Height: | Size: 377 KiB After Width: | Height: | Size: 401 KiB |
|
Before Width: | Height: | Size: 152 KiB After Width: | Height: | Size: 156 KiB |
|
Before Width: | Height: | Size: 135 KiB After Width: | Height: | Size: 129 KiB |
|
Before Width: | Height: | Size: 149 KiB After Width: | Height: | Size: 152 KiB |
|
After Width: | Height: | Size: 3.1 KiB |
|
After Width: | Height: | Size: 3.4 KiB |
|
After Width: | Height: | Size: 6.9 KiB |
|
After Width: | Height: | Size: 20 KiB |
|
After Width: | Height: | Size: 20 KiB |
|
After Width: | Height: | Size: 20 KiB |
|
After Width: | Height: | Size: 3.1 KiB |
|
After Width: | Height: | Size: 3.0 KiB |
|
After Width: | Height: | Size: 3.0 KiB |
|
After Width: | Height: | Size: 20 KiB |
|
After Width: | Height: | Size: 3.3 KiB |
|
After Width: | Height: | Size: 3.5 KiB |
|
After Width: | Height: | Size: 3.2 KiB |
|
After Width: | Height: | Size: 3.3 KiB |
|
After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 5.0 KiB After Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 7.3 KiB |
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 5.7 KiB |
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.8 KiB |
|
After Width: | Height: | Size: 3.5 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 991 B |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 3.7 KiB |
|
After Width: | Height: | Size: 959 B |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 2.2 KiB |
|
After Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 902 B |
|
After Width: | Height: | Size: 885 B |
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 4.2 KiB |