Skip to content

Commit

Permalink
fix: link style
Browse files Browse the repository at this point in the history
Signed-off-by: Innei <i@innei.in>
  • Loading branch information
Innei committed Jul 18, 2024
1 parent 52d9725 commit f776731
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 17 deletions.
1 change: 1 addition & 0 deletions icons/mgc/heart_cute_fi.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/renderer/src/modules/entry-content/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ function EntryContentRender({ entryId }: { entryId: string }) {
<a
href={entry.entries.url || void 0}
target="_blank"
className="-mx-6 block rounded-lg p-6 transition-colors hover:bg-theme-item-hover focus-visible:bg-theme-item-hover focus-visible:!outline-none"
className="-mx-6 block cursor-default rounded-lg p-6 transition-colors hover:bg-theme-item-hover focus-visible:bg-theme-item-hover focus-visible:!outline-none"
rel="noreferrer"
>
<div className="select-text break-words text-3xl font-bold">
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/src/modules/feed-column/list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export function FeedList({
<div className="flex h-full flex-1 items-center text-zinc-500">
<Link
to="/discover"
className="-mt-36 flex h-full flex-1 flex-col items-center justify-center gap-2"
className="-mt-36 flex h-full flex-1 cursor-default flex-col items-center justify-center gap-2"
onClick={stopPropagation}
>
<i className="i-mgc-add-cute-re text-3xl" />
Expand Down
12 changes: 12 additions & 0 deletions src/renderer/src/modules/settings/modal/content.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { repository } from "@pkg"
import { MotionButtonBase } from "@renderer/components/ui/button"
import { useCurrentModal } from "@renderer/components/ui/modal"
import { ScrollArea } from "@renderer/components/ui/scroll-area"
Expand Down Expand Up @@ -62,6 +63,17 @@ const Content = () => {
viewportClassName="pr-1"
>
<Component />
<p className="mt-12 flex items-center justify-center gap-1 text-xs opacity-80">
<i className="i-mgc-heart-cute-fi" />
{" "}
{/* 喜欢我们的产品?在 GitHub 给添加星标 并 分享您宝贵的建议 ! */}
Love our product?
{" "}
<a href={`${repository.url}`} className="text-theme-accent" target="_blank">
Give us a star on GitHub
</a>
!
</p>
</ScrollArea.ScrollArea>
</>
)
Expand Down
10 changes: 4 additions & 6 deletions src/renderer/src/modules/settings/modal/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,10 @@ export function SettingModalLayout(
}
}, [])

const { draggable, overlay } = useUISettingSelector(
((state) => ({
draggable: state.modalDraggable,
overlay: state.modalOverlay,
})),
)
const { draggable, overlay } = useUISettingSelector((state) => ({
draggable: state.modalDraggable,
overlay: state.modalOverlay,
}))
const dragController = useDragControls()
const handleDrag: PointerEventHandler<HTMLDivElement> = useCallback(
(e) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export function Component() {
{" "}
{APP_NAME}
</div>
<a className="mb-8" href={`${DEEPLINK_SCHEME}add?id=${id}`}>
<a className="mb-8 cursor-default" href={`${DEEPLINK_SCHEME}add?id=${id}`}>
<StyledButton>
<FollowIcon className="mr-1 size-3" />
{APP_NAME}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export function Component() {
<div>
{subscriptions.data?.[category].map((subscription) => (
<div key={subscription.feedId} className="group relative border-b py-5">
<a className="flex flex-1" href={subscription.feeds.siteUrl!} target="_blank">
<a className="flex flex-1 cursor-default" href={subscription.feeds.siteUrl!} target="_blank">
<FeedIcon feed={subscription.feeds} size={22} className="mr-3" />
<div className="flex-1">
<div className="truncate font-medium leading-none">{subscription.feeds?.title}</div>
Expand Down
7 changes: 2 additions & 5 deletions src/renderer/src/pages/settings/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@ import { Logo } from "@renderer/components/icons/logo"
import { Vibrancy } from "@renderer/components/ui/background"
import { preventDefault } from "@renderer/lib/dom"
import { settings } from "@renderer/modules/settings/constants"
import {
SettingsSidebarTitle,
} from "@renderer/modules/settings/title"
import { SettingsSidebarTitle } from "@renderer/modules/settings/title"
import { Link, Outlet, useLocation } from "react-router-dom"

// TODO Web UI
export function Component() {
const location = useLocation()
const tab = location.pathname.replace(/^\/settings\/?/, "")
Expand All @@ -20,7 +17,7 @@ export function Component() {
{settings.map((t) => (
<Link
key={t.path}
className={`my-1 flex items-center rounded-md px-2.5 py-0.5 leading-loose text-theme-foreground/70 transition-colors dark:text-theme-foreground/90 ${
className={`my-1 flex cursor-default items-center rounded-md px-2.5 py-0.5 leading-loose text-theme-foreground/70 transition-colors dark:text-theme-foreground/90 ${
tab === t.path ?
"bg-native-active text-theme-foreground/90" :
""
Expand Down
3 changes: 1 addition & 2 deletions src/renderer/src/styles/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ body,
outline: none;
}

button,
a {
button {
@apply cursor-default;
}

Expand Down

0 comments on commit f776731

Please sign in to comment.