Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
sonah5009 committed Nov 16, 2024
2 parents 86a9156 + 0226104 commit a8684a6
Show file tree
Hide file tree
Showing 6 changed files with 1,152 additions and 1,117 deletions.
Binary file modified .DS_Store
Binary file not shown.
72 changes: 47 additions & 25 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,27 @@
<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" />
<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>
<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">
Expand All @@ -76,7 +76,7 @@
</ul>
</nav>
</aside>

<main>
<!-- MAV 명칭 소개 -->
<section class="section-padding bar" id="move">
Expand All @@ -96,12 +96,12 @@
</div>
<h2>서류 접수</h2>
<p>2024.02.24(토) ~ 03.03(일)</p>
</div>
</div>
<!-- <div style="padding-top: 10px">오류가 생겨 고치는 중입니다. 구글 폼 작성은 2023.02.21 오후 6시에 열립니다.</div>
<div>궁금한 점은 <a href="http://pf.kakao.com/_yDxkvxj" style="color: yellow">카카오톡 채널</a>로 문의 주세요</div> -->
<div id="applyBtn">
<a target="_blank" href="https://forms.gle/3GDcXwkRkvHdveLLA">
지원하기
<a target="_blank" href="https://forms.gle/3GDcXwkRkvHdveLLA">
지원하기
</a>
</div>
</section>
Expand All @@ -110,6 +110,11 @@ <h2>서류 접수</h2>
<div id="footer-p">MAV</div><br>

