Skip to content

Commit

Permalink
Merge branch 'master' into feat/wow-export-search
Browse files Browse the repository at this point in the history
  • Loading branch information
oldben87 committed Jul 5, 2023
2 parents c5ccdc6 + 8c88dbb commit 302d23e
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 6 deletions.
10 changes: 10 additions & 0 deletions app/components/navigation/sidebar/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,11 @@ export const Sidebar: FC<Props> = ({ children, data }) => {
<PatreonLink />
<WikiLink />
<DiscordLink />
<p className="text-gray-400 text-xs mt-4">
FINAL FANTASY is a registered trademark of Square Enix
Holdings Co., Ltd.
<br />© SQUARE ENIX CO., LTD. All Rights Reserved.
</p>
</nav>
</div>
</Dialog.Panel>
Expand Down Expand Up @@ -529,6 +534,11 @@ export const Sidebar: FC<Props> = ({ children, data }) => {
<PatreonLink />
<WikiLink />
<DiscordLink />
<p className="text-gray-400 text-xs mt-4">
FINAL FANTASY is a registered trademark of Square Enix Holdings
Co., Ltd.
<br />© SQUARE ENIX CO., LTD. All Rights Reserved.
</p>
<div id="ezoic-pub-ad-placeholder-118" />
</nav>
</div>
Expand Down
6 changes: 0 additions & 6 deletions app/routes/wow/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,6 @@ const recommendedQueries = [
Icon: DocumentSearchIcon,
href: '/wow/legacy-marketshare'
},
{
name: 'Region wide undercuts',
description: 'Search for items region wide that you have been undercut on!',
Icon: DocumentSearchIcon,
href: '/wow/region-undercut'
},
{
name: 'Price Sniper and Price Spike Alerts',
description:
Expand Down
5 changes: 5 additions & 0 deletions app/tailwind.css
Original file line number Diff line number Diff line change
Expand Up @@ -1989,6 +1989,11 @@ select {
line-height: 1.75rem;
}

.text-xs {
font-size: 0.75rem;
line-height: 1rem;
}

.font-bold {
font-weight: 700;
}
Expand Down

0 comments on commit 302d23e

Please sign in to comment.