diff --git a/website/client/src/components/appFooter.vue b/website/client/src/components/appFooter.vue index b099b4bdf2..1a08d291a6 100644 --- a/website/client/src/components/appFooter.vue +++ b/website/client/src/components/appFooter.vue @@ -131,13 +131,6 @@ >{{ $t('requestFeature') }} -
  • - {{ $t('wiki') }} - -
    • diff --git a/website/client/src/components/header/menu.vue b/website/client/src/components/header/menu.vue index 3292277d4c..12bd9f8af7 100644 --- a/website/client/src/components/header/menu.vue +++ b/website/client/src/components/header/menu.vue @@ -334,11 +334,6 @@ href="https://docs.google.com/forms/d/e/1FAIpQLScPhrwq_7P1C6PTrI3lbvTsvqGyTNnGzp1ugi1Ml0PFee_p5g/viewform?usp=sf_link" target="_blank" >{{ $t('requestFeature') }} - {{ $t('wiki') }} diff --git a/website/client/src/components/inventory/equipment/index.vue b/website/client/src/components/inventory/equipment/index.vue index fb921fbbe4..4b3ad2427c 100644 --- a/website/client/src/components/inventory/equipment/index.vue +++ b/website/client/src/components/inventory/equipment/index.vue @@ -106,7 +106,7 @@
    -
    +
    -
    - {{ $t('petLikeToEat') + ' ' }} - -
    - -
    -     + {{ $t('petLikeToEat') }} +
    @@ -80,7 +68,6 @@ import _filter from 'lodash/filter'; import { mapState } from '@/libs/store'; import inventoryUtils from '@/mixins/inventoryUtils'; -import svgInformation from '@/assets/svg/information.svg'; import Drawer from '@/components/ui/drawer'; import DrawerSlider from '@/components/ui/drawerSlider'; @@ -127,10 +114,6 @@ export default { }, ], selectedDrawerTab: this.defaultSelectedTab, - - icons: Object.freeze({ - information: svgInformation, - }), }; }, computed: { diff --git a/website/client/src/components/tasks/taskModal.vue b/website/client/src/components/tasks/taskModal.vue index 80a22ecc57..7577990f55 100644 --- a/website/client/src/components/tasks/taskModal.vue +++ b/website/client/src/components/tasks/taskModal.vue @@ -86,7 +86,7 @@ > {{ $t('markdownHelpLink') }} diff --git a/website/client/src/components/ui/drawer.vue b/website/client/src/components/ui/drawer.vue index 7143e562a2..9db570181b 100644 --- a/website/client/src/components/ui/drawer.vue +++ b/website/client/src/components/ui/drawer.vue @@ -129,6 +129,12 @@ padding-top: 6px; padding-left: 24px; padding-right: 24px; + + a { + line-height: 1.33; + color: $gray-500; + font-weight: normal; + } } .drawer-tab { diff --git a/website/common/locales/en/generic.json b/website/common/locales/en/generic.json index 0b9649db8b..d5f180c58d 100644 --- a/website/common/locales/en/generic.json +++ b/website/common/locales/en/generic.json @@ -30,7 +30,7 @@ "user": "User", "market": "Market", "newSubscriberItem": "You have new Mystery Items", - "subscriberItemText": "Each month, subscribers will receive a mystery item. It becomes available at the beginning of the month. See the wiki's 'Mystery Item' page for more information.", + "subscriberItemText": "Subscribers receive a new mystery gear set at the beginning of each month!", "all": "All", "none": "None", "more": "<%= count %> more", diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json index 35cfe5f40a..60ee1db943 100644 --- a/website/common/locales/en/groups.json +++ b/website/common/locales/en/groups.json @@ -288,7 +288,7 @@ "guildSummaryPlaceholder": "Write a short explanation of your Group. What is the main purpose of the Group and what will its members do?", "groupDescription": "Description", "guildDescriptionPlaceholder": "Use this section to go into more detail about everything that members should know about your Group. Useful tips, helpful links, and encouraging statements all go here!", - "markdownFormattingHelp": "[Markdown formatting help](https://habitica.fandom.com/wiki/Markdown_Cheat_Sheet)", + "markdownFormattingHelp": "[Markdown formatting help](https://github.com/HabitRPG/habitica/wiki/Markdown-in-Habitica)", "partyDescriptionPlaceholder": "This is our Party's description. It describes what we do in this Party. If you want to learn more about what we do in this Party, read the description. Party on.", "guildGemCostInfo": "A Gem cost promotes high quality Guilds and is transferred into your Guild's bank.", "noGuildsTitle": "You aren't a member of any Guilds.", diff --git a/website/common/locales/en/pets.json b/website/common/locales/en/pets.json index a49c93ff2b..e3f4d12ce8 100644 --- a/website/common/locales/en/pets.json +++ b/website/common/locales/en/pets.json @@ -90,8 +90,8 @@ "mountsReleased": "Mounts released", "welcomeStable": "Welcome to your Pets and Mounts!", "welcomeStableText": "Welcome to the stable! I’m Matt, the beastmaster. Every time you complete a task, you'll have a random chance at receiving an Egg or a Hatching Potion to hatch Pets. When you hatch a Pet, it will appear here! Click a Pet's image to add it to your Avatar. Feed them with the Pet Food you find and they'll grow into hardy Mounts.", - "petLikeToEat": "What does my pet like to eat?", - "petLikeToEatText": "Pets will grow no matter what you feed them, but they'll grow faster if you feed them the one Pet Food that they like best. Experiment to find out the pattern, or see the answers here:
    https://habitica.fandom.com/wiki/Food_Preferences", + "petLikeToEat": "What does my Pet like to eat?", + "petLikeToEatText": "Pets will grow no matter what you feed them, but they'll grow faster if you feed them the one Pet Food that they like best. Experiment to find out the pattern, or see the answers here:
    https://habitica.com/static/faq#pet-foods", "filterByStandard": "Standard", "filterByMagicPotion": "Magic Potion", "filterByQuest": "Quest",