Skip to content

Commit

Permalink
Merge pull request #367 from urinaner/feature/344
Browse files Browse the repository at this point in the history
[FIX] Eslint Prettier 문제 해결 및 재배포
  • Loading branch information
pillow12360 authored Feb 11, 2025
2 parents 71c6b04 + 85dee58 commit f800f3a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 38 deletions.
1 change: 1 addition & 0 deletions frontend/README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
## 세종대학교 바이오융합전공 홈페이지

![image](https://github.com/user-attachments/assets/fdd66cc3-a936-440d-bac3-2ebd96c1920c)
33 changes: 0 additions & 33 deletions frontend/src/components/Modal/templates/TermsModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,39 +87,6 @@ const StyledHeader = styled(Modal.Header)`
border-bottom: 1px solid #e5e7eb;
`;

const StyledFooter = styled(Modal.Footer)`
padding: 1.5rem 2rem;
border-top: 1px solid #e5e7eb;
display: flex;
justify-content: flex-end;
gap: 1rem;
`;

const CloseButton = styled(Modal.CloseButton)`
padding: 0.75rem 2rem;
background-color: #1a73e8;
color: white;
border: none;
border-radius: 4px;
font-weight: 500;
cursor: pointer;
transition: background-color 0.2s ease;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
'Helvetica Neue', Arial, sans-serif;
font-size: 1rem;
letter-spacing: -0.01em;
line-height: 1.5;
-webkit-font-smoothing: antialiased;
&:hover {
background-color: #1557b0;
}
&:focus {
outline: none;
}
`;

export interface TermsModalProps {
type: 'terms' | 'privacy' | 'collection';
isOpen: boolean;
Expand Down
7 changes: 4 additions & 3 deletions frontend/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
box-sizing: border-box;
}

html, body {
html,
body {
margin: 0;
padding: 0;
width: 100%;
Expand All @@ -20,8 +21,8 @@ html, body {
body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
9 changes: 7 additions & 2 deletions frontend/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,13 @@
"isolatedModules": true,
"noEmit": true,
"jsx": "react-jsx",
"typeRoots": ["./node_modules/@types", "src/types"],
"typeRoots": ["./node_modules/@types", "src/types"]
},
"include": ["src/**/*", "src/types/**/*", "src/**/*.ts", "src/**/*.tsx", "src/**/*.d.ts"
"include": [
"src/**/*",
"src/types/**/*",
"src/**/*.ts",
"src/**/*.tsx",
"src/**/*.d.ts"
]
}

0 comments on commit f800f3a

Please sign in to comment.