Skip to content

Commit

Permalink
Merge pull request #10 from SV-Winter-BootCamp-Team-C/design#9
Browse files Browse the repository at this point in the history
design: tailwind config 파일 작성
  • Loading branch information
dmswn1004 committed Jan 8, 2024
2 parents 8a08013 + 221d5b6 commit 56b9af1
Show file tree
Hide file tree
Showing 5 changed files with 199 additions and 79 deletions.
1 change: 0 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"singleQuote": true,
"trailingComma": "all",
"parser": "typescript",
"semi": true,
"useTabs": false,
"tabWidth": 2,
Expand Down
190 changes: 190 additions & 0 deletions src/global.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

@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;
}

@font-face {
font-family: 'TmoneyRoundWindExtraBold';
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_20-07@1.0/TmoneyRoundWindExtraBold.woff') format('woff');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'NPSfontBold';
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2310@1.0/NPSfontBold.woff2') format('woff2');
font-weight: 400;
font-style: normal;
}

@font-face {
font-family: 'omyu_pretty';
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2304-01@1.0/omyu_pretty.woff2') format('woff2');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'seolleimcool-SemiBold';
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2312-1@1.1/seolleimcool-SemiBold.woff2') format('woff2');
font-weight: normal;
font-style: normal;
}

/* http://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126
License: none (public domain)
*/
html,
body,
div,
span,
applet,
object,
iframe,
h1,
h2,
h3,
h4,
h5,
h6,
p,
blockquote,
pre,
a,
abbr,
acronym,
address,
big,
cite,
code,
del,
dfn,
em,
img,
ins,
kbd,
q,
s,
samp,
small,
strike,
strong,
sub,
sup,
tt,
var,
b,
u,
i,
center,
dl,
dt,
dd,
ol,
ul,
li,
fieldset,
form,
label,
legend,
table,
caption,
tbody,
tfoot,
thead,
tr,
th,
td,
article,
aside,
canvas,
details,
embed,
figure,
figcaption,
footer,
header,
hgroup,
menu,
nav,
output,
ruby,
section,
summary,
time,
mark,
audio,
video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
menu,
nav,
section {
display: block;
}
body {
line-height: 1;
}
ol,
ul {
list-style: none;
}
blockquote,
q {
quotes: none;
}
blockquote:before,
blockquote:after,
q:before,
q:after {
content: '';
content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
/* Custom Setting CSS */
body {
width: 100%;
}
button,
input {
appearance: none;
border: 0;
padding: 0;
background-color: transparent;
border-radius: 0;
}
button {
cursor: pointer;
}
a {
text-decoration: none;
cursor: pointer;
}
a:hover,
a:focus {
text-decoration: underline;
}
74 changes: 0 additions & 74 deletions src/index.css

This file was deleted.

2 changes: 1 addition & 1 deletion src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import App from './App';
import './index.css';
import './global.css';

ReactDOM.createRoot(document.getElementById('root')!).render(
<React.StrictMode>
Expand Down
11 changes: 8 additions & 3 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@ export default {
theme: {
extend: {
// 메인 및 서브 색상 지정
colors: {},
fontFamily: {
sans: ['sans-serif'],
colors: {
darkPurple: '#66629F',
purple: '#918DCA',
skyBlue: '#A3C9F0',
darkGary: '#8E8E8E',
gray: '#B4B4B4',
lightGray: '#D9D9D9',
white: '#FFFFFF',
},
},
},
Expand Down

0 comments on commit 56b9af1

Please sign in to comment.