Skip to content

Commit

Permalink
Merge pull request #1 from ApocalypseCalculator/main
Browse files Browse the repository at this point in the history 
Improvements :D
  • Loading branch information
@rcshim04
rcshim04 authored May 30, 2021
2 parents 43701f5 + 5d9341c commit d08ead9
Show file tree
Hide file tree
Showing 15 changed files with 307 additions and 244 deletions.
40 changes: 22 additions & 18 deletions about/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,42 +5,47 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
<link href="../css/base.css" rel="stylesheet" type="text/css" />
<link href="../css/navbar.css" rel="stylesheet" type="text/css" />
<link href="../css/about.css" rel="stylesheet" type="text/css" />
<link href="/css/base.css" rel="stylesheet" type="text/css" />
<link href="/css/navbar.css" rel="stylesheet" type="text/css" />
<link href="/css/about.css" rel="stylesheet" type="text/css" />
<title>cuilu | About</title>
<link rel="icon" type="image/png" size="32x32" href="/img/logo-dark.png">
<link rel="apple-touch-icon" type="image/png" href="/img/logo-dark.png">
<meta property="og:site_name" content="cuilu">
<meta name="og:description" content="">
<meta name="og:image" content="https://justinlu.ca/img/logo-dark.png">
</head>

<body onresize="resized()">
<div id="bar">
<div id="navbar-bkg">
<div id="navbar">
<a href="../index.html">
<a href="/">
<div class="item-navbar" id="home-wrap">
<span class="home-name any-item">CUILU</span>
<img class="home-logo any-item" draggable="false" src="../img/logo-dark.png" />
<img class="home-logo any-item" draggable="false" src="/img/logo-dark.png" />
</div>
</a>
<img src="../img/hamburger-icon.svg" class="hamburger-icon any-item" onclick="collapse()">
<img src="/img/hamburger-icon.svg" class="hamburger-icon any-item" onclick="collapse()">
<div id="col">
<a class="any-item item-navbar" href="../blog/index.html">BLOG</a>
<a class="any-item item-navbar" href="../clubs/index.html">CLUBS</a>
<a class="any-item item-navbar" href="../calendar/index.html">CALENDAR</a>
<a class="any-item item-navbar" href="../testimonials/index.html">TESTIMONIALS</a>
<a class="any-item item-navbar" href="/blog/">BLOG</a>
<a class="any-item item-navbar" href="/clubs/">CLUBS</a>
<a class="any-item item-navbar" href="/calendar/">CALENDAR</a>
<a class="any-item item-navbar" href="/testimonials/">TESTIMONIALS</a>
<a class="any-item bold-navbar">ABOUT</a>
</div>
</div>
</div>
<div id="slider"></div>
<div id="hamburger-par">
<a class="hamburger-item" href="../blog/index.html">BLOG</a>
<a class="hamburger-item" href="../clubs/index.html">CLUBS</a>
<a class="hamburger-item" href="../calendar/index.html">CALENDAR</a>
<a class="hamburger-item" href="../testimonials/index.html">TESTIMONIALS</a>
<a class="hamburger-item" href="/blog/">BLOG</a>
<a class="hamburger-item" href="/clubs/">CLUBS</a>
<a class="hamburger-item" href="/calendar/">CALENDAR</a>
<a class="hamburger-item" href="/testimonials/">TESTIMONIALS</a>
<a class="hamburger-bold">ABOUT</a>
</div>
<script src="../js/slider.js"></script>
<script src="../js/hamburger.js"></script>
<script src="/js/slider.js"></script>
<script src="/js/hamburger.js"></script>
</div>
<div id="bg">
<div class="container">
Expand Down Expand Up @@ -95,8 +100,7 @@ <h2><b>Justin Lu</b></h2>

