Squashed commit of the following:

commit 5d37130 Author: Kalista Payne <[email protected]> Date: Wed Jan 8 14:39:27 2025 -0600 fix(text): pet Pet commit 3ff5d7a Author: Kalista Payne <[email protected]> Date: Wed Jan 8 14:34:02 2025 -0600 fix(links): remove unnecessary style and icon commit 5023dd9 Author: Kalista Payne <[email protected]> Date: Wed Jan 8 09:43:17 2025 -0600 fix(links): update task modal markdown help commit 81ebb27 Author: Kalista Payne <[email protected]> Date: Wed Jan 8 09:26:11 2025 -0600 fix(misc): clean up some layout and one more link commit 2fd216f Author: Kalista Payne <[email protected]> Date: Tue Jan 7 16:09:28 2025 -0600 fix(links): remove/revise some outdated wiki links
HabitRPG · Jan 8, 2025 · a0383c7 · a0383c7
1 parent 99790c0
commit a0383c7
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 40 deletions.
diff --git a/website/client/src/components/appFooter.vue b/website/client/src/components/appFooter.vue
@@ -131,13 +131,6 @@
             >{{ $t('requestFeature') }}
             </a>
           </li>
-          <li>
-            <a
-              href="https://habitica.fandom.com/"
-              target="_blank"
-            >{{ $t('wiki') }}
-            </a>
-          </li>
         </ul>
       </div>
       <!-- Developers -->

diff --git 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') }}</a>
-              <a
-                class="topbar-dropdown-item dropdown-item"
-                href="https://habitica.fandom.com/wiki/Habitica_Wiki"
-                target="_blank"
-              >{{ $t('wiki') }}</a>
             </div>
           </li>
         </b-navbar-nav>

diff --git a/website/client/src/components/inventory/equipment/index.vue b/website/client/src/components/inventory/equipment/index.vue
@@ -106,7 +106,7 @@
         </div>
         <div slot="drawer-header">
           <div class="drawer-tab-container">
-            <div class="clearfix">
+            <div class="clearfix mb-2">
               <toggle-switch
                 class="float-right align-with-tab"
                 :label="$t(costumeMode ? 'useCostume' : 'autoEquipBattleGear')"

diff --git a/website/client/src/components/shared/inventoryDrawer.vue b/website/client/src/components/shared/inventoryDrawer.vue
@@ -27,27 +27,15 @@
         @changedPosition="tabSelected($event)"
       >
         <div slot="right-item">
-          <div
+          <a
             v-once
             id="petLikeToEatMarket"
             class="drawer-help-text"
+            href="/static/faq#pet-foods"
+            target="_blank"
           >
-            <span>{{ $t('petLikeToEat') + ' ' }}</span>
-            <span
-              class="svg-icon inline icon-16"
-              v-html="icons.information"
-            ></span>
-          </div>
-          <b-popover
-            target="petLikeToEatMarket"
-            :placement="'top'"
-          >
-            <div
-              v-once
-              class="popover-content-text"
-              v-html="$t('petLikeToEatText')"
-            ></div>
-          </b-popover>
+            <span>{{ $t('petLikeToEat') }}</span>
+          </a>
         </div>
       </drawer-header-tabs>
     </div>
@@ -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
@@ -86,7 +86,7 @@
           >
             <a
               target="_blank"
-              href="https://habitica.fandom.com/wiki/Markdown_Cheat_Sheet"
+              href="https://github.com/HabitRPG/habitica/wiki/Markdown-in-Habitica"
               :class="cssClass('headings')"
             >{{ $t('markdownHelpLink') }}</a>
           </small>

diff --git 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
@@ -30,7 +30,7 @@
   "user": "User",
   "market": "Market",
   "newSubscriberItem": "You have new <span class=\"notification-bold-blue\">Mystery Items</span>",
-  "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
@@ -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
@@ -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: <br/> <a href=\"https://habitica.fandom.com/wiki/Food_Preferences\" target=\"_blank\">https://habitica.fandom.com/wiki/Food_Preferences</a>",
+  "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: <br/> <a href=\"/static/faq#pet-foods\" target=\"_blank\">https://habitica.com/static/faq#pet-foods</a>",
   "filterByStandard": "Standard",
   "filterByMagicPotion": "Magic Potion",
   "filterByQuest": "Quest",