Skip to content

Commit

Permalink
Merge branch 'main' into gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
mongsam2 committed Jan 14, 2024
2 parents cc90ed4 + 2fc20d6 commit 987bce6
Showing 9 changed files with 122 additions and 9 deletions.
2 changes: 1 addition & 1 deletion chats.html
Original file line number Diff line number Diff line change
@@ -77,7 +77,7 @@ <h6 class="user-component__subtitle">멍멍멍!</h6>
<nav class="nav">
<ul class="nav__list">
<li class="nav__btn">
<a class="nav__link" href="friends.html"
<a class="nav__link" href="friends2.html"
><i class="fa-regular fa-user fa-2x"></i
></a>
</li>
2 changes: 1 addition & 1 deletion css/components/status-bar.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.status-bar {
z-index: 10;
z-index: 2;
display: flex;
justify-content: center;
position: fixed;
3 changes: 2 additions & 1 deletion css/screens/friends.css
Original file line number Diff line number Diff line change
@@ -34,8 +34,9 @@
}

#splash-screen {
z-index: 10;
background-color: var(--yellow);
position: absolute;
position: fixed;
width: 100vw;
height: 100vh;
top: 0;
2 changes: 1 addition & 1 deletion css/styles.css
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@

body {
font-family: "Open Sans", sans-serif;
height: 2000px;
height: 1500px;
color: #2e363e;
}
.main-screen {
2 changes: 1 addition & 1 deletion find.html
Original file line number Diff line number Diff line change
@@ -85,7 +85,7 @@ <h6 class="open-post__hashtags">#멍일이#멍이#멍삼이</h6>
<nav class="nav">
<ul class="nav__list">
<li class="nav__btn">
<a class="nav__link" href="friends.html"
<a class="nav__link" href="friends2.html"
><i class="fa-regular fa-user fa-2x"></i
></a>
</li>
4 changes: 2 additions & 2 deletions friends.html
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
<link href="css/styles.css" rel="stylesheet" />
<title>Freinds - Kokoa Clone</title>
</head>
<body>
<body id="friends">
<div class="status-bar">
<div class="status-bar__column">
<span>No Service</span>
@@ -78,7 +78,7 @@ <h4 class="user-component__title user-component__title--not-bold">
<nav class="nav">
<ul class="nav__list">
<li class="nav__btn">
<a class="nav__link" href="friends.html"
<a class="nav__link" href="friends2.html"
><i class="fa-solid fa-user fa-2x"></i
></a>
</li>
112 changes: 112 additions & 0 deletions friends2.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link href="css/styles.css" rel="stylesheet" />
<title>Freinds - Kokoa Clone</title>
</head>
<body>
<div class="status-bar">
<div class="status-bar__column">
<span>No Service</span>
<i class="fa-solid fa-wifi"></i>
</div>
<div class="status-bar__column">
<span>18:43</span>
</div>
<div class="status-bar__column">
<span>100%</span>
<i class="fa-solid fa-battery-full fa-xl"></i>
<i class="fa-solid fa-bolt"></i>
</div>
</div>

<header class="screen-header">
<h1 class="screen-header__title">Friends</h1>
<div class="screen-header__icons">
<span><i class="fa-solid fa-magnifying-glass fa-lg"></i></span>
<span><i class="fa-solid fa-music fa-lg"></i></span>
<span><i class="fa-solid fa-gear fa-lg"></i></span>
</div>
</header>

<a id="friends-display-link">
<i class="fa-solid fa-circle-info"></i> Friends's Names Display
<i class="fa-solid fa-chevron-right fa-xs"></i>
</a>

<main class="main-screen friends-screen">
<div class="user-component">
<div class="user-component__column">
<img
class="user-component__avatar user-component__avatar--xl"
src="screenshots/profile.jpg"
/>
<div class="user-component__text">
<h4 class="user-component__title">Jaehyun</h4>
<!--<h6 class="user-component__subtitle">This text is whatever</h6>-->
</div>
</div>
<div class="user-component__column"></div>
</div>
<div class="friends-screen__channel">
<div class="friends-screen__channel-header">
<span>Channel</span>
<i class="fa-solid fa-chevron-up fa-xs"></i>
</div>
<div class="user-component">
<div class="user-component__column">
<img
class="user-component__avatar user-component__avatar--sm"
src="screenshots/profile.jpg"
/>
<div class="user-component__text">
<h4 class="user-component__title user-component__title--not-bold">
멍멍이들...
</h4>
<!--<h6 class="user-component__subtitle">This text is whatever</h6>-->
</div>
</div>
<div class="user-component__column">
<span>2 <i class="fa-solid fa-chevron-right fa-xs"></i></span>
</div>
</div>
</div>
</main>

<nav class="nav">
<ul class="nav__list">
<li class="nav__btn">
<a class="nav__link" href="friends2.html"
><i class="fa-solid fa-user fa-2x"></i
></a>
</li>
<li class="nav__btn">
<a class="nav__link" href="chats.html">
<span class="badge nav__notification">1</span>
<i class="fa-regular fa-comment fa-2x"></i
></a>
</li>
<li class="nav__btn">
<a class="nav__link" href="find.html"
><i class="fa-solid fa-magnifying-glass fa-2x"></i
></a>
</li>
<li class="nav__btn">
<a class="nav__link" href="more.html">
<span class="badge badge--small"></span>
<i class="fa-solid fa-ellipsis fa-2x"></i>
</a>
</li>
</ul>
</nav>
<div id="no-mobile">
<span>Your screen is too big!!</span>
</div>
<script
src="https://kit.fontawesome.com/23b670e447.js"
crossorigin="anonymous"
></script>
</body>
</html>
2 changes: 1 addition & 1 deletion more.html
Original file line number Diff line number Diff line change
@@ -104,7 +104,7 @@ <h4 class="more-suggestions__title">Suggestions</h4>
<nav class="nav">
<ul class="nav__list">
<li class="nav__btn">
<a class="nav__link" href="friends.html"
<a class="nav__link" href="friends2.html"
><i class="fa-regular fa-user fa-2x"></i
></a>
</li>
2 changes: 1 addition & 1 deletion setting.html
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ <h1 class="alt-header__title">Settings</h1>
<nav class="nav">
<ul class="nav__list">
<li class="nav__btn">
<a class="nav__link" href="friends.html"
<a class="nav__link" href="friends2.html"
><i class="fa-regular fa-user fa-2x"></i
></a>
</li>

0 comments on commit 987bce6

Please sign in to comment.