<div class="footer">
<div class="footer-title-par">
<p class="footer-title">This website was made from scratch by <span style="font-weight: 700">Justin Lu,
Nicole Cui, Eric Shim, and Diana Lin</span> as a mock for an improved student website :D</p>
<p class="footer-title">This website was made from scratch by <span style="font-weight: 700">Justin Lu, Nicole Cui, Eric Shim, and Diana Lin</span> as a mock for an improved student website :D</p>
</div>
<hr class="footer-bar">
<div class="foooter-icon-par">
Expand Down
32 changes: 18 additions & 14 deletions blog/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,22 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
<link href="../css/navbar.css" rel="stylesheet" type="text/css" />
<link href="../css/base.css" rel="stylesheet" type="text/css" />
<link href="../css/blog.css" rel="stylesheet" type="text/css" />
<link href="/css/navbar.css" rel="stylesheet" type="text/css" />
<link href="/css/base.css" rel="stylesheet" type="text/css" />
<link href="/css/blog.css" rel="stylesheet" type="text/css" />
<title>cuilu | Blog</title>
<link rel="icon" type="image/png" size="32x32" href="/img/logo-dark.png">
<link rel="apple-touch-icon" type="image/png" href="/img/logo-dark.png">
<meta property="og:site_name" content="cuilu">
<meta name="og:description" content="">
<meta name="og:image" content="https://justinlu.ca/img/logo-dark.png">
</head>

<body onload="setPost('0000')" onresize="resized()">
<div id="bar">
<div id="navbar-bkg">
<div id="navbar">
<a href="../index.html">
<a href="/">
<div class="item-navbar" id="home-wrap">
<span class="home-name any-item">CUILU</span>
<img class="home-logo any-item" draggable="false" src="../img/logo-dark.png" />
Expand All @@ -24,20 +29,20 @@
<img src="../img/hamburger-icon.svg" class="hamburger-icon any-item" onclick="collapse()">
<div id="col">
<a class="any-item bold-navbar">BLOG</a>
<a class="any-item item-navbar" href="../clubs/index.html">CLUBS</a>
<a class="any-item item-navbar" href="../calendar/index.html">CALENDAR</a>
<a class="any-item item-navbar" href="../testimonials/index.html">TESTIMONIALS</a>
<a class="any-item item-navbar" href="../about/index.html">ABOUT</a>
<a class="any-item item-navbar" href="/clubs/">CLUBS</a>
<a class="any-item item-navbar" href="/calendar/">CALENDAR</a>
<a class="any-item item-navbar" href="/testimonials/">TESTIMONIALS</a>
<a class="any-item item-navbar" href="/about/">ABOUT</a>
</div>
</div>
</div>
<div id="slider"></div>
<div id="hamburger-par">
<a class="hamburger-bold">BLOG</a>
<a class="hamburger-item" href="../clubs/index.html">CLUBS</a>
<a class="hamburger-item" href="../calendar/index.html">CALENDAR</a>
<a class="hamburger-item" href="../testimonials/index.html">TESTIMONIALS</a>
<a class="hamburger-item" href="../about/index.html">ABOUT</a>
<a class="hamburger-item" href="/clubs/">CLUBS</a>
<a class="hamburger-item" href="/calendar/">CALENDAR</a>
<a class="hamburger-item" href="/testimonials/">TESTIMONIALS</a>
<a class="hamburger-item" href="/about/">ABOUT</a>
</div>
<script src="../js/slider.js"></script>
<script src="../js/hamburger.js"></script>
Expand Down Expand Up @@ -65,8 +70,7 @@ <h1 id="title"></h1>
<script src="../js/blog.js"></script>
<div class="footer">
<div class="footer-title-par">
<p class="footer-title">This website was made from scratch by <span style="font-weight: 700">Justin Lu,
Nicole Cui, Eric Shim, and Diana Lin</span> as a mock for an improved student website :D</p>
<p class="footer-title">This website was made from scratch by <span style="font-weight: 700">Justin Lu, Nicole Cui, Eric Shim, and Diana Lin</span> as a mock for an improved student website :D</p>
</div>
<hr class="footer-bar">
<div class="foooter-icon-par">
Expand Down
31 changes: 20 additions & 11 deletions calendar/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,47 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
<link href="../css/navbar.css" rel="stylesheet" type="text/css" />
<link href="../css/base.css" rel="stylesheet" type="text/css" />
<link href="/css/navbar.css" rel="stylesheet" type="text/css" />
<link href="/css/base.css" rel="stylesheet" type="text/css" />
<link href='https://cdn.jsdelivr.net/npm/[email protected]/main.min.css' rel='stylesheet' />
<script src="https://cdn.jsdelivr.net/npm/[email protected]/main.min.js"></script>
<script src="../js/calendar.js"></script>
<link href="../css/calendar.css" rel="stylesheet" type="text/css" />
<script src="/js/calendar.js"></script>
<link href="/css/calendar.css" rel="stylesheet" type="text/css" />
<title>cuilu | Calendar</title>
<link rel="icon" type="image/png" size="32x32" href="/img/logo-dark.png">
<link rel="apple-touch-icon" type="image/png" href="/img/logo-dark.png">
<meta property="og:site_name" content="cuilu">
<meta name="og:description" content="">
<meta name="og:image" content="https://justinlu.ca/img/logo-dark.png">
</head>

