Skip to content

Commit

Permalink
Merge pull request #57 from ufosc/patch-1.0.1
Browse files Browse the repository at this point in the history 
Patch 1.0.1
  • Loading branch information
@mirdaki
mirdaki authored Nov 4, 2018
2 parents 846a7fd + 229081b commit c421b3e
Show file tree
Hide file tree
Showing 14 changed files with 431 additions and 63 deletions.
87 changes: 87 additions & 0 deletions website/404.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<!DOCTYPE html>
<html>

<head>
<title>Open Source Club</title>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" type="image/x-icon" href="assets/images/favicon-96x96.png">
<link rel="stylesheet" type="text/css" href="styles/404.css">
<!-- TODO: Give license credit to all fonts -->
</head>

<body>

<!-- The header bar -->
<div class="topnav">

<!-- Logo -->
<a id="logo-link" href="/">
<img class="topnav-logo" src="assets/images/small-logo.png" alt="Open Source Club Logo">
</a>

<!-- Page links -->
<div class="topnav-right">
<div class="topnav-placeholder"></div>
<!-- <a class="topnav-link" href="signin.html">Sign in</a> -->
<a class="topnav-link" href="projects.html">Projects</a>
<a class="topnav-link" href="https://www.facebook.com/groups/ufosc/events/?source=4&action_history=null&filter=calendar">
Events
<i class="fas fa-external-link-alt external-link" data-fa-transform="up-6"></i>
</a>
<a class="topnav-link" href="https://github.com/ufosc/resources">
Resources
<i class="fas fa-external-link-alt external-link" data-fa-transform="up-6 right-4"></i>
</a>
<!-- TODO: Make a contact page (This may not be necessary) -->
<!-- <a class="topnav-link" href="contact.html">Contact</a> -->
<a class="topnav-link" href="about.html">About</a>
</div>

<!-- Drop down menu -->
<a href="javascript:void(0);" class="topnav-link topnav-menu-icon" onclick="dropDownMenu()">
&#9776;
</a>

</div>
<!-- End of header bar -->

<!-- The page content -->
<div id="wrapper">
<h1 class="title">Page not found</h1>
<p>It appears the page you're looking for does not exist. <a href="/">Click here to go to the homepage.</a></p>
</div>

<!-- The footer -->
<div class="footer">

<!-- The links -->
<a href="https://discord.gg/Gsxej6u" class="footer-link">
<i class="fab fa-discord fa-2x"></i>
</a>
<a href="https://github.com/ufosc/" class="footer-link">
<i class="fab fa-github-square fa-2x"></i>
</a>
<a href="https://www.facebook.com/groups/ufosc/" class="footer-link">
<i class="fab fa-facebook-square fa-2x"></i>
</a>
<a href="mailto:gator.osc@gmail.com" class="footer-link">
<i class="fas fa-envelope-square fa-2x"></i>
</a>

<!-- The text -->
<p class="footer-text">
<i class="fas fa-code"></i>
with
<i class="fas fa-heart"></i>
by <strong>OSC</strong>
</p>

</div>
<!-- End of footer -->

<script src="./scripts/unified.js"></script>

</body>

</html>
39 changes: 22 additions & 17 deletions website/about.html
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<!DOCTYPE html>
<html>

<head>
<title>Open Source Club</title>
<meta charset="utf-8"/>
<link rel="shortcut icon" type="image/x-icon" href="assets/images/open-source-favicon-35x35.png">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" type="image/x-icon" href="assets/images/favicon-96x96.png">
<link rel="stylesheet" type="text/css" href="styles/about.css">
<!-- TODO: Give license credit to all fonts -->
</head>
Expand All @@ -14,13 +16,14 @@
<div class="topnav">

<!-- Logo -->
<a id="logo-link" href="index.html">
<a id="logo-link" href="/">
<img class="topnav-logo" src="assets/images/small-logo.png" alt="Open Source Club Logo">
</a>

<!-- Page links -->
<div class="topnav-right">
<div class="topnav-placeholder"></div>
<!-- <a class="topnav-link" href="signin.html">Sign in</a> -->
<a class="topnav-link" href="projects.html">Projects</a>
<a class="topnav-link" href="https://www.facebook.com/groups/ufosc/events/?source=4&action_history=null&filter=calendar">
Events
Expand Down Expand Up @@ -58,16 +61,16 @@ <h1 class="title">About OSC</h1>
</div>

