Skip to content
This repository was archived by the owner on Nov 1, 2017. It is now read-only.

Redesign entire site to combine training services with teaching resources#140

Closed
jordanmccullough wants to merge 9 commits into from
Closed

Redesign entire site to combine training services with teaching resources #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9a9312f
Rename old Training and Teach home page off to side
Nov 29, 2013
274a44b
Add redesign image resources
Dec 1, 2013
38d92de
Add initial content for new home, training, materials, and contact pages
Nov 29, 2013
920128d
Add redesigned layouts and includes
Dec 1, 2013
929d0b5
Change main navigation text captions to be more descriptive
Dec 1, 2013
fc52713
Add redesign first-draft styling
Dec 1, 2013
d39efef
Header/banner revisions
Dec 2, 2013
93aa9a5
Add event YAML field for "location"
Dec 3, 2013
82712c6
Comment out event content body for description for redesign implement…
Dec 3, 2013
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
48 changes: 48 additions & 0 deletions _includes/site/banner
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
<div class="banner{{page.banner }}">
<div class="center-center">


<div class="container">
<hgroup>
{% if page.tagline %}
<h1>{{page.tagline }}</h1>
<p>{{page.preamble }}</p>
{% else %}
<h1>Education from<br> the experts</h1>
<p>
Join us for a <a href="#" class="attend-bubble">class</a>,
grab some open source <a href="#" class="share-bubble">resources</a> or
get in <a href="#" class="contact-bubble">contact</a>.
</p>
{% endif %}
</hgroup>
</div>
<!--

<div class="bubble-container">
<div class="bubble">
<a href="/attend">
<span class="icon attend"></span>
<h3>Attend</h3>
<p>Scheduled workshops and public events</p>
</a>
</div>

<div class="bubble">
<a href="/share">
<span class="icon share"></span>
<h3>Share</h3>
<p>All materials are free and open source</p>
</a>
</div>

<div class="bubble">
<a href="/contact">
<span class="icon contact"></span>
<h3>Contact</h3>
<p>Customized training and scheduling</p>
</a>
</div>
</div> -->
</div>
</div>
8 changes: 8 additions & 0 deletions _includes/site/footer
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@

<footer>
<div class="container">
© 2013 GitHub Inc. All rights reserved
</div>
</footer>
</body>
</html>
21 changes: 21 additions & 0 deletions _includes/site/header
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
<!DOCTYPE html>
<html>
<head>
<title>{% if page.title %}{{page.title }} :{% endif %}{{site.title }}</title>
<meta name="viewport" content="width=device-width, user-scalable=false;">
<link rel="stylesheet" href="/stylesheets/site.css">
</head>

<body class="{{page.layout }}">
<header>
<div class="container">
<a href="/"><span class="logo-github">GitHub Teaching</span></a>
<nav>
<a href="/attend"><div class="">Our Classes</div></a>
<a href="/share"><div class="">Learning Materials </div></a>
<a href="/team"><div class="">The Team</div></a>
<a href="/contact"><div class="">Talk to Us</div></a>
</nav>
</div>
</header>

26 changes: 26 additions & 0 deletions _layouts/home.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
---

---

{% include site/header %}

<div class="banner{{page.banner }}">
<div class="center-center">
<div class="container">
<hgroup>
<h1>Education from<br> the experts</h1>
<p>
Join us for a <a href="/attend" class="attend-bubble">class</a>,
grab some open source <a href="/share" class="share-bubble">resources</a> or
get in <a href="/contact" class="contact-bubble">contact</a>.
</p>
</hgroup>
</div>
</div>
</div>

<!-- <div class="container"> -->
{{content }}
<!-- </div> -->

{% include site/footer %}
11 changes: 11 additions & 0 deletions _layouts/page.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
---

---

{% include site/header %}

<!-- <div class="container"> -->
{{content }}
<!-- </div> -->

{% include site/footer %}
Loading