Skip to content

Commit

Permalink
Merge pull request #7 from BCSDLab/feature/#5
Browse files Browse the repository at this point in the history
[공통] 이미지경로 수정, favicon, title 추가
  • Loading branch information
MinGu-Jeong authored Feb 11, 2024
2 parents b8a59c7 + 2c175f3 commit 34e12bd
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!doctype html>
<html lang="en">
<html lang="ko">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<link rel="icon" type="image/png" href="https://image.bcsdlab.com/banner2.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React + TS</title>
<title>BCSD Internal</title>
</head>
<body>
<div id="root"></div>
Expand Down
Binary file removed src/assets/image/BCSD_logo-01.png
Binary file not shown.
4 changes: 4 additions & 0 deletions src/const/colors/style.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export const colors = {
gray: '#F9FAFB',
borderGray: '#e0e0e0'
};
2 changes: 1 addition & 1 deletion src/layout/DefaultLayout/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export default function DefaultLayout() {
return (
<div css={S.container}>
<div css={S.sideBar}>
<img src="/src/assets/image/BCSD_logo-01.png" alt="logo" css={S.logo} />
<img src="https://image.bcsdlab.com/banner.png" alt="logo" css={S.logo} />
<Button variant="outlined" color="secondary" sx={{ marginTop: '20px' }}>회원정보</Button>
</div>
<div css={S.content}>
Expand Down
16 changes: 6 additions & 10 deletions src/layout/DefaultLayout/style.ts
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
import {css} from '@emotion/react';

const color = {
gray: '#F9FAFB',
borderGray: '#e0e0e0'
};
import {colors} from 'const/colors/style'

export const sideBar = css`
display: flex;
flex-direction: column;
width: 250px;
height: 100vh;
background-color: ${color.gray};
border-right: 1px solid ${color.borderGray};
background-color: ${colors.gray};
border-right: 1px solid ${colors.borderGray};
`;

export const topBar = css`
width: 100%;
height: 100px;
background-color: ${color.gray};
border-bottom: 1px solid ${color.borderGray};
background-color: ${colors.gray};
border-bottom: 1px solid ${colors.borderGray};
`;

export const content = css`
Expand All @@ -30,7 +26,7 @@ export const content = css`

export const container = css`
display: flex;
background-color: ${color.gray};
background-color: ${colors.gray};
width: 100%;
height: 100%;
`;
Expand Down

0 comments on commit 34e12bd

Please sign in to comment.