Skip to content

Commit

Permalink
Merge pull request #2 from SKKU-MAV/dev
Browse files Browse the repository at this point in the history 
edit: nav 태그 side에 따른 drawer오류 해결
  • Loading branch information
@sonah5009
sonah5009 authored Nov 16, 2024
2 parents 0d3f2a4 + e6974d5 commit 438f3a2
Show file tree
Hide file tree
Showing 2 changed files with 96 additions and 97 deletions.
158 changes: 79 additions & 79 deletions activities.html
View file
Original file line number Diff line number Diff line change
@@ -1,90 +1,90 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />

<meta charset="UTF-8" />
<link rel="stylesheet" href="./styles/shared.css" />
<link rel="stylesheet" href="./styles/subpages.css" />
<link rel="stylesheet" href="./styles/activites.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=Gamja+Flower&family=Gothic+A1:wght@400;800&family=Paytone+One&family=Quicksand:wght@300;400&family=Rajdhani:wght@600&display=swap"
rel="stylesheet" />
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />

<title>MAV</title>
<!-- <link href="https://fonts.googleapis.com/css2?family=Gothic+A1:wght@400;800&display=swap" rel="stylesheet"> -->
<script src="./javascript/index.js" defer></script>
</head>
<meta charset="UTF-8" />
<link rel="stylesheet" href="./styles/shared.css" />
<link rel="stylesheet" href="./styles/subpages.css" />
<link rel="stylesheet" href="./styles/activites.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=Gamja+Flower&family=Gothic+A1:wght@400;800&family=Paytone+One&family=Quicksand:wght@300;400&family=Rajdhani:wght@600&display=swap"
rel="stylesheet" />

<body>
<header id="main-header">
<!-- <a href="./index.html" id="page-logo">MAV</a> -->
<a href="./index.html">
<img src="./images/logo.svg" alt="mav-logo" width="70" />
</a>
<ul>
<li>
<a href="./activities.html" class="nav-underline">ACTIVITIES</a>
</li>
<li>
<a href="./members.html" class="nav-underline">MEMBERS</a>
</li>
<li>
<a href="./recruitment.html" class="nav-underline">RECRUITMENT</a>
</li>
</ul>
</nav>
<a href="#side-drawer" class="menu-btn">
<title>MAV</title>
<!-- <link href="https://fonts.googleapis.com/css2?family=Gothic+A1:wght@400;800&display=swap" rel="stylesheet"> -->
<script src="./javascript/index.js" defer></script>
</head>

<body>
<header id="main-header">
<!-- <a href="./index.html" id="page-logo">MAV</a> -->
<a href="./index.html">
<img src="./images/logo.svg" alt="mav-logo" width="70" />
</a>
<nav>
<ul>
<li>
<a href="./activities.html" class="nav-underline">ACTIVITIES</a>
</li>
<li>
<a href="./members.html" class="nav-underline">MEMBERS</a>
</li>
<li>
<a href="./recruitment.html" class="nav-underline">RECRUITMENT</a>
</li>
</ul>
</nav>
<a href="#side-drawer" class="menu-btn">
<span></span>
<span></span>
<span></span>
</a>
</header>
<aside id="side-drawer">
<header>
<a href="#" class="menu-btn menu-btn-on">
<span></span>
<span></span>
<span></span>
</a>
</header>
<aside id="side-drawer">
<header>
<a href="#" class="menu-btn menu-btn-on">
<span></span>
<span></span>
<span></span>
</a>
</header>
<nav>
<ul>
<li>
<a href="./activities.html">ACTIVITIES</a>
</li>
<li>
<a href="./members.html">MEMBERS</a>
</li>
<li>
<a href="./recruitment.html">RECRUITMENT</a>
</li>
</ul>
</nav>
</aside>
<main>
<!-- MAV 명칭 소개 -->
<section class="section-padding">
<div>
<div class="subtitle">
<span class="color-blue-100">A</span>CTIVITIES
</div>
<p>성균관대학교 메타버스 스튜디오</p>
<nav>
<ul>
<li>
<a href="./activities.html">ACTIVITIES</a>
</li>
<li>
<a href="./members.html">MEMBERS</a>
</li>
<li>
<a href="./recruitment.html">RECRUITMENT</a>
</li>
</ul>
</nav>
</aside>
<main>
<!-- MAV 명칭 소개 -->
<section class="section-padding">
<div>
<div class="subtitle">
<span class="color-blue-100">A</span>CTIVITIES
</div>
</section>
<section class="section-padding">
<div class="project-title">Unity study - boost project</div>
<img
src="./images/activities1.gif"
alt="unity-activities1"
id="unity-activities1" />
</section>
</main>
<footer></footer>
</body>
</html>
<p>성균관대학교 메타버스 스튜디오</p>
</div>
</section>
<section class="section-padding">
<div class="project-title">Unity study - boost project</div>
<img src="./images/activities1.gif" alt="unity-activities1" id="unity-activities1" />
</section>
</main>
<footer></footer>
</body>

</html>
35 changes: 17 additions & 18 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,23 @@
<img src="./images/logo.svg" alt="mav-logo" width="70" />
</a>
<nav>
<nav>
<ul>
<li>
<a href="./activities.html" class="nav-underline">ACTIVITIES</a>
</li>
<li>
<a href="./members.html" class="nav-underline">MEMBERS</a>
</li>
<li>
<a href="./recruitment.html" class="nav-underline">RECRUITMENT</a>
</li>
</ul>
</nav>
<a href="#side-drawer" class="menu-btn">
<span></span>
<span></span>
<span></span>
</a>
<ul>
<li>
<a href="./activities.html" class="nav-underline">ACTIVITIES</a>
</li>
<li>
<a href="./members.html" class="nav-underline">MEMBERS</a>
</li>
<li>
<a href="./recruitment.html" class="nav-underline">RECRUITMENT</a>
</li>
</ul>
</nav>
<a href="#side-drawer" class="menu-btn">
<span></span>
<span></span>
<span></span>
</a>
</header>

<aside id="side-drawer">
Expand Down

0 comments on commit 438f3a2

Please sign in to comment.