krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source
This commit is contained in:
Sabe Jones
2020-01-07 11:48:09 -06:00
parent 3fa8ba1a7d 10ed4ea712
commit fe9af263dd
89 changed files with 25758 additions and 25776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/client/src/components/creatorIntro.vue
View File

@@ -121,7 +121,7 @@
v-if="editing"
class="menu-container col-2"
:class="{active: activeTopPage === 'backgrounds'}"
@click="changeTopPage('backgrounds', '2019')"
@click="changeTopPage('backgrounds', '2020')"
>
<div class="menu-item">
<div
@@ -1160,7 +1160,7 @@ export default {
},
],
bgSubMenuItems: ['2019', '2018', '2017', '2016', '2015', '2014'].map(y => ({
bgSubMenuItems: ['2020', '2019', '2018', '2017', '2016', '2015', '2014'].map(y => ({
id: y,
label: y,
})),
@@ -1183,6 +1183,7 @@ export default {
2017: [],
2018: [],
2019: [],
2020: [],
};
// Hack to force update for now until we restructure the data