Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed emoticon and made some spelling corrections #19

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<div class="footer-wrapper">
<footer class="footer">
<div class="column">
<div class="group">
<a href="{{ site.baseurl }}/"><i class="icon" aria-hidden="true" style="font-size: 10rem">logo</i></a>
</div>
</div>
<div class="column">
<div class="group">
<ul class="links">
<li class="link"><a href="{{ site.baseurl }}/join-us/">Join Us</a></li>
<li class="link"><a href="{{ site.baseurl }}/contact">Contact</a></li>
<li class="link"><a href="{{ site.baseurl }}/partners">Partners</a></li>
<li class="link"><a href="{{ site.baseurl }}/past-years">Past Years</a></li>
</ul>
</div>
<div class="group">
<ul class="links">
<li class="link"><a href="https://instagram.com/{{ site.instagram }}" target="_blank"><i class="icon" aria-hidden="true">instagram</i> Instagram</a></li>
<li class="link"><a href="https://github.com/{{ site.github }}" target="_blank"><i class="icon" aria-hidden="true">github</i> GitHub</a></li>
</ul>
</div>
<div class="group">
<small>Hand-crafted by <a href="https://ambrose.makerforce.io/">Ambrose</a> <a href="https://github.com/ddx-510">DDX</a> <a href="https://github.com/thepoppycat">thepoppycat</a> <a href="https://github.com/sp0002">sp0002</a> <a href="https://github.com/emilyong">eohq11</a></small>
</div>
</div>
</footer>
</div>
<footer class="footer">
<div class="column">
<div class="group">
<a href="{{ site.baseurl }}/"><i class="icon" aria-hidden="true" style="font-size: 10rem">logo</i></a>
</div>
</div>
<div class="column">
<div class="group">
<ul class="links">
<li class="link"><a href="{{ site.baseurl }}/join-us/">Join Us</a></li>
<li class="link"><a href="{{ site.baseurl }}/contact">Contact</a></li>
<li class="link"><a href="{{ site.baseurl }}/partners">Partners</a></li>
<li class="link"><a href="{{ site.baseurl }}/past-years">Past Years</a></li>
</ul>
</div>
<div class="group">
<ul class="links">
<li class="link"><a href="https://instagram.com/{{ site.instagram }}" target="_blank"><i class="icon" aria-hidden="true">instagram</i> Instagram</a></li>
<li class="link"><a href="https://github.com/{{ site.github }}" target="_blank"><i class="icon" aria-hidden="true">github</i> GitHub</a></li>
</ul>
</div>
<div class="group">
<small>Hand-crafted by <a href="https://ambrose.makerforce.io/">Ambrose</a> <a href="https://github.com/ddx-510">DDX</a> <a href="https://github.com/thepoppycat">thepoppycat</a> <a href="https://github.com/sp0002">sp0002</a> <a href="https://github.com/emilyong">eohq11</a></small>
</div>
</div>
</footer>
</div>
120 changes: 59 additions & 61 deletions _includes/navigation.html
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
<form class="navigation-wrapper">
<nav class="navigation">
<div class="brand">
<a href="{{ site.baseurl }}/" title="Home">
<i class="logo icon" aria-hidden="true">logo</i>
<span class="name">{{ site.title }}</span>
</a>
</div>
<label for="menu" class="icon">menu</label>
<input id="menu" type="checkbox" />
<nav class="navigation">
<div class="brand">
<a href="{{ site.baseurl }}/" title="Home">
<i class="logo icon" aria-hidden="true">logo</i>
<span class="name">{{ site.title }}</span>
</a>
</div>
<label for="menu" class="icon">menu</label>
<input id="menu" type="checkbox" />

