Skip to content

Commit

Permalink
Conflict 해결
Browse files Browse the repository at this point in the history
  • Loading branch information
@hyunseo11
hyunseo11 committed May 5, 2024
2 parents 8846c7f + daadaa9 commit 600b419
Show file tree
Hide file tree
Showing 25 changed files with 310 additions and 333 deletions.
Binary file removed image/google icon.png
View file
Binary file not shown.
Binary file removed image/kakao icon.png
View file
Binary file not shown.
Binary file removed image/디스크립션 없는 팝업.jpg
View file
Binary file not shown.
Binary file removed image/폴더 공유하기.png
View file
Binary file not shown.
262 changes: 145 additions & 117 deletions index.html
View file
Original file line number Diff line number Diff line change
@@ -1,124 +1,152 @@
<!DOCTYPE html>
<html lang="ko">
<head>
<meta charset="UTF-8">
<meta name="title" content="Linkbrary">
<meta name="discription" content="세상의 모든 정보를 쉽게 저장하고 관리해보세요">
<head>
<meta charset="UTF-8" />
<meta name="title" content="Linkbrary" />
<meta
name="discription"
content="세상의 모든 정보를 쉽게 저장하고 관리해보세요"
/>

<meta property="og:title" content="Linkbrary">
<meta property="og:discription" content="세상의 모든 정보를 쉽게 저장하고 관리해보세요">
<meta property="og:url" content="https://weeklymission-hs0727.netlify.app/">
<meta property="og:image" content="">

<meta name="twitter:title" content="Linkbrary">
<meta name="twitter:description" content="세상의 모든 정보를 쉽게 저장하고 관리해 보세요">
<meta name="twitter:url" content="https://weeklymission-hs0727.netlify.app/">
<meta name="twitter:image" content="">

<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Acme&display=swap" rel="stylesheet">
<title>Linkbrary</title>
<link rel="stylesheet" href="index.css">
<script src="https://kit.fontawesome.com/9d188ee567.js" crossorigin="anonymous"></script>
</head>
<body>
<nav>
<div class="gnb">
<a href="index.html">
<img class="gnb-logo" src="./image/Linkbrary.png">
</a>
<a href="./signin/signin.html">
<button class="gnb-button">로그인</button>
</a>
</div>
</nav>
<header>
<div class="maincontents">
<h2 class="maincontents_slogan">
<span id="maincontents-text-purple-to-pink">세상의 모든 정보</span>를<br>
쉽게 저장하고 관리해보세요
</h2>
</div>
<div class="maincontents_button-group">
<a href="./signup/signup.html">
<button class="maincontents_button-group_button">링크 추가하기</button>
</a>
</div>
<div class="dim">
<img class="dim-image" src="./image/dim.jpg">
</div>
</header>
<article>
<section>
<h3 class="section_title">
<span id="section_text-color-pink-to-blue">원하는 링크를</span>
저장하세요
</h3>
<img src="./image/card.jpg" class="section_img-box-image">
<p class="section_text_description">
나중에 읽고 싶은 글, 다시 보고 싶은 영상,
사고싶은 옷, 기억하고 싶은 모든 것을
한 공간에 저장하세요
</p>
</section>
<section>
<h3 class="section_title">
링크를 폴더로
<span id="section_text-color-yellow-to-blue">관리</span>하세요
</h3>
<img class="section_img-box-image" src="./image/디스크립션 없는 팝업.jpg">
<p class="section_text_description">
나만의 폴더를 무제한으로 만들고
다양하게 활용할 수 있습니다.
</p>
</section>
<section>
<h3 class="section_title">
저장한 링크를
<span id="section_text-color-purple-to-blue">공유</span>해 보세요
</h3>
<img class="section_img-box-image" src="./image/img3.png">
<p class="section_text_description">
여러 링크를 폴더에 담고 공유할 수 있습니다.
가족, 친구, 동료들에게 쉽고 빠르게 링크를
공유해 보세요.
</p>
</section>
<section>
<h3 class="section_title">
저장한 링크를
<span id="section_text-color-blue-to-purple">검색</span>해 보세요
</h3>
<img class="section_img-box-image" src="./image/스크린샷.jpg">
<p class="section_text_description">
중요한 정보들을 검색으로 쉽게 찾아보세요.
</p>
</section>
</article>
<footer>
<div class="footerbox">
<span class="codeitlogo">©codeit - 2023</span>
<div class="info">
<a href="/privacy">Privacy Policy</a>
<a href="/faq">FAQ</a>
</div>
<div class="icons">
<a href="https://www.facebook.com/?locale=ko_KR" target="_blank">
<i class="fa-brands fa-facebook"></i>
</a>
<a href="https://twitter.com/?lang=ko" target="_blank">
<i class="fa-brands fa-twitter"></i>
<meta property="og:title" content="Linkbrary" />
<meta
property="og:discription"
content="세상의 모든 정보를 쉽게 저장하고 관리해보세요"
/>
<meta
property="og:url"
content="https://weeklymission-hs0727.netlify.app/"
/>
<meta property="og:image" content="" />

