3.94.0

chore(i18n): update locales
chore(sprites): compile
2026-05-09 19:20:41 -05:00 · 2017-06-01 23:18:07 +00:00 · 2017-06-01 23:17:32 +00:00 · 2017-06-01 23:09:05 +00:00 · 2017-06-01 23:08:00 +00:00 · 2017-05-30 20:59:24 +00:00
9487 changed files with 271496 additions and 163332 deletions
@@ -1,3 +1,3 @@
 {
-  "directory": "website/client/bower_components"
+  "directory": "website/client-old/bower_components"
 }
@@ -0,0 +1,3 @@
+node_modules
+.git
+website
@@ -14,7 +14,7 @@ files:
    owner: root
    group: users
    content: |
-      $(ls -td /opt/elasticbeanstalk/node-install/node-* | head -1)/bin/npm install -g npm@3
+      $(ls -td /opt/elasticbeanstalk/node-install/node-* | head -1)/bin/npm install -g npm@4
 container_commands:
  01_makeBabel:
    command: "touch /tmp/.babel.json"
@@ -1,28 +1,20 @@
 # Compiled and vendored files
-common/dist/
-common/transpiled-babel/
 coverage/
 database_reports/
 website/build/
 website/transpiled-babel/
+website/common/transpiled-babel/
+dist/
+dist-client/

+# Not linted
+website/client-old/
+test/client-old/spec/**/*
+
+# Temporarilly disabled. These should be removed when the linting errors are fixed TODO
 migrations/*
-
-# The files in website/client/js should be moved out and browserified
-website/client/
-
-# Temporarilly disabled. These should be removed when the linting errors are fixed
-common/script/content/index.js
-
-debug-scripts/*
 scripts/*
-tasks/*.js
-gulpfile.js
+website/common/browserify.js
 Gruntfile.js
-newrelic.js
-
-test/api-legacy/**/*
-test/common/simulations/**/*
-test/content/**/*
-test/server_side/**/*
-test/spec/**/*
+gulpfile.js
+gulp
@@ -1,10 +1,10 @@
 {
+  "root": true,
+  "env": {
+    "node": true,
+  },
  "extends": [
-    "habitrpg/server",
-    "habitrpg/babel"
+    "habitrpg",
+    "habitrpg/esnext"
  ],
-  "globals": {
-    "Promise": true,
-    "Set": false
-  }
 }
