Merge remote-tracking branch 'upstream/develop' into bugfix-npc-style

Updating bugfix-npc-style with recent code from upstream/develop branch.

website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css

@@ -1,6 +1,6 @@
 .promo_armoire_backgrounds_202001 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -424px -175px;
+  background-position: 0px -323px;
   width: 423px;
   height: 147px;
 }
@@ -16,6 +16,12 @@
   width: 279px;
   height: 147px;
 }
+.promo_seasonal_shop {
+  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -521px -619px;
+  width: 162px;
+  height: 138px;
+}
 .promo_snowballs {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: 0px 0px;
@@ -30,13 +36,13 @@
 }
 .promo_winter_potions_2020 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -323px;
+  background-position: 0px -175px;
   width: 423px;
   height: 147px;
 }
 .promo_winter_quests_bundle {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -175px;
+  background-position: -424px -175px;
   width: 423px;
   height: 147px;
 }
@@ -54,7 +60,7 @@
 }
 .promo_wintery_hair {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -521px -619px;
+  background-position: -684px -619px;
   width: 152px;
   height: 75px;
 }

website/client/src/components/ui/textarea.stories.js

@@ -0,0 +1,28 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import { storiesOf } from '@storybook/vue';
+import { text, withKnobs } from '@storybook/addon-knobs';
+
+const stories = storiesOf('Textare', module);
+
+stories.addDecorator(withKnobs);
+
+stories
+  .add('states', () => ({
+    components: { },
+    template: `
+      <div style="position: absolute; margin: 20px">
+        <textarea autofocus ref="area">Normal {{text}}</textarea>  <button @click="$refs.area.focus()">Focus</button>
+        <br />
+
+        <textarea disabled>Disabled {{text}}</textarea><br />
+
+        <textarea readonly>Readonly {{text}}</textarea> <br />
+
+      </div>
+    `,
+    props: {
+      text: {
+        default: text('Area Message', 'example text'),
+      },
+    },
+  }));

website/client/src/pages/private-messages.vue

@@ -403,14 +403,6 @@
       vertical-align: bottom;
       border-radius: 2px;
       z-index: 5;
-      border: solid 1px $gray-400;
-      opacity: 0.64;
-      background-color: $gray-500;
-
-      &:focus, &.has-content {
-        opacity: 1;
-        background-color: $white;
-      }
     }
   }