<meta name="twitter:title" content="Linkbrary" />
<meta
name="twitter:description"
content="세상의 모든 정보를 쉽게 저장하고 관리해 보세요"
/>
<meta
name="twitter:url"
content="https://weeklymission-hs0727.netlify.app/"
/>
<meta name="twitter:image" content="" />

<link
rel="stylesheet"
type="text/css"
href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css"
/>
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Acme&display=swap"
rel="stylesheet"
/>
<title>Linkbrary</title>
<link rel="stylesheet" href="index.css" />
<script
src="https://kit.fontawesome.com/9d188ee567.js"
crossorigin="anonymous"
></script>
</head>
<body>
<nav>
<div class="gnb">
<a href="index.html">
<img class="gnb-logo" src="./image/Linkbrary.png" />
</a>
<a href="https://www.youtube.com/?gl=KR&hl=ko" target="_blank">
<i class="fa-brands fa-youtube"></i>
<a href="./signin/signin.html">
<button class="gnb-button">로그인</button>
</a>
<a href="https://www.instagram.com/" target="_blank">
<i class="fa-brands fa-square-instagram"></i>
</div>
</nav>
<header>
<div class="maincontents">
<h2 class="maincontents_slogan">
<span id="maincontents-text-purple-to-pink">세상의 모든 정보</span
>를<br />
쉽게 저장하고 관리해보세요
</h2>
</div>
<div class="maincontents_button-group">
<a href="./signup/signup.html">
<button class="maincontents_button-group_button">
링크 추가하기
</button>
</a>
</div>
</div>
</footer>
</body>
</html>
<div class="dim">
<img class="dim-image" src="./image/dim.jpg" />
</div>
</header>
<article>
<section>
<h3 class="section_title">
<span id="section_text-color-pink-to-blue">원하는 링크를</span>
저장하세요
</h3>
<img src="./image/card.jpg" class="section_img-box-image" />
<p class="section_text_description">
나중에 읽고 싶은 글, 다시 보고 싶은 영상, 사고싶은 옷, 기억하고 싶은
모든 것을 한 공간에 저장하세요
</p>
</section>
<section>
<h3 class="section_title">
링크를 폴더로
<span id="section_text-color-yellow-to-blue">관리</span>하세요
</h3>
<img
class="section_img-box-image"
src="./image/without-description-popup.jpg"
/>
<p class="section_text_description">
나만의 폴더를 무제한으로 만들고 다양하게 활용할 수 있습니다.
</p>
</section>
<section>
<h3 class="section_title">
저장한 링크를
<span id="section_text-color-purple-to-blue">공유</span>해 보세요
</h3>
<img class="section_img-box-image" src="./image/img3.png" />
<p class="section_text_description">
여러 링크를 폴더에 담고 공유할 수 있습니다. 가족, 친구, 동료들에게
쉽고 빠르게 링크를 공유해 보세요.
</p>
</section>
<section>
<h3 class="section_title">
저장한 링크를
<span id="section_text-color-blue-to-purple">검색</span>해 보세요
</h3>
<img class="section_img-box-image" src="./image/스크린샷.jpg" />
<p class="section_text_description">
중요한 정보들을 검색으로 쉽게 찾아보세요.
</p>
</section>
</article>
<footer>
<div class="footerbox">
<span class="codeitlogo">©codeit - 2023</span>
<div class="info">
<a href="/privacy">Privacy Policy</a>
<a href="/faq">FAQ</a>
</div>
<div class="icons">
<a href="https://www.facebook.com/?locale=ko_KR" target="_blank">
<i class="fa-brands fa-facebook"></i>
</a>
<a href="https://twitter.com/?lang=ko" target="_blank">
<i class="fa-brands fa-twitter"></i>
</a>
<a href="https://www.youtube.com/?gl=KR&hl=ko" target="_blank">
<i class="fa-brands fa-youtube"></i>
</a>
<a href="https://www.instagram.com/" target="_blank">
<i class="fa-brands fa-square-instagram"></i>
</a>
</div>
</div>
</footer>
</body>
</html>
Binary file removed public/favicon.ico
View file
Binary file not shown.
37 changes: 2 additions & 35 deletions public/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<html lang="ko">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>Linkbrary</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
Binary file removed public/logo192.png
View file
Binary file not shown.
Binary file removed public/logo512.png
View file
Binary file not shown.
25 changes: 0 additions & 25 deletions public/manifest.json
View file

This file was deleted.

3 changes: 0 additions & 3 deletions public/robots.txt
View file

This file was deleted.

10 changes: 7 additions & 3 deletions signin/sign.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,16 @@ header {
background-color: var(--background);
}

.login-button {
.btn-primary {
height: 53px;
padding: 16px 20px;
gap: 10px;
background-image: linear-gradient(90.99deg, var(--primary) 0.12%, #6AE3FE 101.84%);
color: #F5F5F5;
background-image: linear-gradient(
90.99deg,
var(--primary) 0.12%,
#6ae3fe 101.84%
);
color: #f5f5f5;
font-weight: 600;
font-size: 18px;
line-height: 21.48px;
Expand Down
Loading

0 comments on commit 600b419

Please sign in to comment.