@@ -1,21 +1,19 @@
-[//]: # (Before logging this issue, look through common problems at https://github.com/HabitRPG/habitrpg/issues If you find your issue there, read at least the first post to see if there is a workaround for you)
+[//]: # (Before logging this issue, please post to the Report a Bug guild from the Habitica website's Help menu. Most bugs can be handled quickly there. If a GitHub issue is needed, you will be advised of that by a moderator or staff member -- a player with a dark blue or purple name. It is recommended that you don't create a new issue unless advised to.)

-[//]: # (Github is primarily used for reporting bugs. If you have a feature request, use "Help > Request a Feature" so that the feature request can be vetted by the larger Habitica community)
+[//]: # (Bugs in the mobile apps can also be reported there.)

-[//]: # (To report a bug in one of the mobile apps, please report it in the correct repository. Android: https://github.com/HabitRPG/habitrpg-android, iOS: https://github.com/HabitRPG/habitrpg-ios)
+[//]: # (If you have a feature request, use "Help > Request a Feature", not GitHub or the Report a Bug guild.)

 [//]: # (For more guidelines see https://github.com/HabitRPG/habitrpg/issues/2760)

 [//]: # (Fill out relevant information - UUID is found in Settings -> API)
-General Info
+### General Info
  * UUID: 
  * Browser: 
  * OS: 

 ### Description
-[//]: # (Describe bug in detail here. Include pictures if helpful.)
-
-
+[//]: # (Describe bug in detail here. Include screenshots if helpful.)

 #### Console Errors
 [//]: # (Include any JavaScript console errors here.)
@@ -9,5 +9,6 @@ Fixes put_issue_url_here


 [//]: # (Put User ID in here - found in Settings -> API)
+
 ----
 UUID: 
@@ -1,18 +1,19 @@
 .DS_Store
-website/client/gen
-website/client/common
-website/client/apidoc
+website/client-old/gen
+website/client-old/common
+website/client-old/apidoc
+website/client-old/js/habitrpg-shared.js*
+website/client-old/css/habitrpg-shared.css
 website/transpiled-babel/
-common/transpiled-babel/
+website/common/transpiled-babel/
 node_modules
 *.swp
 .idea*
 config.json
 npm-debug.log*
 lib
-website/client/bower_components
-website/client/new-stuff.html
-website/build
+website/client-old/bower_components
+website/client-old/new-stuff.html
 newrelic_agent.log
 .bower-tmp
 .bower-registry
@@ -25,14 +26,16 @@ src/*/*.map
 src/*/*/*.map
 test/*.js
 test/*.map
-website/client/docs
+website/client-old/docs
 *.sublime-workspace
 coverage
 coverage.html
 common/dist/scripts/*
-common/dist/sprites/habitrpg-shared.css
-
-test/spec/mocks/translations.js
+dist
+dist-client
+test/client/unit/coverage
+test/client/e2e/reports
+test/client-old/spec/mocks/translations.js

 # Elastic Beanstalk Files
 .elasticbeanstalk/*
@@ -2,9 +2,11 @@ node_modules/**
 .bower-cache/**
 .bower-tmp/**
 .bower-registry/**
+website/client-old/**
 website/client/**
 website/views/**
 website/build/**
+dist/**
 test/**
 .git/**
 Gruntfile.js
@@ -1 +1 @@
-4.3.1
+6
@@ -1,17 +1,35 @@
 language: node_js
 node_js:
-  - '4.3.1'
+  - '6'
+sudo: required
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8
 before_install:
-  - "npm install -g npm@3"
-  - "npm install -g gulp"
-  - "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10"
-  - "echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list"
-  - "sudo apt-get update"
-  - "sudo apt-get install mongodb-org-server"
+  - $CXX --version
+  - npm install -g npm@4
+  - if [ $REQUIRES_SERVER ]; then sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10; echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list; sudo apt-get update; sudo apt-get install mongodb-org-server; fi
+install:
+  - npm install &> npm.install.log || (cat npm.install.log; false)
 before_script:
-  - 'npm install -g grunt-cli mocha'
+  - npm run test:build
  - cp config.json.example config.json
-  - "until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 1; done"
-  - "export DISPLAY=:99"
-after_script:
-  - "./node_modules/.bin/lcov-result-merger 'coverage/**/*.info' | ./node_modules/coveralls/bin/coveralls.js"
+  - if [ $REQUIRES_SERVER ]; then until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 1; done; export DISPLAY=:99; fi
+script:
+  - npm run $TEST
+  - if [ $COVERAGE ]; then ./node_modules/.bin/lcov-result-merger 'coverage/**/*.info' | ./node_modules/coveralls/bin/coveralls.js; fi
+env:
+  global:
+    - CXX=g++-4.8
+    - DISABLE_REQUEST_LOGGING=true
+  matrix:
+    - TEST="lint"
+    - TEST="test:api-v3" REQUIRES_SERVER=true COVERAGE=true
+    - TEST="test:sanity"
+    - TEST="test:content" COVERAGE=true
+    - TEST="test:common" COVERAGE=true
+    - TEST="test:karma" COVERAGE=true
+    - TEST="client:unit" COVERAGE=true
@@ -1,41 +1,16 @@
-FROM ubuntu:trusty
-
-MAINTAINER Sabe Jones <sabe@habitica.com>
-
-# Avoid ERROR: invoke-rc.d: policy-rc.d denied execution of start.
-RUN echo -e '#!/bin/sh\nexit 0' > /usr/sbin/policy-rc.d
-
-# Install prerequisites
-RUN apt-get update
-RUN apt-get install -y \
-    build-essential \
-    curl \
-    git \
-    libfontconfig1 \
-    libfreetype6 \
-    libkrb5-dev \
-    python
-
-# Install NodeJS
-RUN curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -
-RUN apt-get install -y nodejs
-
-# Clean up package management
-RUN apt-get clean
-RUN rm -rf /var/lib/apt/lists/*
+FROM node:boron

 # Install global packages
-RUN npm install -g npm@3
-RUN npm install -g gulp grunt-cli bower
+RUN npm install -g gulp grunt-cli bower mocha

 # Clone Habitica repo and install dependencies
-WORKDIR /habitrpg
-RUN git clone https://github.com/HabitRPG/habitrpg.git /habitrpg
+RUN mkdir -p /usr/src/habitrpg
+WORKDIR /usr/src/habitrpg
+RUN git clone https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
 RUN npm install
 RUN bower install --allow-root

-# Create environment config file and build directory
-RUN cp config.json.example config.json
+# Create Build dir
 RUN mkdir -p ./website/build

 # Start Habitica
@@ -9,10 +9,10 @@ module.exports = function(grunt) {

    karma: {
      unit: {
-        configFile: 'karma.conf.js'
+        configFile: 'test/client-old/spec/karma.conf.js'
      },
      continuous: {
-        configFile: 'karma.conf.js',
+        configFile: 'test/client-old/spec/karma.conf.js',
        singleRun: true,
        autoWatch: false
      }
@@ -28,11 +28,11 @@ module.exports = function(grunt) {
          report: 'gzip'
        },
        files:{
-          "common/dist/sprites/habitrpg-shared.css": [
-            "common/dist/sprites/spritesmith*.css",
-            "common/css/backer.css",
-            "common/css/Mounts.css",
-            "common/css/index.css"
+          "website/client-old/css/habitrpg-shared.css": [
+            "website/assets/sprites/dist/spritesmith*.css",
+            "website/assets/sprites/css/backer.css",
+            "website/assets/sprites/css/Mounts.css",
+            "website/assets/sprites/css/index.css"
          ]
        }
      }
@@ -43,11 +43,11 @@ module.exports = function(grunt) {
        options: {
          compress: false, // AFTER
          'include css': true,
-          paths: ['website/client']
+          paths: ['website/client-old']
        },
        files: {
-          'website/build/app.css': ['website/client/css/index.styl'],
-          'website/build/static.css': ['website/client/css/static.styl']
+          'website/build/app.css': ['website/client-old/css/index.styl'],
+          'website/build/static.css': ['website/client-old/css/static.styl']
        }
      }
    },
@@ -55,13 +55,13 @@ module.exports = function(grunt) {
    copy: {
      build: {
        files: [
-          {expand: true, cwd: 'website/client/', src: 'favicon.ico', dest: 'website/build/'},
-          {expand: true, cwd: 'website/client/', src: 'favicon_192x192.png', dest: 'website/build/'},
-          {expand: true, cwd: '', src: 'common/dist/sprites/spritesmith*.png', dest: 'website/build/'},
-          {expand: true, cwd: '', src: 'common/img/sprites/backer-only/*.gif', dest: 'website/build/'},
-          {expand: true, cwd: '', src: 'common/img/sprites/npc_ian.gif', dest: 'website/build/'},
-          {expand: true, cwd: '', src: 'common/img/sprites/quest_*.gif', dest: 'website/build/'},
-          {expand: true, cwd: 'website/client/', src: 'bower_components/bootstrap/dist/fonts/*', dest: 'website/build/'}
+          {expand: true, cwd: 'website/client-old/', src: 'favicon.ico', dest: 'website/build/'},
+          {expand: true, cwd: 'website/client-old/', src: 'favicon_192x192.png', dest: 'website/build/'},
+          {expand: true, cwd: 'website/assets/sprites/dist/', src: 'spritesmith*.png', dest: 'website/build/static/sprites'},
+          {expand: true, cwd: 'website/assets/sprites/', src: 'backer-only/*.gif', dest: 'website/build/'},
+          {expand: true, cwd: 'website/assets/sprites/', src: 'npc_ian.gif', dest: 'website/build/'},
+          {expand: true, cwd: 'website/assets/sprites/', src: 'quest_*.gif', dest: 'website/build/'},
+          {expand: true, cwd: 'website/client-old/', src: 'bower_components/bootstrap/dist/fonts/*', dest: 'website/build/'}
        ]
      }
    },
@@ -77,10 +77,9 @@ module.exports = function(grunt) {
          'website/build/*.css',
          'website/build/favicon.ico',
          'website/build/favicon_192x192.png',
-          'website/build/common/dist/sprites/*.png',
-          'website/build/common/img/sprites/backer-only/*.gif',
-          'website/build/common/img/sprites/npc_ian.gif',
-          'website/build/common/img/sprites/quest_*.gif',
+          'website/build/*.png',
+          'website/build/static/sprites/*.png',
+          'website/build/*.gif',
          'website/build/bower_components/bootstrap/dist/fonts/*'
        ],
        dest: 'website/build/*.css'
@@ -88,9 +87,9 @@ module.exports = function(grunt) {
    }
  });

-  //Load build files from client/manifest.json
-  grunt.registerTask('loadManifestFiles', 'Load all build files from client/manifest.json', function(){
-    var files = grunt.file.readJSON('./website/client/manifest.json');
+  //Load build files from client-old/manifest.json
+  grunt.registerTask('loadManifestFiles', 'Load all build files from client-old/manifest.json', function(){
+    var files = grunt.file.readJSON('./website/client-old/manifest.json');
    var uglify = {};
    var cssmin = {};

@@ -101,7 +100,7 @@ module.exports = function(grunt) {
      _.each(files[key].js, function(val){
        var path = "./";
        if( val.indexOf('common/') == -1)
-          path = './website/client/';
+          path = './website/client-old/';
        js.push(path + val);
      });

@@ -110,7 +109,7 @@ module.exports = function(grunt) {
      _.each(files[key].css, function(val){
        var path = "./";
        if( val.indexOf('common/') == -1) {
-          path = (val == 'app.css' || val == 'static.css') ?  './website/build/' : './website/client/';
+          path = (val == 'app.css' || val == 'static.css') ?  './website/build/' : './website/client-old/';
        }
        css.push(path + val)
      });
@@ -122,21 +121,13 @@ module.exports = function(grunt) {

    grunt.config.set('cssmin.build.files', cssmin);
    // Rewrite urls to relative path
-    grunt.config.set('cssmin.build.options', {'target': 'website/client/css/whatever-css.css'});
+    grunt.config.set('cssmin.build.options', {'target': 'website/client-old/css/whatever-css.css'});
  });

  // Register tasks.
  grunt.registerTask('build:prod', ['loadManifestFiles', 'clean:build', 'uglify', 'stylus', 'cssmin', 'copy:build', 'hashres']);
  grunt.registerTask('build:dev', ['cssmin', 'stylus']);
-  grunt.registerTask('build:test', ['test:prepare:translations', 'build:dev']);
-
-  grunt.registerTask('test:prepare:translations', function() {
-    var i18n  = require('./website/server/libs/i18n'),
-        fs    = require('fs');
-    fs.writeFileSync('test/spec/mocks/translations.js',
-      "if(!window.env) window.env = {};\n" +
-      "window.env.translations = " + JSON.stringify(i18n.translations['en']) + ';');
-  });
+  grunt.registerTask('build:test', ['build:dev']);

  // Load tasks
  grunt.loadNpmTasks('grunt-contrib-uglify');
@@ -146,6 +137,6 @@ module.exports = function(grunt) {
  grunt.loadNpmTasks('grunt-contrib-copy');
  grunt.loadNpmTasks('grunt-contrib-watch');
  grunt.loadNpmTasks('grunt-hashres');
-  grunt.loadNpmTasks('grunt-karma');
+  if (process.env.NODE_ENV !== 'production') grunt.loadNpmTasks('grunt-karma');

 };
@@ -1,30 +1,11 @@
-Habitica [![Build Status](https://travis-ci.org/HabitRPG/habitrpg.svg?branch=develop)](https://travis-ci.org/HabitRPG/habitrpg) [![Code Climate](https://codeclimate.com/github/HabitRPG/habitrpg.svg)](https://codeclimate.com/github/HabitRPG/habitrpg) [![Coverage Status](https://coveralls.io/repos/HabitRPG/habitrpg/badge.svg?branch=develop)](https://coveralls.io/r/HabitRPG/habitrpg?branch=develop) [![Bountysource](https://api.bountysource.com/badge/tracker?tracker_id=68393)](https://www.bountysource.com/trackers/68393-habitrpg?utm_source=68393&utm_medium=shield&utm_campaign=TRACKER_BADGE)
+Habitica [![Build Status](https://travis-ci.org/HabitRPG/habitica.svg?branch=develop)](https://travis-ci.org/HabitRPG/habitica) [![Code Climate](https://codeclimate.com/github/HabitRPG/habitrpg.svg)](https://codeclimate.com/github/HabitRPG/habitrpg) [![Coverage Status](https://coveralls.io/repos/github/HabitRPG/habitica/badge.svg?branch=develop)](https://coveralls.io/github/HabitRPG/habitica?branch=develop) [![Bountysource](https://api.bountysource.com/badge/tracker?tracker_id=68393)](https://www.bountysource.com/trackers/68393-habitrpg?utm_source=68393&utm_medium=shield&utm_campaign=TRACKER_BADGE)
 ===============

 [Habitica](https://habitica.com) is an open source habit building program which treats your life like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.

 We need more programmers! Your assistance will be greatly appreciated.

-For an introduction to the technologies used and how the software is organized, refer to [Contributing to Habitica](http://habitica.wikia.com/wiki/Contributing_to_Habitica#Coders_.28Web_.26_Mobile.29) - "Coders (Web & Mobile)" section.
+For an introduction to the technologies used and how the software is organized, refer to [Guidance for Blacksmiths](http://habitica.wikia.com/wiki/Guidance_for_Blacksmiths).

-To set up a local install of Habitica for development and testing, see [Setting up Habitica Locally](http://habitica.wikia.com/wiki/Setting_up_Habitica_Locally), which contains instructions for Windows, *nix / Mac OS, and Vagrant.
+To set up a local install of Habitica for development and testing on various platforms, see [Setting up Habitica Locally](http://habitica.wikia.com/wiki/Setting_up_Habitica_Locally).

-Then read [Guidance for Blacksmiths](http://habitica.wikia.com/wiki/Guidance_for_Blacksmiths) for additional instructions and useful tips.
-
-## Debug Scripts
-
-In the `./debug-scripts/` folder, there are a few files. Here's a sample:
-
-```bash
-grant-all-equipment.js
-grant-all-mounts.js
-grant-all-pets.js
-```
-
-You can run them by doing:
-
-```bash
-node debug-scripts/name-of-script.js
-```
-
-If there are more arguments required to make the script work, it will print out the usage and an explanation of what the script does.
@@ -9,7 +9,7 @@
  "ignore": [
    "**/.*",
    "node_modules",
-    "website/client/bower_components",
+    "website/client-old/bower_components",
    "test",
    "tests"
  ],
@@ -30,20 +30,21 @@
    "bootstrap-tour": "0.10.1",
    "css-social-buttons": "samcollins/css-social-buttons#v1.1.1 ",
    "github-buttons": "mdo/github-buttons#v3.0.0",
-    "hello": "1.13.4",
+    "hello": "1.14.1",
    "jquery": "2.1.0",
    "jquery-colorbox": "1.4.36",
    "jquery-ui": "1.10.3",
    "jquery.cookie": "1.4.0",
    "js-emoji": "snicker/js-emoji#f25d8a303f",
-    "ngInfiniteScroll": "1.0.0",
+    "ngInfiniteScroll": "1.1.0",
    "pnotify": "1.3.1",
    "sticky": "1.0.3",
    "swagger-ui": "wordnik/swagger-ui#v2.0.24",
    "smart-app-banner": "78ef9c0679723b25be1a0ae04f7b4aef7cbced4f",
    "habitica-markdown": "1.2.2",
    "pusher-js-auth": "^2.0.0",
-    "pusher-websocket-iso": "pusher#^3.1.0"
+    "pusher-websocket-iso": "pusher#^3.2.0",
+    "taggle": "^1.11.1"
  },
  "devDependencies": {
    "angular-mocks": "1.3.9"
@@ -1,4 +0,0 @@
-{
-  "extends": "habitrpg/browser"
-}
-
@@ -1,16 +0,0 @@
-# Common
-
-Shared resources useful for the multiple Habitica repositories, that way all the repositories remain in-sync with common characteristics. Includes things like:
-
- * Assets - sprites, images, etc
- * CSS - especially, esp. sprite-sheet mapping
- * Algorithms - level up algorithm, scoring functions, etc
- * View helper functions that may come in handy for multiple client MVCs
- * Item definitions - weapons, armor, pets 
-
-## Compiling spritesheets
-Because of some wonkiness with Heroku, the spritesheet compilation is not part of the production build process and must be done manually when new images are added by running: 
-
-``` bash
-npm run sprites
-```
@@ -1,60 +0,0 @@
-/* These sprites are oversized until a move to 105 avatar box happens*/
-
-/* Backer */
-.weapon_special_0, .head_special_0 {
-  width: 105px;
-  height: 105px;
-  margin-left: -3px;
-  margin-top: -18px;
-}
-.slim_armor_special_0, .broad_armor_special_0, .shield_special_0 {
-  width: 90px;
-  height: 90px;
-}
-
-/* Critical */
-.weapon_special_critical {
-  background: url("/common/img/sprites/backer-only/weapon_special_critical.gif") no-repeat;
-  width: 90px;
-  height: 90px;
-  margin-left:-12px;
-  margin-top:12px;
-}
-
-/* This is oversized until a move to 105 avatar box happens*/
-.weapon_special_1 {
-  margin-left: -12px;
-}
-.broad_armor_special_1, .slim_armor_special_1, .head_special_1 {
-  width: 90px;
-  height: 90px;
-}
-
-.head_special_0 {
-  background: url("/common/img/sprites/backer-only/BackerOnly-Equip-ShadeHelmet.gif") no-repeat;
-}
-.head_special_1 {
-  background: url("/common/img/sprites/backer-only/ContributorOnly-Equip-CrystalHelmet.gif") no-repeat;
-  margin-top: 3px;
-}
-
-.broad_armor_special_0,.slim_armor_special_0 {
-  background: url("/common/img/sprites/backer-only/BackerOnly-Equip-ShadeArmor.gif") no-repeat;
-}
-.broad_armor_special_1,.slim_armor_special_1 {
-  background: url("/common/img/sprites/backer-only/ContributorOnly-Equip-CrystalArmor.gif") no-repeat;
-}
-
-.shield_special_0 {
-  background: url("/common/img/sprites/backer-only/BackerOnly-Shield-TormentedSkull.gif") no-repeat;
-}
-
-.weapon_special_0 {
-  background: url("/common/img/sprites/backer-only/BackerOnly-Weapon-DarkSoulsBlade.gif") no-repeat;
-}
-
-.Pet-Wolf-Cerberus {
-  width: 105px;
-  height: 72px;
-  background: url("/common/img/sprites/backer-only/BackerOnly-Pet-CerberusPup.gif") no-repeat;
-}
@@ -1,16 +0,0 @@
-{{#sprites}}
-.{{name}} {
-  background-image: url({{{escaped_image}}});
-  background-position: {{px.offset_x}} {{px.offset_y}};
-  width: {{px.width}};
-  height: {{px.height}};
-}
-{{#if custom}}
-.customize-option.{{name}} {
-  background-image: url({{{escaped_image}}});
-  background-position: {{custom.px.offset_x}} {{custom.px.offset_y}};
-  width: {{custom.px.width}};
-  height: {{custom.px.height}};
-}
-{{/if}}
-{{/sprites}}
@@ -1,61 +0,0 @@
-/* Comment out for holiday events */
-.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;
-  width: 219px;
-  height: 249px;
-}
-
-.quest_bewilder {
-  background: url("/common/img/sprites/quest_bewilder.gif") no-repeat;
-  width: 219px;
-  height: 219px;
-}
-
-.Gems {
-  display:inline-block;
-  margin-right:5px;
-  border-style:none;
-  margin-left:0px;
-  margin-top:2px;
-}
-
-.inline-gems {
-  vertical-align: middle;
-  margin-left: 0px;
-  display: inline-block;
-}
-
-/* Both */
-.customize-menu .locked {
-  background-color: #727272;
-}
-
-/* FIXME figure out how to handle customize menu!! */
-/*.customize-menu .f_head_0       {width: 60px; height: 60px; background-position: -1917px -9px;}*/
-
-.achievement {
-  float:left;
-  clear:right;
-  margin-right: 10px;
-}
-
-.multi-achievement {
-  margin: auto;
-  padding-left: 0.5em;
-  padding-right: 0.5em;
-}
-
-[class*="Mount_Head_"], [class*="Mount_Body_"]{
-  margin-top:18px; /* Sprite accommodates 105x123 box */
-}
-
-.Pet_Currency_Gem {
-  margin-top: 5px;
-  margin-bottom: 5px
-}
@@ -1,576 +0,0 @@
-.2014_Fall_HealerPROMO2 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1092px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.2014_Fall_Mage_PROMO9 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1513px -808px;
-  width: 120px;
-  height: 90px;
-}
-.2014_Fall_RoguePROMO3 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -769px -1378px;
-  width: 105px;
-  height: 90px;
-}
-.2014_Fall_Warrior_PROMO {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1433px -1378px;
-  width: 90px;
-  height: 90px;
-}
-.promo_android {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -954px -151px;
-  width: 175px;
-  height: 175px;
-}
-.promo_backgrounds_armoire_201602 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1135px -199px;
-  width: 141px;
-  height: 294px;
-}
-.promo_backgrounds_armoire_201603 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1277px -199px;
-  width: 141px;
-  height: 294px;
-}
-.promo_backgrounds_armoire_201604 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -281px -525px;
-  width: 140px;
-  height: 441px;
-}
-.promo_backgrounds_armoire_201605 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px 0px;
-  width: 140px;
-  height: 441px;
-}
-.promo_backgrounds_armoire_201606 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -140px -525px;
-  width: 140px;
-  height: 447px;
-}
-.promo_backgrounds_armoire_201607 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -525px;
-  width: 139px;
-  height: 588px;
-}
-.promo_backgrounds_armoire_201608 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -593px 0px;
-  width: 140px;
-  height: 439px;
-}
-.promo_backgrounds_armoire_201609 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -593px -440px;
-  width: 139px;
-  height: 438px;
-}
-.promo_backtoschool {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -151px -1378px;
-  width: 150px;
-  height: 150px;
-}
-.promo_burnout {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -734px -151px;
-  width: 219px;
-  height: 240px;
-}
-.promo_chairs_glasses {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1634px 0px;
-  width: 51px;
-  height: 210px;
-}
-.promo_classes_fall_2014 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -734px -684px;
-  width: 321px;
-  height: 100px;
-}
-.promo_classes_fall_2015 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1135px -808px;
-  width: 377px;
-  height: 99px;
-}
-.promo_cow {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px -442px;
-  width: 140px;
-  height: 441px;
-}
-.promo_dilatoryDistress {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -546px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_egg_mounts {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1135px -494px;
-  width: 280px;
-  height: 147px;
-}
-.promo_enchanted_armoire {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1114px;
-  width: 374px;
-  height: 76px;
-}
-.promo_enchanted_armoire_201507 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -250px -1275px;
-  width: 217px;
-  height: 90px;
-}
-.promo_enchanted_armoire_201508 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -468px -1275px;
-  width: 180px;
-  height: 90px;
-}
-.promo_enchanted_armoire_201509 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -728px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_enchanted_armoire_201511 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1498px -908px;
-  width: 122px;
-  height: 90px;
-}
-.promo_enchanted_armoire_201601 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -910px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_floral_potions {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -734px -785px;
-  width: 105px;
-  height: 273px;
-}
-.promo_habitica {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1419px -199px;
-  width: 175px;
-  height: 175px;
-}
-.promo_habitica_sticker {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -220px;
-  width: 305px;
-  height: 304px;
-}
-.promo_haunted_hair {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -453px -1378px;
-  width: 100px;
-  height: 137px;
-}
-.promo_item_notif {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1275px;
-  width: 249px;
-  height: 102px;
-}
-.promo_mystery_201405 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1001px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201406 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -182px -1529px;
-  width: 90px;
-  height: 96px;
-}
-.promo_mystery_201407 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1634px -412px;
-  width: 42px;
-  height: 62px;
-}
-.promo_mystery_201408 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1573px -494px;
-  width: 60px;
-  height: 71px;
-}
-.promo_mystery_201409 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1183px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201410 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1060px -573px;
-  width: 72px;
-  height: 63px;
-}
-.promo_mystery_201411 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1274px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201412 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1634px -345px;
-  width: 42px;
-  height: 66px;
-}
-.promo_mystery_201501 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1634px -211px;
-  width: 48px;
-  height: 63px;
-}
-.promo_mystery_201502 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1365px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201503 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -819px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201504 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1573px -566px;
-  width: 60px;
-  height: 69px;
-}
-.promo_mystery_201505 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -637px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201506 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1634px -275px;
-  width: 42px;
-  height: 69px;
-}
-.promo_mystery_201507 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1529px;
-  width: 90px;
-  height: 105px;
-}
-.promo_mystery_201508 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1157px -1378px;
-  width: 93px;
-  height: 90px;
-}
-.promo_mystery_201509 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -364px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201510 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1063px -1378px;
-  width: 93px;
-  height: 90px;
-}
-.promo_mystery_201511 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1524px -1378px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201512 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1565px -96px;
-  width: 60px;
-  height: 81px;
-}
-.promo_mystery_201601 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1496px -1011px;
-  width: 120px;
-  height: 90px;
-}
-.promo_mystery_201602 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px -1378px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201603 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1251px -1378px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201604 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -969px -1378px;
-  width: 93px;
-  height: 90px;
-}
-.promo_mystery_201605 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -455px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201606 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -91px -1529px;
-  width: 90px;
-  height: 105px;
-}
-.promo_mystery_201607 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -273px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201608 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -875px -1378px;
-  width: 93px;
-  height: 90px;
-}
-.promo_mystery_3014 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -840px -967px;
-  width: 217px;
-  height: 90px;
-}
-.promo_orca {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -554px -1378px;
-  width: 105px;
-  height: 105px;
-}
-.promo_partyhats {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -954px -327px;
-  width: 115px;
-  height: 47px;
-}
-.promo_pastel_skin {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -331px -1191px;
-  width: 330px;
-  height: 83px;
-}
-.customize-option.promo_pastel_skin {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -356px -1206px;
-  width: 60px;
-  height: 60px;
-}
-.promo_peppermint_flame {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -593px -879px;
-  width: 140px;
-  height: 147px;
-}
-.promo_pet_skins {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px -884px;
-  width: 140px;
-  height: 147px;
-}
-.customize-option.promo_pet_skins {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -477px -899px;
-  width: 60px;
-  height: 60px;
-}
-.promo_shimmer_hair {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1191px;
-  width: 330px;
-  height: 83px;
-}
-.promo_splashyskins {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1419px -375px;
-  width: 198px;
-  height: 91px;
-}
-.customize-option.promo_splashyskins {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1444px -390px;
-  width: 60px;
-  height: 60px;
-}
-.promo_spring_classes_2016 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1135px -908px;
-  width: 362px;
-  height: 102px;
-}
-.promo_springclasses2014 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -840px -876px;
-  width: 288px;
-  height: 90px;
-}
-.promo_springclasses2015 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -840px -785px;
-  width: 288px;
-  height: 90px;
-}
-.promo_staff_spotlight_Lemoness {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -220px;
-  width: 102px;
-  height: 146px;
-}
-.promo_staff_spotlight_Viirus {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1005px -392px;
-  width: 119px;
-  height: 147px;
-}
-.promo_staff_spotlight_paglias {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -367px;
-  width: 99px;
-  height: 147px;
-}
-.promo_summer_classes_2014 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1135px -96px;
-  width: 429px;
-  height: 102px;
-}
-.promo_summer_classes_2015 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -140px -973px;
-  width: 300px;
-  height: 88px;
-}
-.promo_summer_classes_2016 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -734px 0px;
-  width: 400px;
-  height: 150px;
-}
-.promo_takeThis_gear {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -649px -1275px;
-  width: 114px;
-  height: 87px;
-}
-.promo_takethis_armor {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -764px -1275px;
-  width: 114px;
-  height: 87px;
-}
-.promo_unconventional_armor {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1056px -684px;
-  width: 60px;
-  height: 60px;
-}
-.promo_updos {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1416px -494px;
-  width: 156px;
-  height: 147px;
-}
-.promo_veteran_pets {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -528px -1114px;
-  width: 146px;
-  height: 75px;
-}
-.promo_winter_classes_2016 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1135px -1011px;
-  width: 360px;
-  height: 90px;
-}
-.promo_winterclasses2015 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -734px -573px;
-  width: 325px;
-  height: 110px;
-}
-.promo_winteryhair {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -375px -1114px;
-  width: 152px;
-  height: 75px;
-}
-.avatar_variety {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1135px 0px;
-  width: 498px;
-  height: 95px;
-}
-.npc_viirus {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -660px -1378px;
-  width: 108px;
-  height: 90px;
-}
-.party_preview {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px 0px;
-  width: 451px;
-  height: 219px;
-}
-.scene_coding {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -302px -1378px;
-  width: 150px;
-  height: 150px;
-}
-.scene_phone_peek {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1378px;
-  width: 150px;
-  height: 150px;
-}
-.welcome_basic_avatars {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1135px -642px;
-  width: 246px;
-  height: 165px;
-}
-.welcome_promo_party {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -734px -392px;
-  width: 270px;
-  height: 180px;
-}
-.welcome_sample_tasks {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1382px -642px;
-  width: 246px;
-  height: 165px;
-}
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .3.1