diff --git a/src/assets/base.css b/src/assets/base.css index e99c4f2..156a713 100644 --- a/src/assets/base.css +++ b/src/assets/base.css @@ -89,7 +89,6 @@ body { color 0.5s, background-color 0.5s; line-height: 1.6; - font-size: 15px; text-rendering: optimizeLegibility; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -116,4 +115,9 @@ textarea { border-radius: 8px; padding: 8px 12px; background-color: var(--color-background); + font-size: 16px; +} + +p { + white-space: pre; } diff --git a/src/components/article/ArticleDetail.vue b/src/components/article/ArticleDetail.vue index 6cc296a..225fc3b 100644 --- a/src/components/article/ArticleDetail.vue +++ b/src/components/article/ArticleDetail.vue @@ -3,16 +3,41 @@ import { ref } from 'vue'; import { useRoute } from 'vue-router'; import BoardHeader from './BoardHeader.vue'; import { getArticle } from '@/api/article'; -import CommentList from '@/components/article/CommentList.vue'; +import CommentArea from './CommentArea.vue'; const route = useRoute(); const id = Number(route.params.id); const article = ref({}); +const comments = ref([]); getArticle(id, ({ data }) => { article.value = data; }); + +// FIXME: remove mock data +setTimeout(() => { + article.value = { + title: '제목', + text: '내용', + author: '작성자', + date: '2024-04-11 13:12:14', + }; + comments.value = [ + { + id: 1, + nickname: '닉네임', + date: '2024-04-11 13:12:14', + text: '댓글 내용', + }, + { + id: 2, + nickname: '닉네임', + date: '2024-04-11 13:12:14', + text: '댓글 내용', + }, + ]; +}, 100);

{{ article.text }}

- - + diff --git a/src/components/article/ArticleForm.vue b/src/components/article/ArticleForm.vue index 0ef266d..b7b514a 100644 --- a/src/components/article/ArticleForm.vue +++ b/src/components/article/ArticleForm.vue @@ -89,12 +89,12 @@ form { } #title { - font-size: 1.25rem; + font-size: 20px; font-weight: bold; } #text { - font-size: 1rem; + font-size: 16px; min-height: 200px; } @@ -106,7 +106,7 @@ form { .errorMessage { color: var(--color-error); - font-size: 0.85rem; + font-size: 14px; } button { @@ -116,7 +116,7 @@ button { border: none; border-radius: 8px; cursor: pointer; - font-size: 1rem; + font-size: 16px; font-weight: bold; transition: scale 0.25s, diff --git a/src/components/article/ArticleList.vue b/src/components/article/ArticleList.vue index 4fe4736..fa74bbe 100644 --- a/src/components/article/ArticleList.vue +++ b/src/components/article/ArticleList.vue @@ -2,6 +2,7 @@ import { getArticles } from '@/api/article'; import { ref } from 'vue'; import { RouterLink } from 'vue-router'; +import FilledButton from '../common/FilledButton.vue'; const articles = ref([]); @@ -11,7 +12,9 @@ getArticles(({ data }) => (articles.value = data));