diff --git a/website/client/src/components/avatarModal/body-settings.vue b/website/client/src/components/avatarModal/body-settings.vue
index 01baf53f96..42c8bf16ce 100644
--- a/website/client/src/components/avatarModal/body-settings.vue
+++ b/website/client/src/components/avatarModal/body-settings.vue
@@ -1,7 +1,8 @@
-
+
diff --git a/website/client/src/components/avatarModal/extra-settings.vue b/website/client/src/components/avatarModal/extra-settings.vue
index a73c53a754..1103e83d56 100644
--- a/website/client/src/components/avatarModal/extra-settings.vue
+++ b/website/client/src/components/avatarModal/extra-settings.vue
@@ -66,7 +66,7 @@
>
{{ $t('noItemsOwned') }}
@@ -643,6 +643,10 @@
line-height: 24px;
}
+ .padding-fix {
+ padding-top: 1px;
+ }
+
.purchase-all {
margin-bottom: 1em;
}
diff --git a/website/client/src/mixins/avatarEditUtilities.js b/website/client/src/mixins/avatarEditUtilities.js
index fcfb565bcb..a61eded2cc 100644
--- a/website/client/src/mixins/avatarEditUtilities.js
+++ b/website/client/src/mixins/avatarEditUtilities.js
@@ -70,7 +70,7 @@ export const avatarEditorUtilities = { // eslint-disable-line import/prefer-defa
}
case 'hair': {
if (subType === 'color') {
- str += `hair_bangs_1_${key}`; // todo get current hair-bang setting
+ str += `hair_bangs_${this.user.preferences.hair.bangs || 1}_${key}`; // todo get current hair-bang setting
} else {
str += `hair_${subType}_${key}_${this.user.preferences.hair.color}`;
}
@@ -81,8 +81,7 @@ export const avatarEditorUtilities = { // eslint-disable-line import/prefer-defa
break;
}
default: {
- // `hair_base_${option.key}_${user.preferences.hair.color}`
- // console.warn('unknown type', type, key);
+ throw new Error(`unknown type ${type} ${subType} ${key}`);
}
}
diff --git a/website/common/locales/en/customizations.json b/website/common/locales/en/customizations.json
index 391d820729..79069158b4 100644
--- a/website/common/locales/en/customizations.json
+++ b/website/common/locales/en/customizations.json
@@ -128,5 +128,6 @@
"checkNextMonth": "Be sure to check back later for next month's options!",
"checkNextSeason": "Be sure to check back later for next season's options!",
"noItemsOwned": "You don't own any of these items",
- "visitCustomizationsShop": "Head over to the
Customizations Shop to browse the many ways you can customize your avatar!"
+ "visitCustomizationsShop": "Head over to the
Customizations Shop to browse the many ways you can customize your avatar!",
+ "lookingForMore": "Looking for more?"
}
\ No newline at end of file
diff --git a/website/common/script/content/constants/schedule.js b/website/common/script/content/constants/schedule.js
index 94a164bc93..27e1277f47 100644
--- a/website/common/script/content/constants/schedule.js
+++ b/website/common/script/content/constants/schedule.js
@@ -856,10 +856,10 @@ export function getScheduleMatchingGroup (type, date) {
cachedScheduleMatchers[matcher.type] = makeMatcherClass();
}
let end = moment(checkedDate);
- end.date(TYPE_SCHEDULE[type]);
+ end.date(TYPE_SCHEDULE[matcher.type]);
if (end.date() <= moment(checkedDate).date()) {
end = moment(end).add(1, 'months');
- }
+ }
cachedScheduleMatchers[matcher.type].end = end.toDate();
if (matcher.matcher instanceof Function) {
cachedScheduleMatchers[matcher.type].matchers.push(matcher.matcher);
diff --git a/website/common/script/libs/getItemInfo.js b/website/common/script/libs/getItemInfo.js
index 4e75823eef..ac125249d6 100644
--- a/website/common/script/libs/getItemInfo.js
+++ b/website/common/script/libs/getItemInfo.js
@@ -384,7 +384,7 @@ export default function getItemInfo (user, type, item, officialPinnedItems, lang
case 'haircolor': {
itemInfo = {
key: item.key,
- class: `hair hair_bangs_${user.preferences.hair.bangs}_${item.key}`,
+ class: `hair hair_bangs_${user.preferences.hair.bangs || 1}_${item.key}`,
currency: 'gems',
locked: false,
notes: '',