Skip to content

Fix sidebar link style and article tag style #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 22, 2023
Merged

Fix sidebar link style and article tag style #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/client/components/Article.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {
Weight,
getSpace,
} from "../lib/variables";
import { MaterialSymbol } from "./MaterialSymbol";
import { QiitaMarkdownHtmlBody } from "./QiitaMarkdownHtmlBody";
import { Slide } from "./Slide";

Expand All @@ -25,12 +24,9 @@ export const Article = ({ renderedBody, tags, title, slide }: Props) => {
<article css={containerStyle}>
<h1 css={titleStyle}>{title}</h1>
<div css={tagListWrapStyle}>
<MaterialSymbol fill={true} css={{ color: Colors.mediumEmphasis }}>
sell
</MaterialSymbol>
<ul css={tagListStyle}>
{tags.map((tag, index) => (
<li key={tag}>
<li css={tagListItemStyle} key={tag}>
<span>{tag}</span>
{index !== tags.length - 1 && <span>,</span>}
</li>
Expand Down Expand Up @@ -67,6 +63,14 @@ const tagListStyle = css({
gap: getSpace(1),
});

const tagListItemStyle = css({
backgroundColor: Colors.surfaceVariant,
borderRadius: 4,
color: Colors.mediumEmphasis,
fontSize: Typography.body2,
padding: `0 ${getSpace(3 / 4)}px`,
});

const bodyStyle = css({
marginTop: getSpace(6),
});
2 changes: 2 additions & 0 deletions src/client/components/SidebarArticles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ const articleSummaryStyle = css({
alignItems: "center",
backgroundColor: "transparent",
color: Colors.mediumEmphasis,
cursor: "pointer",
display: "flex",
fontWeight: Weight.bold,
fontSize: Typography.body2,
Expand All @@ -110,6 +111,7 @@ const articleSummaryStyle = css({
...pointerFine({
"&:hover": {
backgroundColor: Colors.gray5,
cursor: "pointer",
textDecoration: "none",
},
}),
Expand Down
24 changes: 23 additions & 1 deletion src/client/components/SidebarContents.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,9 @@ export const SidebarContents = ({ isStateOpen, handleMobileClose }: Props) => {
rel="noopener noreferrer"
>
コミュニティガイドライン
<MaterialSymbol css={{ color: Colors.disabled }}>
open_in_new
</MaterialSymbol>
</a>
</li>
<li>
Expand All @@ -229,6 +232,9 @@ export const SidebarContents = ({ isStateOpen, handleMobileClose }: Props) => {
rel="noopener noreferrer"
>
利用規約
<MaterialSymbol css={{ color: Colors.disabled }}>
open_in_new
</MaterialSymbol>
</a>
</li>
<li>
Expand All @@ -239,6 +245,9 @@ export const SidebarContents = ({ isStateOpen, handleMobileClose }: Props) => {
rel="noopener noreferrer"
>
プライバシーポリシー
<MaterialSymbol css={{ color: Colors.disabled }}>
open_in_new
</MaterialSymbol>
</a>
</li>
</ul>
Expand Down Expand Up @@ -395,6 +404,9 @@ export const SidebarContents = ({ isStateOpen, handleMobileClose }: Props) => {
rel="noopener noreferrer"
>
コミュニティガイドライン
<MaterialSymbol css={{ color: Colors.disabled }}>
open_in_new
</MaterialSymbol>
</a>
</li>
<li>
Expand All @@ -405,6 +417,9 @@ export const SidebarContents = ({ isStateOpen, handleMobileClose }: Props) => {
rel="noopener noreferrer"
>
利用規約
<MaterialSymbol css={{ color: Colors.disabled }}>
open_in_new
</MaterialSymbol>
</a>
</li>
<li>
Expand All @@ -415,6 +430,9 @@ export const SidebarContents = ({ isStateOpen, handleMobileClose }: Props) => {
rel="noopener noreferrer"
>
プライバシーポリシー
<MaterialSymbol css={{ color: Colors.disabled }}>
open_in_new
</MaterialSymbol>
</a>
</li>
</ul>
Expand Down Expand Up @@ -534,7 +552,7 @@ export const SidebarContents = ({ isStateOpen, handleMobileClose }: Props) => {

const sidebarStyle = css({
height: "100vh",
maxWidth: 360,
width: 360,
padding: `${getSpace(2)}px 0`,
position: "sticky",
top: 0,
Expand Down Expand Up @@ -632,6 +650,7 @@ const articlesListItemStyle = css({
)}px ${getSpace(3 / 2)}px`,
whiteSpace: "nowrap",
textOverflow: "ellipsis",
width: "100%",

...pointerFine({
"&:hover": {
Expand Down Expand Up @@ -675,6 +694,9 @@ const articleFooterListStyle = css({
});

const articleFooterListItemStyle = css({
alignItems: "center",
display: "flex",
gap: getSpace(1),
color: Colors.mediumEmphasis,
fontSize: Typography.body3,
});
Expand Down