Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit 1fa2953

Browse files
authored
style(articles-card): adjust for white theme (#1278)
1 parent 73567d0 commit 1fa2953

File tree

10 files changed

+32
-14
lines changed

10 files changed

+32
-14
lines changed

src/containers/content/CommunityContent/ThreadContent.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { FC, memo } from 'react'
33
import type { TThread } from '@/spec'
44
import { THREAD } from '@/constant'
55

6-
// import ArticlesThread from '@/containers//thread/ArticlesThread'
6+
import ArticlesThread from '@/containers//thread/ArticlesThread'
77
// import GtdThread from '@/containers//thread/GtdThread'
88
// import ChangeThread from '@/containers//thread/ChangelogThread'
99
// import ReposThread from '@/containers/thread/ReposThread'
@@ -49,10 +49,10 @@ const ThreadContent: FC<TProps> = ({ thread }) => {
4949
return <CperMapThread />
5050

5151
default:
52-
return <AboutThread />
53-
// return <GtdThread />
54-
// return <ChangeThread />
55-
// return <ArticlesThread />
52+
// return <AboutThread />
53+
// return <GtdThread />
54+
// return <ChangeThread />
55+
return <ArticlesThread />
5656
}
5757
}
5858

src/widgets/ArticleCard/Header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const Header: FC<TIndex> = ({ data, thread }) => {
5656
<TagsList
5757
items={articleTags}
5858
mLeft={0}
59-
size={isMobile ? 'small' : 'medium'}
59+
size={isMobile ? 'small' : 'small'}
6060
/>
6161
<Br top={isMobile ? '4px' : '10px'} />
6262
{!isMobile && (

src/widgets/ArticleCard/styles/footer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import styled from 'styled-components'
33
import css, { theme } from '@/utils/css'
44

55
export const Wrapper = styled.div`
6-
color: ${theme('thread.articleDigest')};
6+
color: ${theme('thread.extraInfo')};
77
`
88
export const PublishWrapper = styled.div`
99
${css.flex('align-center')};

src/widgets/ArticleCard/styles/index.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,18 @@ import css, { theme } from '@/utils/css'
55
export const Wrapper = styled.div`
66
${css.flexColumn()};
77
height: 100%;
8-
`
98
9+
box-shadow: 0 2px 40px 0 rgb(224 226 228 / 27%);
10+
transition: box-shadow 0.3s ease-out, transform 0.3s ease-out,
11+
opacity 0.2s ease-out;
12+
transition-delay: 0.1s;
13+
border-radius: 4px;
14+
transform: translateZ(0);
15+
background-color: #fff;
16+
padding: 20px;
17+
border: 1px solid;
18+
border-color: #f8f6f6;
19+
`
1020
export const MobileDigest = styled.div`
1121
color: ${theme('thread.articleDigest')};
1222
font-size: 13px;

src/widgets/ArticleImgWindow/styles/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const Wrapper = styled.div.attrs(({ testid }: TTestable) => ({
1313
export const Block = styled.div`
1414
width: 30%;
1515
height: 60px;
16-
background: #002a34;
16+
background: #f5f5f5; // to-theme
1717
margin-right: 10px;
1818
border-radius: 5px;
1919
`

src/widgets/ArticlesFilter/CatFilterButton.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import Tooltip from '@/widgets/Tooltip'
66

77
import {
88
Wrapper,
9+
Label,
910
InnerBtnWrapper,
1011
ButtonWrapper,
1112
FilterIcon,
@@ -26,7 +27,7 @@ type TProps = {
2627
const CatFilterButton: FC<TProps> = ({ thread, onSelect, activeFilter }) => {
2728
return (
2829
<Wrapper>
29-
类别
30+
<Label>类别</Label>
3031
<Tooltip
3132
placement="bottom-end"
3233
trigger="click"

src/widgets/ArticlesFilter/FilterButton.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import Tooltip from '@/widgets/Tooltip'
66

77
import {
88
Wrapper,
9+
Label,
910
InnerBtnWrapper,
1011
ButtonWrapper,
1112
FilterIcon,
@@ -26,7 +27,7 @@ type TProps = {
2627
const FilterButton: FC<TProps> = ({ thread, onSelect, activeFilter }) => {
2728
return (
2829
<Wrapper>
29-
排序
30+
<Label>排序</Label>
3031
<Tooltip
3132
placement="bottom"
3233
trigger="click"

src/widgets/ArticlesFilter/styles/cat_filter_button.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@ export const Wrapper = styled.div`
1111
margin-right: -12px;
1212
font-size: 13px;
1313
`
14+
export const Label = styled.div`
15+
opacity: 0.7;
16+
`
1417
export const InnerBtnWrapper = styled.div`
1518
${css.flex('align-center')};
1619
margin-left: 2px;
1720
color: ${theme('thread.articleDigest')};
18-
font-weight: 550;
21+
font-weight: 400;
1922
font-size: 13px;
2023
2124
&:hover {

src/widgets/ArticlesFilter/styles/filter_button.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@ export const Wrapper = styled.div`
1010
color: ${theme('thread.articleDigest')};
1111
font-size: 13px;
1212
`
13+
export const Label = styled.div`
14+
opacity: 0.7;
15+
`
1316
export const InnerBtnWrapper = styled.div`
1417
${css.flex('align-center')};
1518
margin-left: 2px;
1619
color: ${theme('thread.articleDigest')};
17-
font-weight: 550;
20+
font-weight: 400;
1821
font-size: 13px;
1922
2023
&:hover {

src/widgets/ArticlesFilter/styles/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import Input from '@/widgets/Input'
99
export const Wrapper = styled.div`
1010
${css.flex('align-center')};
1111
width: 100%;
12-
margin-bottom: 10px;
12+
margin-bottom: 8px;
1313
`
1414
export const Inputer = styled(Input)`
1515
height: 30px;

0 commit comments

Comments
 (0)