<body onresize="resized()">
<div id="bar">
<div id="navbar-bkg">
<div id="navbar">
<a href="../index.html">
<a href="/">
<div class="item-navbar" id="home-wrap">
<span class="home-name any-item">CUILU</span>
<img class="home-logo any-item" draggable="false" src="../img/logo-dark.png" />
</div>
</a>
<img src="../img/hamburger-icon.svg" class="hamburger-icon any-item" onclick="collapse()">
<div id="col">
<a class="any-item item-navbar" href="../blog/index.html">BLOG</a>
<a class="any-item item-navbar" href="../clubs/index.html">CLUBS</a>
<a class="any-item item-navbar" href="/blog/">BLOG</a>
<a class="any-item item-navbar" href="/clubs/">CLUBS</a>
<a class="any-item bold-navbar">CALENDAR</a>
<a class="any-item item-navbar" href="../testimonials/index.html">TESTIMONIALS</a>
<a class="any-item item-navbar" href="../about/index.html">ABOUT</a>
<a class="any-item item-navbar" href="/testimonials/">TESTIMONIALS</a>
<a class="any-item item-navbar" href="/about/">ABOUT</a>
</div>
</div>
</div>
<div id="slider"></div>
<div id="hamburger-par">
<a class="hamburger-bold">BLOG</a>
<a class="hamburger-item" href="/clubs/">CLUBS</a>
<a class="hamburger-item" href="/calendar/">CALENDAR</a>
<a class="hamburger-item" href="/testimonials/">TESTIMONIALS</a>
<a class="hamburger-item" href="/about/">ABOUT</a>
<a class="hamburger-item" href="../blog/index.html">BLOG</a>
<a class="hamburger-item" href="../clubs/index.html">CLUBS</a>
<a class="hamburger-bold">CALENDAR</a>
Expand All @@ -56,8 +66,7 @@ <h1 style="padding-top: 40px">Calendar</h1>
</div>
<div class="footer">
<div class="footer-title-par">
<p class="footer-title">This website was made from scratch by <span style="font-weight: 700">Justin Lu,
Nicole Cui, Eric Shim, and Diana Lin</span> as a mock for an improved student website :D</p>
<p class="footer-title">This website was made from scratch by <span style="font-weight: 700">Justin Lu, Nicole Cui, Eric Shim, and Diana Lin</span> as a mock for an improved student website :D</p>
</div>
<hr class="footer-bar">
<div class="foooter-icon-par">
Expand Down
38 changes: 21 additions & 17 deletions clubs/deca/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,42 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
<link href="../../css/navbar.css" rel="stylesheet" type="text/css" />
<link href="../../css/base.css" rel="stylesheet" type="text/css" />
<link href="../../css/club-page.css" rel="stylesheet" type="text/css" />
<link href="/css/navbar.css" rel="stylesheet" type="text/css" />
<link href="/css/base.css" rel="stylesheet" type="text/css" />
<link href="/css/club-page.css" rel="stylesheet" type="text/css" />
<link rel="icon" type="image/png" size="32x32" href="/img/logo-dark.png">
<link rel="apple-touch-icon" type="image/png" href="/img/logo-dark.png">
<meta property="og:site_name" content="cuilu">
<meta name="og:description" content="">
<meta name="og:image" content="https://justinlu.ca/img/logo-dark.png">
</head>

