Skip to content

Commit

Permalink
Merge pull request #13 from LetsExercise/feat-favicon
Browse files Browse the repository at this point in the history
[Feat] favicon
  • Loading branch information
castberry10 authored Aug 5, 2024
2 parents b895365 + 193ea58 commit 9f574c4
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 40 deletions.
36 changes: 0 additions & 36 deletions README copy.md

This file was deleted.

Binary file added public/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/app/favicon.ico
Binary file not shown.
16 changes: 16 additions & 0 deletions src/app/layout.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.child {
// background-color: red;
width: 390px;
// border: 1px solid #000;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.1);
}

.parent {
// background-color: blue;
width: 100%;
height: 100vh;
display: flex;
justify-content: center;
// shadow: 0 0 10px 0 rgba(0, 0, 0, 0.1);

}
19 changes: 16 additions & 3 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
import type { Metadata } from "next";
import { Inter } from "next/font/google";
import "./globals.scss";

import Head from 'next/head';
import favicon from "./favicon.ico";
const inter = Inter({ subsets: ["latin"] });

import style from "./layout.module.scss";
export const metadata: Metadata = {
title: "dailypet",
description: "My Daily Companion, Daily Pet",
icons: {
icon: '/favicon.ico',
},
};

export default function RootLayout({
Expand All @@ -16,7 +20,16 @@ export default function RootLayout({
}>) {
return (
<html lang="ko">
<body className={inter.className}>{children}</body>
{/* <Head>
<link rel="icon" href="/favicon.ico" />
</Head> */}
<body>
<div className={style.parent}>
<div className={style.child}>
{children}
</div>
</div>
</body>
</html>
);
}
2 changes: 1 addition & 1 deletion src/app/page.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}
button{
margin: 5px;
width: 60vw;
width: 250px;
}
}
.smallfont {
Expand Down

0 comments on commit 9f574c4

Please sign in to comment.