<div id="meetings" class="page-element">
<h1 class="title">Meetings</h1>
<p class="text">
We have a couple types of meetings. Check our <a href="https://www.facebook.com/groups/ufosc/">Facebook</a> for times and locations.
<ol class="text">
<li>Casual Coding Sessions are laid back meetings. You can work on projects, homework, or just hang out! They happen twice weekly. It's a great time to find people with similar interest and create something cool.</li>
<li>General Body Meetings (GBMs) open up with a brief round of project updates. Following that, there is a tech talk on an open source technology. This is great for anyone to come in and learn. They happen every other week.</li>
<li>Code Jams are a once a month workshop and hack sessions. Spend the morning of Saturday learning about an open source technology then in the afternoon work on existing open source projects or start you own!</li>
</ol>
</p>
</div>
<h1 class="title">Meetings</h1>
<p class="text">
We have a couple types of meetings. Check our <a href="https://www.facebook.com/groups/ufosc/">Facebook</a> for times and locations.
<ol class="text">
<li>Casual Coding Sessions are laid back meetings. You can work on projects, homework, or just hang out! They happen twice weekly. It's a great time to find people with similar interest and create something cool.</li>
<li>General Body Meetings (GBMs) open up with a brief round of project updates. Following that, there is a tech talk on an open source technology. This is great for anyone to come in and learn. They happen every other week.</li>
<li>Code Jams are a once a month workshop and hack sessions. Spend the morning of Saturday learning about an open source technology then in the afternoon work on existing open source projects or start you own!</li>
</ol>
</p>
</div>

<div id="history" class="page-element">
<h1 class="title">History</h1>
Expand Down Expand Up @@ -101,6 +104,7 @@ <h2 class="subtitle">Staying Strong</h2>
<br><br>
To be continued...
</div>
</div>
</div>

<!-- The footer -->
Expand Down Expand Up @@ -128,10 +132,11 @@ <h2 class="subtitle">Staying Strong</h2>
by <strong>OSC</strong>
</p>

</div>
<!-- End of footer -->
</div>
<!-- End of footer -->

<script src="./scripts/unified.js"></script>

<script src="./scripts/unified.js"></script>
</body>

</body>
</html>
</html>
Binary file added website/assets/images/favicon-96x96.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added website/assets/images/logo-text.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed website/assets/images/open-source-favicon-35x35.png
View file
Binary file not shown.
Binary file modified website/assets/images/small-logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 13 additions & 7 deletions website/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<!DOCTYPE html>
<html>

<head>
<title>Open Source Club</title>
<meta charset="utf-8"/>
<link rel="shortcut icon" type="image/x-icon" href="assets/images/open-source-favicon-35x35.png">
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" type="image/x-icon" href="assets/images/favicon-96x96.png">
<link rel="stylesheet" type="text/css" href="styles/index.css">
<!-- TODO: Give license credit to all fonts -->
</head>
Expand All @@ -14,13 +16,14 @@
<div class="topnav">

<!-- Logo -->
<a id="logo-link" href="index.html">
<a id="logo-link" href="/">
<img class="topnav-logo" src="assets/images/small-logo.png" alt="Open Source Club Logo">
</a>

<!-- Page links -->
<div class="topnav-right">
<div class="topnav-placeholder"></div>
<!-- <a class="topnav-link" href="signin.html">Sign in</a> -->
<a class="topnav-link" href="projects.html">Projects</a>
<a class="topnav-link" href="https://www.facebook.com/groups/ufosc/events/?source=4&action_history=null&filter=calendar">
Events
Expand Down Expand Up @@ -50,8 +53,9 @@
<div id="slideshow" class="page-element" style="padding: 0px">
<div class="slideshow-container">
<div class="mySlides fade">
<img class="slide" style="object-fit: contain" src=".\assets\images\small-logo.png">
<br><br> <!--This is here so the box is the same height as the other slides w/text-->
<img class="slide" style="object-fit: contain; background-color: #262626;" src=".\assets\images\logo-text.png">
<br><br>
<!--This is here so the box is the same height as the other slides w/text-->
</div>
<div class="mySlides fade">
<img class="slide" style="object-position: 50% 35%" src=".\assets\images\casual-coding.jpg">
Expand Down Expand Up @@ -115,7 +119,7 @@ <h1 class="title">

<!-- TODO: Finish the event integration -->
<!-- Upcoming events box -->
<!-- <div id="events-wrapper" class="page-element">
<!-- <div id="events-wrapper" class="page-element">
<h1 class="title" id="upcoming-events-title">
Upcoming Events
</h1>
Expand Down Expand Up @@ -178,7 +182,8 @@ <h1 class="title" id="get-involved-title">
Get Involved
</h1>
<p class="get-involved-text">
OSC is the Open Source Club at the University of Florida. We are a community of makers, who want to solve problems and improve our world using open source projects.
OSC is the Open Source Club at the University of Florida. We are a community of makers, who want to solve problems
and improve our world using open source projects.
<br> <br>
Sign up for our <!-- <a href="https://docs.google.com/forms/d/e/1FAIpQLSfeU1RSGQWOZfvQXLrUGnDAKvVAqO7gc3TZySmN1CFhCM9uog/viewform?c=0&w=1">email list</a> or our --> <a href="https://www.facebook.com/groups/ufosc/">Facebook group<a/> for meeting announcements and join our <a href="https://discord.gg/Gsxej6u">Discord</a> to communicate with other members and ask questions. And of course, come to our meetings! Introduce yourself, work on projects, and have fun.
<br> <br>
Expand Down Expand Up @@ -219,4 +224,5 @@ <h1 class="title" id="get-involved-title">
<script src="./scripts/index.js"></script>

</body>

</html>
Loading

0 comments on commit c421b3e

Please sign in to comment.