Merge pull request #94 from github/design-unification

Design unification with training.github.com
github · Apr 22, 2014 · 5b2833b · 5b2833b
2 parents 3a81bf0 + 0a59f0c
commit 5b2833b
Show file tree

Hide file tree

Showing 26 changed files with 2,290 additions and 606 deletions.
diff --git a/_includes/license.html b/_includes/license.html
@@ -1,3 +1 @@
-<div class="license">
-  <a href="../license.html">Shared with the community under a Creative Commons license</a>
-</div>
+<a href="../license.html">Shared with the community under a Creative Commons license</a>
diff --git a/_includes/navigation.html b/_includes/navigation.html
@@ -1,14 +1,29 @@
-<section class="colorful">
-	<nav>
-		<hgroup>
-			<a href="https://training.github.com">
-				<span class="mega-octicon octicon-logo-github"></span>
-				<span class="logo-training"></span>
-			</a>
-		</hgroup>
-		<ul>
-			<li><a href="../">Materials</a></li>
-			<li><a class="button" href="https://training.github.com">Join an Event</a></li>
-		</ul>
-	</nav>
-</section>
+<header class="colorful">
+	<div class="container">
+		<h1 id="logo" class="content">
+			<a href="{{ site.url }}/" data-escp="">GitHub Training</a>
+		</h1>
+		<nav id="nav">
+			<ul class="content">
+				<li>
+					<a href="https://training.github.com/trainers/">Trainers</a>
+				</li>
+				<li>
+					<a href="https://training.github.com/web/">Web-based</a>
+				</li>
+				<li>
+					<a href="https://training.github.com/in-person/">In-person</a>
+				</li>
+				<li class="current">
+					<a href="https://training.github.com/kit/">Kit</a>
+				</li>
+				<li>
+					<a href="https://training.github.com/resources/">Resources</a>
+				</li>
+				<li>
+					<a href="https://training.github.com/contact/">Contact</a>
+				</li>
+			</ul>
+		</nav>
+	</div>
+</header>
diff --git a/_layouts/bare.html b/_layouts/bare.html
@@ -43,9 +43,7 @@
     {% endif %}
   </head>
   <body>
-    {% if page.path != "index.html" %}
-      {% include navigation.html %}
-    {% endif %}
+    {% include navigation.html %}
 
     {{ content }}
   </body>

diff --git a/_layouts/license.html b/_layouts/license.html
@@ -0,0 +1,21 @@
+---
+layout: bare
+---
+
+<section class="hero overview">
+  <div class="container">
+    <div class="content">
+      <h2>{{ page.title }}</h2>
+      <p>&nbsp;</p>
+    </div>
+  </div>
+</section>
+
+
+<section>
+  <div class="container">
+    {{ content }}
+  </div>
+</section>
+
+{% include footer.html %}
diff --git a/_layouts/workbook.html b/_layouts/workbook.html
@@ -3,16 +3,12 @@
 theme: workbook
 ---
 
-<section class="hero center">
+<section class="hero overview">
   <div class="container">
-<!--     <span class="octicon octicon-book"></span> -->
-    <h1>{{ page.title }}</h1>
-    {% include license.html %}
-
-    {% if page.description %}
-    <br/>
-    <div class="description">{{ page.description }}</div>
-    {% endif %}
+    <div class="content">
+      <h2>{{ page.title }}</h2>
+      <p>{% include license.html %}</p>
+    </div>
   </div>
 </section>