Merge branch 'main' into style

This commit is contained in:
yoon 2025-03-20 14:06:56 +09:00
commit aad172e90b
2 changed files with 72 additions and 27 deletions

View File

@ -1,13 +1,71 @@
/* 나눔고딕 */
@import url('https://fonts.googleapis.com/css2?family=Nanum+Gothic&display=swap');
/* @font-face {
font-family: 'GmarketSansMedium';
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2001@1.1/GmarketSansMedium.woff') format('woff');
font-weight: normal;
font-style: normal;
}
body {
font-family: 'GmarketSansMedium', sans-serif;
font-size: 16px;
line-height: 1.6;
color: #333;
} */
@font-face {
font-family: 'D2Coding';
src: url('/font/D2Coding-Ver1.3.2-20180524-all.ttc') format('ttc');
/* @font-face {
font-family: 'NanumSquareRound';
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_two@1.0/NanumSquareRound.woff') format('woff');
font-weight: normal;
font-style: normal;
}
body {
font-family: 'NanumSquareRound', sans-serif;
font-size: 16px;
line-height: 1.6;
color: #333;
} */
/* @font-face {
font-family: 'Pretendard-Regular';
src: url('https://cdn.jsdelivr.net/gh/Project-Noonnu/noonfonts_2107@1.1/Pretendard-Regular.woff') format('woff');
font-weight: 400;
font-style: normal;
}
body {
font-family: 'Pretendard-Regular', sans-serif;
font-size: 16px;
line-height: 1.6;
color: #333;
} */
/* @font-face {
font-family: 'S-CoreDream-3Light';
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_six@1.2/S-CoreDream-3Light.woff') format('woff');
font-weight: normal;
font-style: normal;
}
body {
font-family: 'S-CoreDream-3Light', sans-serif;
font-size: 16px;
line-height: 1.6;
color: #333;
} */
/* 나눔고딕 */
@import url('https://fonts.googleapis.com/css2?family=Nanum+Gothic&display=swap');
/* D2Coding 폰트 */
@font-face {
font-family: 'D2Coding';
src: url('/font/D2Coding-Ver1.3.2-20180524-all.ttc') format('truetype');
font-weight: normal;
font-style: normal;
}
/* Consolas 폰트 */
@font-face {
font-family: 'Consolas';
src: url('/font/Consolas.woff') format('woff');
@ -15,7 +73,7 @@
font-style: normal;
}
/* 툴바에서 선택 가능한 폰트 및 크기 스타일 */
/* 툴바에서 선택 가능한 폰트 */
.ql-font-nanum-gothic {
font-family: 'Nanum Gothic', sans-serif;
}
@ -33,24 +91,10 @@
}
/* 폰트 크기 스타일 */
.ql-size-12px {
font-size: 12px;
}
.ql-size-14px {
font-size: 14px;
}
.ql-size-16px {
font-size: 16px;
}
.ql-size-18px {
font-size: 18px;
}
.ql-size-24px {
font-size: 24px;
}
.ql-size-32px {
font-size: 32px;
}
.ql-size-48px {
font-size: 48px;
}
.ql-size-12px { font-size: 12px; }
.ql-size-14px { font-size: 14px; }
.ql-size-16px { font-size: 16px; }
.ql-size-18px { font-size: 18px; }
.ql-size-24px { font-size: 24px; }
.ql-size-32px { font-size: 32px; }
.ql-size-48px { font-size: 48px; }

View File

@ -1,4 +1,5 @@
<template>
<link rel="stylesheet" href="/css/font.css">
<component :is="layout">
<template #content>
<LoadingSpinner :isLoading="loadingStore.isLoading" />