Skip to content

Commit eb40a02

Browse files
awxiaoxian2020awxiaoxian2020
committed
docs(cn): fix conflicts
1 parent 7199532 commit eb40a02

File tree

2 files changed

+3
-80
lines changed

2 files changed

+3
-80
lines changed

‎src/components/DocsFooter.tsx

+2-22
Original file line numberDiff line numberDiff line change
@@ -66,41 +66,21 @@ function FooterLink({
6666
type: '上一页' | '下一页';
6767
}) {
6868
return (
69-
<<<<<<< HEAD
70-
<NextLink href={href}>
71-
<a
72-
className={cn(
73-
'flex gap-x-4 md:gap-x-6 items-center w-full md:w-80 px-4 md:px-5 py-6 border-2 border-transparent text-base leading-base text-link dark:text-link-dark rounded-lg group focus:text-link dark:focus:text-link-dark focus:bg-highlight focus:border-link dark:focus:bg-highlight-dark dark:focus:border-link-dark focus:border-opacity-100 focus:border-2 focus:ring-1 focus:ring-offset-4 focus:ring-blue-40 active:ring-0 active:ring-offset-0 hover:bg-gray-5 dark:hover:bg-gray-80',
74-
{
75-
'flex-row-reverse justify-self-end text-right': type === '下一页',
76-
}
77-
)}>
78-
<IconNavArrow
79-
className="text-tertiary dark:text-tertiary-dark inline group-focus:text-link dark:group-focus:text-link-dark"
80-
displayDirection={type === '上一页' ? 'left' : 'right'}
81-
/>
82-
<span>
83-
<span className="block no-underline text-sm tracking-wide text-secondary dark:text-secondary-dark uppercase font-bold group-focus:text-link dark:group-focus:text-link-dark group-focus:text-opacity-100">
84-
{type}
85-
</span>
86-
<span className="block text-lg group-hover:underline">{title}</span>
87-
=======
8869
<NextLink
8970
href={href}
9071
className={cn(
9172
'flex gap-x-4 md:gap-x-6 items-center w-full md:w-80 px-4 md:px-5 py-6 border-2 border-transparent text-base leading-base text-link dark:text-link-dark rounded-lg group focus:text-link dark:focus:text-link-dark focus:bg-highlight focus:border-link dark:focus:bg-highlight-dark dark:focus:border-link-dark focus:border-opacity-100 focus:border-2 focus:ring-1 focus:ring-offset-4 focus:ring-blue-40 active:ring-0 active:ring-offset-0 hover:bg-gray-5 dark:hover:bg-gray-80',
9273
{
93-
'flex-row-reverse justify-self-end text-right': type === 'Next',
74+
'flex-row-reverse justify-self-end text-right': type === '下一页',
9475
}
9576
)}>
9677
<IconNavArrow
9778
className="text-tertiary dark:text-tertiary-dark inline group-focus:text-link dark:group-focus:text-link-dark"
98-
displayDirection={type === 'Previous' ? 'left' : 'right'}
79+
displayDirection={type === '上一页' ? 'left' : 'right'}
9980
/>
10081
<span>
10182
<span className="block no-underline text-sm tracking-wide text-secondary dark:text-secondary-dark uppercase font-bold group-focus:text-link dark:group-focus:text-link-dark group-focus:text-opacity-100">
10283
{type}
103-
>>>>>>> 1b5e8861ab40d94e030bff0100708106c4689603
10484
</span>
10585
<span className="block text-lg group-hover:underline">{title}</span>
10686
</span>

‎src/components/MDX/BlogCard.tsx

+1-58
Original file line numberDiff line numberDiff line change
@@ -16,62 +16,6 @@ export interface BlogCardProps {
1616

1717
function BlogCard({title, badge, date, icon, url, children}: BlogCardProps) {
1818
return (
19-
<<<<<<< HEAD
20-
<Link href={url as string}>
21-
<a className="block h-full w-full rounded-2xl outline-none focus:outline-none focus-visible:outline focus-visible:outline-link focus:outline-offset-2 focus-visible:dark:focus:outline-link-dark">
22-
<div className="justify-between p-5 sm:p-5 cursor-pointer w-full h-full flex flex-col flex-1 shadow-secondary-button-stroke dark:shadow-secondary-button-stroke-dark hover:bg-gray-40/5 active:bg-gray-40/10 hover:dark:bg-gray-60/5 active:dark:bg-gray-60/10 rounded-2xl text-xl text-primary dark:text-primary-dark leading-relaxed">
23-
<div className="flex flex-row gap-3 w-full">
24-
<h2 className="font-semibold flex-1 text-2xl lg:text-3xl hover:underline leading-snug mb-4">
25-
{title}
26-
</h2>
27-
</div>
28-
<div>
29-
<div className="flex flex-row justify-start gap-2 items-center text-base text-tertiary dark:text-tertiary-dark">
30-
{icon === 'labs' && (
31-
<svg
32-
className="w-6 h-6 text-tertiary dark:text-tertiary-dark"
33-
viewBox="0 0 72 72"
34-
fill="none"
35-
xmlns="http://www.w3.org/2000/svg">
36-
<path
37-
fillRule="evenodd"
38-
clipRule="evenodd"
39-
d="M27.4865 9C25.8297 9 24.4865 10.3431 24.4865 12C24.4865 13.6569 25.8297 15 27.4865 15V31.1087C27.4865 32.3397 27.1078 33.5409 26.4019 34.5494L13.095 53.5592C10.3114 57.5359 13.1563 63 18.0104 63H54.9626C59.8167 63 62.6616 57.5359 59.878 53.5592L46.5711 34.5494C45.8652 33.5409 45.4865 32.3397 45.4865 31.1087V15C47.1434 15 48.4865 13.6569 48.4865 12C48.4865 10.3431 47.1434 9 45.4865 9H27.4865ZM39.4865 31.1087V15H33.4865V31.1087C33.4865 33.5707 32.7292 35.9732 31.3173 37.9902L28.5104 42H44.4626L41.6557 37.9902C40.2438 35.9732 39.4865 33.5707 39.4865 31.1087ZM18.0104 57L24.3104 48H48.6626L54.9626 57H18.0104Z"
40-
fill="currentColor"
41-
/>
42-
</svg>
43-
)}
44-
{icon === 'blog' && (
45-
<svg
46-
className="w-6 h-6 text-tertiary dark:text-tertiary-dark"
47-
viewBox="0 0 72 72"
48-
fill="none"
49-
xmlns="http://www.w3.org/2000/svg">
50-
<path
51-
fillRule="evenodd"
52-
clipRule="evenodd"
53-
d="M12.7101 56.3758C13.0724 56.7251 13.6324 57 14.3887 57H57.6113C58.3676 57 58.9276 56.7251 59.2899 56.3758C59.6438 56.0346 59.8987 55.5407 59.9086 54.864C59.9354 53.022 59.9591 50.7633 59.9756 48H12.0244C12.0409 50.7633 12.0645 53.022 12.0914 54.864C12.1013 55.5407 12.3562 56.0346 12.7101 56.3758ZM12.0024 42H59.9976C59.9992 41.0437 60 40.0444 60 39C60 29.5762 59.9327 22.5857 59.8589 17.7547C59.8359 16.2516 58.6168 15 56.9938 15L15.0062 15C13.3832 15 12.1641 16.2516 12.1411 17.7547C12.0673 22.5857 12 29.5762 12 39C12 40.0444 12.0008 41.0437 12.0024 42ZM65.8582 17.6631C65.7843 12.8227 61.8348 9 56.9938 9H15.0062C10.1652 9 6.21572 12.8227 6.1418 17.6631C6.06753 22.5266 6 29.5477 6 39C6 46.2639 6.03988 51.3741 6.09205 54.9515C6.15893 59.537 9.80278 63 14.3887 63H57.6113C62.1972 63 65.8411 59.537 65.9079 54.9515C65.9601 51.3741 66 46.2639 66 39C66 29.5477 65.9325 22.5266 65.8582 17.6631ZM39 21C37.3431 21 36 22.3431 36 24C36 25.6569 37.3431 27 39 27H51C52.6569 27 54 25.6569 54 24C54 22.3431 52.6569 21 51 21H39ZM36 33C36 31.3431 37.3431 30 39 30H51C52.6569 30 54 31.3431 54 33C54 34.6569 52.6569 36 51 36H39C37.3431 36 36 34.6569 36 33ZM24 33C27.3137 33 30 30.3137 30 27C30 23.6863 27.3137 21 24 21C20.6863 21 18 23.6863 18 27C18 30.3137 20.6863 33 24 33Z"
54-
fill="currentColor"
55-
/>
56-
</svg>
57-
)}
58-
{date}
59-
{badge ? (
60-
<div className="h-fit px-1 bg-highlight dark:bg-highlight-dark rounded uppercase text-link dark:text-link-dark font-bold tracking-wide text-xs whitespace-nowrap">
61-
New
62-
</div>
63-
) : null}
64-
</div>
65-
<span className="text-base text-secondary dark:text-secondary-dark">
66-
{children}
67-
</span>
68-
{children != null && (
69-
<div className="text-link text-base dark:text-link-dark hover:underline mt-4">
70-
阅读更多有关内容
71-
</div>
72-
)}
73-
</div>
74-
=======
7519
<Link
7620
href={url as string}
7721
className="block h-full w-full rounded-2xl outline-none focus:outline-none focus-visible:outline focus-visible:outline-link focus:outline-offset-2 focus-visible:dark:focus:outline-link-dark">
@@ -80,7 +24,6 @@ function BlogCard({title, badge, date, icon, url, children}: BlogCardProps) {
8024
<h2 className="font-semibold flex-1 text-2xl lg:text-3xl hover:underline leading-snug mb-4">
8125
{title}
8226
</h2>
83-
>>>>>>> 1b5e8861ab40d94e030bff0100708106c4689603
8427
</div>
8528
<div>
8629
<div className="flex flex-row justify-start gap-2 items-center text-base text-tertiary dark:text-tertiary-dark">
@@ -124,7 +67,7 @@ function BlogCard({title, badge, date, icon, url, children}: BlogCardProps) {
12467
</span>
12568
{children != null && (
12669
<div className="text-link text-base dark:text-link-dark hover:underline mt-4">
127-
Read more
70+
阅读更多有关内容
12871
</div>
12972
)}
13073
</div>

0 commit comments

Comments
 (0)