From a0383c785a05fcf7973003b9f87a0be7e9f91b72 Mon Sep 17 00:00:00 2001 From: Kalista Payne Date: Wed, 8 Jan 2025 15:18:06 -0600 Subject: [PATCH] Squashed commit of the following: commit 5d3713008dc3041f63b23b22196e1ed79fab45bd Author: Kalista Payne Date: Wed Jan 8 14:39:27 2025 -0600 fix(text): pet Pet commit 3ff5d7afeb517ae3d0933d8e18045b24575bb90b Author: Kalista Payne Date: Wed Jan 8 14:34:02 2025 -0600 fix(links): remove unnecessary style and icon commit 5023dd9258aa0f9416daa212ed1249db2e5d5fe4 Author: Kalista Payne Date: Wed Jan 8 09:43:17 2025 -0600 fix(links): update task modal markdown help commit 81ebb279cd881d1c560668c3cb03600d85b9f5b9 Author: Kalista Payne Date: Wed Jan 8 09:26:11 2025 -0600 fix(misc): clean up some layout and one more link commit 2fd216f01531052aa769738f8fe1956ca6943822 Author: Kalista Payne Date: Tue Jan 7 16:09:28 2025 -0600 fix(links): remove/revise some outdated wiki links --- website/client/src/components/appFooter.vue | 7 ----- website/client/src/components/header/menu.vue | 5 ---- .../components/inventory/equipment/index.vue | 2 +- .../src/components/shared/inventoryDrawer.vue | 27 ++++--------------- .../client/src/components/tasks/taskModal.vue | 2 +- website/client/src/components/ui/drawer.vue | 6 +++++ website/common/locales/en/generic.json | 2 +- website/common/locales/en/groups.json | 2 +- website/common/locales/en/pets.json | 4 +-- 9 files changed, 17 insertions(+), 40 deletions(-) diff --git a/website/client/src/components/appFooter.vue b/website/client/src/components/appFooter.vue index b099b4bdf21..1a08d291a66 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 3292277d4cd..12bd9f8af7e 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 fb921fbbe4c..4b3ad2427c7 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 80a22ecc570..7577990f552 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 7143e562a2a..9db570181bb 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 0b9649db8bf..d5f180c58d1 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 35cfe5f40ad..60ee1db9431 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 a49c93ff2ba..e3f4d12ce83 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",