<div id="footer-location">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-geo-alt-fill"
viewBox="0 0 16 16">
<path d="M8 16s6-5.686 6-10A6 6 0 0 0 2 6c0 4.314 6 10 6 10zm0-7a3 3 0 1 1 0-6 3 3 0 0 1 0 6z"></path>
</svg>
성균관대학교 자연과학캠퍼스 반도체관 400617
<a href="https://map.naver.com/p/entry/place/19198641?c=16.00,0,0,0,dh" target="_blank" class="footer_logo">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-geo-alt-fill"
viewBox="0 0 16 16">
Expand All @@ -124,15 +129,32 @@ <h2>서류 접수</h2>
<br>
<div>
<a href="http://pf.kakao.com/_jltrG" target="_blank" class="footer_logo">
<svg width="30" height="30" fill="none" xmlns="http://www.w3.org/2000/svg" role="img" id="kakao"><path d="M15 21.525c-.606 0-1.2-.039-1.776-.114-.577.374-3.911 2.531-4.226 2.572 0 0-.128.046-.238-.013-.11-.06-.09-.217-.09-.217.033-.207.864-2.85 1.017-3.337C6.872 19.13 5 16.856 5 14.263 5 10.252 9.477 7 15 7s10 3.252 10 7.263c0 4.01-4.477 7.262-10 7.262Z" fill="#FCFCFC"></path><path d="M11.22 13.177h-.86v3.111c0 .276-.247.5-.552.5-.305 0-.551-.224-.551-.5v-3.111h-.861a.553.553 0 0 1-.357-.163.5.5 0 0 1-.144-.35.5.5 0 0 1 .144-.35.553.553 0 0 1 .357-.162h2.824c.136.01.263.067.356.162a.5.5 0 0 1 .145.35.5.5 0 0 1-.145.35.553.553 0 0 1-.356.163Zm10.773 2.753a.511.511 0 0 1 .107.388.503.503 0 0 1-.215.344.57.57 0 0 1-.773-.102l-1.293-1.627-.191.182v1.142a.512.512 0 0 1-.162.37.568.568 0 0 1-.78 0 .511.511 0 0 1-.161-.37v-3.582a.513.513 0 0 1 .17-.357.568.568 0 0 1 .381-.145c.143 0 .28.052.382.146a.513.513 0 0 1 .17.356V13.8l1.54-1.461a.43.43 0 0 1 .304-.118c.137 0 .277.057.38.156a.506.506 0 0 1 .162.331.388.388 0 0 1-.121.32l-1.257 1.192 1.358 1.709h-.001Zm-8.187-3.26a.827.827 0 0 0-.735-.518.828.828 0 0 0-.735.516l-1.318 3.297c-.168.493-.022.678.13.745.11.047.23.072.35.071.23 0 .406-.088.459-.23l.273-.68h1.682l.273.68c.053.142.229.23.46.23.12 0 .24-.024.35-.072.151-.066.297-.25.13-.745l-1.319-3.296v.001Zm-1.285 2.274.55-1.486.55 1.486h-1.1Zm5.79 1.287a.48.48 0 0 1-.16.344.533.533 0 0 1-.37.137h-1.768a.545.545 0 0 1-.37-.136.494.494 0 0 1-.16-.345v-3.556c0-.289.253-.524.564-.524.311 0 .563.235.563.524v3.077h1.172c.29 0 .53.215.53.48h-.002Z" fill="#2A2A2A"></path></svg>
<svg width="30" height="30" fill="none" xmlns="http://www.w3.org/2000/svg" role="img" id="kakao">
<path
d="M15 21.525c-.606 0-1.2-.039-1.776-.114-.577.374-3.911 2.531-4.226 2.572 0 0-.128.046-.238-.013-.11-.06-.09-.217-.09-.217.033-.207.864-2.85 1.017-3.337C6.872 19.13 5 16.856 5 14.263 5 10.252 9.477 7 15 7s10 3.252 10 7.263c0 4.01-4.477 7.262-10 7.262Z"
fill="#FCFCFC"></path>
<path
d="M11.22 13.177h-.86v3.111c0 .276-.247.5-.552.5-.305 0-.551-.224-.551-.5v-3.111h-.861a.553.553 0 0 1-.357-.163.5.5 0 0 1-.144-.35.5.5 0 0 1 .144-.35.553.553 0 0 1 .357-.162h2.824c.136.01.263.067.356.162a.5.5 0 0 1 .145.35.5.5 0 0 1-.145.35.553.553 0 0 1-.356.163Zm10.773 2.753a.511.511 0 0 1 .107.388.503.503 0 0 1-.215.344.57.57 0 0 1-.773-.102l-1.293-1.627-.191.182v1.142a.512.512 0 0 1-.162.37.568.568 0 0 1-.78 0 .511.511 0 0 1-.161-.37v-3.582a.513.513 0 0 1 .17-.357.568.568 0 0 1 .381-.145c.143 0 .28.052.382.146a.513.513 0 0 1 .17.356V13.8l1.54-1.461a.43.43 0 0 1 .304-.118c.137 0 .277.057.38.156a.506.506 0 0 1 .162.331.388.388 0 0 1-.121.32l-1.257 1.192 1.358 1.709h-.001Zm-8.187-3.26a.827.827 0 0 0-.735-.518.828.828 0 0 0-.735.516l-1.318 3.297c-.168.493-.022.678.13.745.11.047.23.072.35.071.23 0 .406-.088.459-.23l.273-.68h1.682l.273.68c.053.142.229.23.46.23.12 0 .24-.024.35-.072.151-.066.297-.25.13-.745l-1.319-3.296v.001Zm-1.285 2.274.55-1.486.55 1.486h-1.1Zm5.79 1.287a.48.48 0 0 1-.16.344.533.533 0 0 1-.37.137h-1.768a.545.545 0 0 1-.37-.136.494.494 0 0 1-.16-.345v-3.556c0-.289.253-.524.564-.524.311 0 .563.235.563.524v3.077h1.172c.29 0 .53.215.53.48h-.002Z"
fill="#2A2A2A"></path>
</svg>
<p>
카톡채널링크 http://pf.kakao.com/_jltrG
</p>
</a>
</div>
<div id="github-icon">
<a href="https://github.com/SKKU-MAV" target="_blank">
<svg width="40" height="40" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg" role="img"><g clip-path="url(#github-40x40_svg__a)"><path d="M23.467 41.628c0 1.046.033 2.088-.012 3.125-.03.71-.623 1.034-1.337.785-2.353-.822-4.465-2.053-6.31-3.733-2.268-2.064-3.926-4.535-4.95-7.425a18.055 18.055 0 0 1-1.007-7.438c.323-4.37 1.984-8.162 5.01-11.319 3.36-3.505 7.496-5.4 12.354-5.606C35.5 9.67 42.901 14.907 45.36 22.82a17.859 17.859 0 0 1 .63 7.969c-.736 5.04-3.17 9.08-7.207 12.16-1.487 1.134-3.141 1.977-4.909 2.589-.82.283-1.369-.124-1.367-1.015 0-1.564.017-3.127.02-4.691 0-.86-.094-1.708-.492-2.484-.18-.354-.425-.674-.66-1.041.389-.062.793-.12 1.196-.188 1.39-.236 2.71-.663 3.884-1.47 1.376-.947 2.244-2.265 2.68-3.853.488-1.766.644-3.562.223-5.37a6.43 6.43 0 0 0-1.412-2.752c-.166-.194-.203-.352-.127-.598.463-1.474.296-2.923-.239-4.342-.038-.103-.266-.21-.385-.19-.581.09-1.193.134-1.724.36-.91.39-1.76.91-2.647 1.354-.17.085-.406.14-.585.095a17.702 17.702 0 0 0-8.508 0 .797.797 0 0 1-.55-.086c-1.058-.66-2.128-1.288-3.35-1.59a5.22 5.22 0 0 0-1.124-.133c-.115-.002-.3.14-.341.257-.521 1.439-.658 2.897-.19 4.383a.5.5 0 0 1-.087.399c-1.212 1.446-1.743 3.112-1.696 4.99.038 1.517.242 2.992.885 4.383.784 1.7 2.092 2.832 3.809 3.528 1.016.413 2.08.63 3.16.776.116.015.231.041.332.06-.237.39-.5.75-.687 1.148-.154.327-.208.699-.323 1.046-.037.112-.104.263-.197.3-1.4.564-2.792.7-4.063-.297-.391-.308-.717-.725-.996-1.142-.547-.816-1.171-1.535-2.138-1.828a3.381 3.381 0 0 0-1.214-.108c-.371.028-.44.286-.185.569.157.173.338.337.535.46.844.535 1.392 1.31 1.796 2.194.305.669.581 1.35 1.12 1.874 1.01.982 2.252 1.308 3.614 1.26.518-.018 1.035-.104 1.628-.166l-.001-.002Z" fill="#FCFCFC"></path></g><defs><clipPath id="github-40x40_svg__a"><path fill="#fff" transform="translate(9.8 10)" d="M0 0h36.38v35.624H0z"></path></clipPath></defs>
<svg width="40" height="40" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg" role="img">
<g clip-path="url(#github-40x40_svg__a)">
<path
d="M23.467 41.628c0 1.046.033 2.088-.012 3.125-.03.71-.623 1.034-1.337.785-2.353-.822-4.465-2.053-6.31-3.733-2.268-2.064-3.926-4.535-4.95-7.425a18.055 18.055 0 0 1-1.007-7.438c.323-4.37 1.984-8.162 5.01-11.319 3.36-3.505 7.496-5.4 12.354-5.606C35.5 9.67 42.901 14.907 45.36 22.82a17.859 17.859 0 0 1 .63 7.969c-.736 5.04-3.17 9.08-7.207 12.16-1.487 1.134-3.141 1.977-4.909 2.589-.82.283-1.369-.124-1.367-1.015 0-1.564.017-3.127.02-4.691 0-.86-.094-1.708-.492-2.484-.18-.354-.425-.674-.66-1.041.389-.062.793-.12 1.196-.188 1.39-.236 2.71-.663 3.884-1.47 1.376-.947 2.244-2.265 2.68-3.853.488-1.766.644-3.562.223-5.37a6.43 6.43 0 0 0-1.412-2.752c-.166-.194-.203-.352-.127-.598.463-1.474.296-2.923-.239-4.342-.038-.103-.266-.21-.385-.19-.581.09-1.193.134-1.724.36-.91.39-1.76.91-2.647 1.354-.17.085-.406.14-.585.095a17.702 17.702 0 0 0-8.508 0 .797.797 0 0 1-.55-.086c-1.058-.66-2.128-1.288-3.35-1.59a5.22 5.22 0 0 0-1.124-.133c-.115-.002-.3.14-.341.257-.521 1.439-.658 2.897-.19 4.383a.5.5 0 0 1-.087.399c-1.212 1.446-1.743 3.112-1.696 4.99.038 1.517.242 2.992.885 4.383.784 1.7 2.092 2.832 3.809 3.528 1.016.413 2.08.63 3.16.776.116.015.231.041.332.06-.237.39-.5.75-.687 1.148-.154.327-.208.699-.323 1.046-.037.112-.104.263-.197.3-1.4.564-2.792.7-4.063-.297-.391-.308-.717-.725-.996-1.142-.547-.816-1.171-1.535-2.138-1.828a3.381 3.381 0 0 0-1.214-.108c-.371.028-.44.286-.185.569.157.173.338.337.535.46.844.535 1.392 1.31 1.796 2.194.305.669.581 1.35 1.12 1.874 1.01.982 2.252 1.308 3.614 1.26.518-.018 1.035-.104 1.628-.166l-.001-.002Z"
fill="#FCFCFC"></path>
</g>
<defs>
<clipPath id="github-40x40_svg__a">
<path fill="#fff" transform="translate(9.8 10)" d="M0 0h36.38v35.624H0z"></path>
</clipPath>
</defs>
</svg>
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion javascript/members.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const items_name = document.getElementsByClassName("dropdown-item");
const content6 = document.getElementById("content6");
const content7 = document.getElementById("content7");

// content6.style.display = "block";
content7.style.display = "block";
// button6을 누르면 특정 내용이 content 영역에 보여짐
button6.addEventListener("click", function(){
content7.style.display = "none";
Expand Down
Loading

0 comments on commit a8684a6

Please sign in to comment.