From d1c670cf7bb9db1e0c2c7bf18bb430766d646cea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=8F=84=ED=98=84?= Date: Thu, 8 Dec 2022 19:12:59 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20sitemap.xml=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/pages/sitemap.xml.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/pages/sitemap.xml.tsx b/frontend/pages/sitemap.xml.tsx index e844db6e..765dcffa 100644 --- a/frontend/pages/sitemap.xml.tsx +++ b/frontend/pages/sitemap.xml.tsx @@ -15,7 +15,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) => const defaultFields = [ { - loc: `${process.env.NEXT_PUBLIC_NEXT_URL}`, + loc: `${process.env.NEXT_PUBLIC_CLIENT_URL}`, changefreq: 'daily', priority: '1.0', lastmod, @@ -23,7 +23,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) => ]; const scrapFields = scraps.map((scrap: { book_id: number; article_id: number }) => ({ - loc: `${process.env.NEXT_PUBLIC_NEXT_URL}/viewer/${scrap.book_id}/${scrap.article_id}`, + loc: `${process.env.NEXT_PUBLIC_CLIENT_URL}/viewer/${scrap.book_id}/${scrap.article_id}`, changefreq: 'daily', priority: '1.0', lastmod, From 3377872632b888a4571580e47f34ebd4e5f258c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=8F=84=ED=98=84?= Date: Thu, 8 Dec 2022 20:02:58 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20Content=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20-=20#243?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/components/common/Content/styled.ts | 55 +++++++++++++++++-- frontend/components/edit/Editor/core/theme.ts | 2 +- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/frontend/components/common/Content/styled.ts b/frontend/components/common/Content/styled.ts index 08cc4d77..af2efe59 100644 --- a/frontend/components/common/Content/styled.ts +++ b/frontend/components/common/Content/styled.ts @@ -14,22 +14,30 @@ export const ContentBody = styled.div` padding-top: 10px; > * { - line-height: 1.4; + line-height: 2; + font-weight: 400; + } + + h1, + h2, + h3, + strong { + font-weight: 700; } h1 { font-size: 24px; - font-weight: 700; + margin: 16px 0 8px 0; } h2 { font-size: 20px; - font-weight: 700; + margin: 16px 0 8px 0; } h3 { - font-size: 16px; - font-weight: 700; + font-size: 18px; + margin: 16px 0 8px 0; } ol { @@ -47,4 +55,41 @@ export const ContentBody = styled.div` width: 100%; } } + + a { + color: var(--primary-color); + + &:hover { + color: var(--primary-color); + text-decoration: underline; + } + } + + blockquote { + margin: 24px 0; + padding: 24px 16px; + /* background-color: var(--light-orange-color); */ + /* border-radius: 4px; */ + border-left: 8px solid var(--light-orange-color); + } + + code { + padding: 2px 4px; + background-color: var(--light-orange-color); + border-radius: 4px; + } + + pre { + padding: 24px 16px; + background-color: var(--light-orange-color); + border-radius: 4px; + font-family: 'consolas'; + font-size: 16px; + font-weight: 700; + line-height: 1.4; + + code { + padding: 0; + } + } `; diff --git a/frontend/components/edit/Editor/core/theme.ts b/frontend/components/edit/Editor/core/theme.ts index 8ba08326..78182252 100644 --- a/frontend/components/edit/Editor/core/theme.ts +++ b/frontend/components/edit/Editor/core/theme.ts @@ -5,7 +5,7 @@ export default function theme() { const highlightStyle = HighlightStyle.define([ { tag: tags.heading1, fontSize: '24px', fontWeight: '700' }, { tag: tags.heading2, fontSize: '20px', fontWeight: '700' }, - { tag: tags.heading3, fontSize: '16px', fontWeight: '700' }, + { tag: tags.heading3, fontSize: '18px', fontWeight: '700' }, { tag: tags.link, textDecoration: 'underline' }, { tag: tags.strikethrough, textDecoration: 'line-through' }, { tag: tags.invalid, color: '#cb2431' },