<body onresize="resized()" onload="setClub('deca')">
<div id="bar">
<div id="navbar-bkg">
<div id="navbar">
<a href="../../index.html">
<a href="/">
<div class="item-navbar" id="home-wrap">
<span class="home-name any-item">CUILU</span>
<img class="home-logo any-item" draggable="false" src="../../img/logo-dark.png" />
</div>
</a>
<img src="../../img/hamburger-icon.svg" class="hamburger-icon any-item" onclick="collapse()">
<div id="col">
<a class="any-item item-navbar" href="../../blog/index.html">BLOG</a>
<a class="any-item bold-navbar" id="current" href="../../clubs/index.html">CLUBS</a>
<a class="any-item item-navbar" href="../../calendar/index.html">CALENDAR</a>
<a class="any-item item-navbar" href="../../testimonials/index.html">TESTIMONIALS</a>
<a class="any-item item-navbar" href="../../about/index.html">ABOUT</a>
<a class="any-item item-navbar" href="/blog/">BLOG</a>
<a class="any-item bold-navbar" id="current" href="/clubs/">CLUBS</a>
<a class="any-item item-navbar" href="/calendar/">CALENDAR</a>
<a class="any-item item-navbar" href="/testimonials/">TESTIMONIALS</a>
<a class="any-item item-navbar" href="/about/">ABOUT</a>
</div>
</div>
<div id="slider"></div>
<div id="hamburger-par">
<a class="hamburger-item" href="../../blog/index.html">BLOG</a>
<a class="hamburger-bold" id="current" href="../../clubs/index.html">CLUBS</a>
<a class="hamburger-item" href="../../calendar/index.html">CALENDAR</a>
<a class="hamburger-item" href="../../testimonials/index.html">TESTIMONIALS</a>
<a class="hamburger-item" href="../../about/index.html">ABOUT</a>
<a class="hamburger-item" href="/blog/">BLOG</a>
<a class="hamburger-bold" href="/clubs/">CLUBS</a>
<a class="hamburger-item" href="/calendar/">CALENDAR</a>
<a class="hamburger-item" href="/testimonials/">TESTIMONIALS</a>
<a class="hamburger-item" href="/about/">ABOUT</a>
</div>
<script src="../../js/slider.js"></script>
<script src="../../js/hamburger.js"></script>
Expand All @@ -44,7 +49,7 @@
<div class="container">
<div id="header">
<h1 id="name" style="padding-top: 40px"></h1>
<a id="back-link" href="../index.html">❮ Back to Clubs</a>
<a id="back-link" href="/clubs/">❮ Back to Clubs</a>
<br><br>
<hr>
</div>
Expand All @@ -70,8 +75,7 @@ <h1 id="name" style="padding-top: 40px"></h1>
<script src="../../js/club-page.js"></script>
<div class="footer">
<div class="footer-title-par">
<p class="footer-title">This website was made from scratch by <span style="font-weight: 700">Justin Lu,
Nicole Cui, Eric Shim, and Diana Lin</span> as a mock for an improved student website :D</p>
<p class="footer-title">This website was made from scratch by <span style="font-weight: 700">Justin Lu, Nicole Cui, Eric Shim, and Diana Lin</span> as a mock for an improved student website :D</p>
</div>
<hr class="footer-bar">
<div class="foooter-icon-par">
Expand Down
Loading

0 comments on commit d08ead9

Please sign in to comment.