<ul class="links">
<li class="link"><a href="{{ site.baseurl }}/join-us">Join Us</a></li>
<li class="link"><a href="{{ site.baseurl }}/about">About</a></li>
<li class="link"><a href="{{ site.baseurl }}/contact">Contact</a></li>
<li class="link dropdown">
<a>Events</a>
<i class="fa fa-caret-down"></i>
<div class="dropdown-content">
<a href="{{ site.baseurl }}/events/june-conference"
>June Conference</a
<ul class="links">
<li class="link"><a href="{{ site.baseurl }}/join-us">Join Us</a></li>
<li class="link"><a href="{{ site.baseurl }}/about">About</a></li>
<li class="link"><a href="{{ site.baseurl }}/contact">Contact</a></li>
<li class="link dropdown">
<a>Events</a>
<i class="fa fa-caret-down"></i>
<div class="dropdown-content">
<a href="{{ site.baseurl }}/events/june-conference">June Conference</a
>
<a href="{{ site.baseurl }}/events/codecombat-tournament"
>CodeCombat Tournament</a
Expand All @@ -30,56 +29,55 @@
</li>
<li class="link dropdown">
<a>Activities</a>
<i class="fa fa-caret-down"></i>
<div class="dropdown-content">
<a href="{{ site.baseurl }}/activities/carls-ct-adventure"
>Carl's CT Adventure</a
<i class="fa fa-caret-down"></i>
<div class="dropdown-content">
<a href="{{ site.baseurl }}/activities/carls-ct-adventure">Carl's CT Adventure</a
>
<a href="{{ site.baseurl }}/activities/coursemology">Coursemology</a>
<a href="{{ site.baseurl }}/activities/entertainment"
>Entertainment</a
<a href="{{ site.baseurl }}/activities/entertainment">Entertainment</a
>
<a href="{{ site.baseurl }}/activities/competition-series"
>Competition Series</a
>
</div>
</li>
<li class="link"><a href="{{ site.baseurl }}/partners">Partners</a></li>
</ul>
</nav>
</ul>
</nav>
</form>
<style type="text/css">
.dropdown-content {
display: none;
position: absolute;
background-color: rgba(255, 255, 255, 0.95);
min-width: 160px;
box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
z-index: 1;
}

.invert .dropdown-content {
display: none;
position: absolute;
background-color: rgba(255, 153, 0, 0.95);
min-width: 160px;
box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
z-index: 1;
}
.dropdown-content a {
float: none;
color: black;
padding: 12px 16px;
text-decoration: none;
display: block;
text-align: left;
}

.dropdown-content a:hover {
color: #ffc979;
}

.dropdown:hover .dropdown-content {
display: block;
}
</style>
.dropdown-content {
display: none;
position: absolute;
background-color: rgba(255, 255, 255, 0.95);
min-width: 160px;
box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
z-index: 1;
}

.invert .dropdown-content {
display: none;
position: absolute;
background-color: rgba(255, 153, 0, 0.95);
min-width: 160px;
box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
z-index: 1;
}

.dropdown-content a {
float: none;
color: black;
padding: 12px 16px;
text-decoration: none;
display: block;
text-align: left;
}

.dropdown-content a:hover {
color: #ffc979;
}

.dropdown:hover .dropdown-content {
display: block;
}
</style>
13 changes: 8 additions & 5 deletions _layouts/default.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<!DOCTYPE html>
<html lang="en">

<head>

<meta charset="UTF-8">
<title>{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}</title>
<meta name="author" content="{{ site.author }}">

<meta name="viewport" content="width=device-width">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Barlow+Condensed:500|Source+Sans+Pro:400,400i,700,700i">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Barlow+Condensed:500|Source+Sans+Pro:400,400i,700,700i">
<link rel="stylesheet" href="{{ site.baseurl }}/assets/icomoon/style.css">
<link rel="stylesheet" href="{{ site.baseurl }}/assets/css/style.css">

Expand All @@ -16,10 +17,11 @@
<link rel="apple-touch-icon" href="{{ site.baseurl }}/assets/img/touch.png">

</head>

<body>

{% include navigation.html %}

<main>
{{ content }}
</main>
Expand All @@ -29,4 +31,5 @@
<script src="{{ site.baseurl }}/assets/js/navigation.js"></script>

</body>
</html>

</html>
Loading