Blue header

2028942481 · Aug 30, 2017 · 4a3181e · 4a3181e
1 parent f37627c
commit 4a3181e
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 45 deletions.
diff --git a/_includes/blue-hero.html b/_includes/blue-hero.html
@@ -0,0 +1,23 @@
+<div class="bg-blue text-white py-2 py-md-4">
+  <div class="container-lg p-responsive my-4 text-center">
+    <h1 itemprop="headline" class="alt-h1">
+      {% if paginator %}
+        {{ site.title }}{% unless paginator.page == 1 %} {{ site.data.ui-text[site.locale].page }} {{ paginator.page }}{% endunless %}
+      {% else %}
+        {{ page.title | default: site.title | markdownify | remove: "<p>" | remove: "</p>" }}
+      {% endif %}
+    </h1>
+    {% if page.excerpt %}
+      <p>{{ page.excerpt | markdownify | remove: "<p>" | remove: "</p>" }}</p>
+    {% endif %}
+    {% if site.read_time and page.read_time %}
+      <p><i class="fa fa-clock-o" aria-hidden="true"></i> {% include read-time.html %}</p>
+    {% endif %}
+    {% if page.header.cta_url %}
+      <p><a href="{{ cta_path }}" class="btn btn-outline">{{ page.header.cta_label | default: site.data.ui-text[site.locale].more_label }}</a></p>
+    {% endif %}
+  </div>
+  {% if page.header.caption %}
+    <span>{{ page.header.caption | markdownify | remove: "<p>" | remove: "</p>" }}</span>
+  {% endif %}
+</div>
diff --git a/_includes/header.html b/_includes/header.html
@@ -1,15 +1,21 @@
-<header class="container-lg py-4 f4 p-responsive js-site-header clearfix">
-  <a href="https://github.com/github/training-kit" class="github-corner" aria-label="View source on Github"><svg width="72" height="72" viewBox="0 0 250 250" style="fill:#7a8288; color:#fff; position: absolute; top: 0; border: 0; left: 0; transform: scale(-1, 1); z-index: 21;" aria-hidden="true"><desc>Octocat, tail waves when hovered over</desc><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style></a>
-  <button class="btn-link float-right site-header-toggle js-site-header-toggle" type="button" aria-label="Toggle navigation" aria-expanded="false">
-    {% include octicons/three-bars.svg %}
-  </button>
-  <nav class="site-header-menu">
-    <ul class="d-block d-md-flex list-style-none text-gray">
-      <li class="mr-3 mb-2 mb-md-0 text-bold"><a class="text-inherit" href="{{ site.baseurl }}/">{{ site.title }}</a></li>
-      <li class="mr-3 mb-2 mb-md-0"><a class="text-inherit" href="{{ site.baseurl }}/resources">Resources</a></li>
-      <li class="mr-3 mb-2 mb-md-0"><a class="text-inherit" href="{{ site.baseurl }}/resources/learning-path">Learning Path</a></li>
-      <li class="mr-3 mb-2 mb-md-0"><a class="text-inherit" href="https://services.github.com/#upcoming-events">Upcoming Events</a></li>
-      <li><a class="text-inherit" href="https://services.github.com/customized-training">Customized Training</a></li>
-    </ul>
-  </nav>
-</header>
+<div class="bg-blue-dark py-4">
+  <header class="container-lg f4 p-responsive site-header js-site-header d-block d-md-flex flex-justify-between text-white">
+    <a class="no-underline text-inherit text-bold clearfix" href="{{ site.baseurl }}/">
+      <div class="mr-2 float-left">{% include octicons/mark-github.svg %}</div>
+      {{ site.title }}
+    </a>
+
+    <button class="btn-link float-right site-header-toggle js-site-header-toggle" type="button" aria-label="Toggle navigation" aria-expanded="false">
+      {% include octicons/three-bars.svg %}
+    </button>
+
+    <nav class="site-header-menu">
+      <ul class="d-block d-md-flex list-style-none">
+        <li class="ml-3"><a class="text-inherit" href="{{ site.baseurl }}/resources">Resources</a></li>
+        <li class="ml-3"><a class="text-inherit" href="{{ site.baseurl }}/resources/learning-path">Learning Path</a></li>
+        <li class="ml-3"><a class="text-inherit" href="https://services.github.com/#upcoming-events">Upcoming Events</a></li>
+        <li class="ml-3"><a class="text-inherit" href="https://services.github.com/customized-training">Customized Training</a></li>
+      </ul>
+    </nav>
+  </header>
+</div>
diff --git a/_includes/light-hero.html b/_includes/light-hero.html
@@ -1,6 +1,6 @@
-<div class="border-bottom border-top py-6 mb-6 bg-gray-light">
+<div class="border-bottom border-top py-6 mb-6 bg-gray-light text-center">
   <div class="container-lg py-6 p-responsive">
     <h1>{{ page.title }}</h1>
-    {% if page.description %}<p>{{ page.description }}</p>{% endif %}
+    {% if page.description %}<p class="col-12 col-md-6 mx-auto">{{ page.description }}</p>{% endif %}
   </div>
 </div>
diff --git a/_includes/octicons/mark-github.svg b/_includes/octicons/mark-github.svg
diff --git a/_includes/page__hero.html b/_includes/page__hero.html
diff --git a/_layouts/simple-class.html b/_layouts/simple-class.html
@@ -3,7 +3,7 @@
 ---
 
 <div id="main" role="main">
-  {% include page__hero.html %}
+  {% include blue-hero.html %}
 
   <div class="container-lg mx-auto">
     <div class="d-flex flex-items-start flex-wrap gutter py-6 p-responsive">

diff --git a/_layouts/single.html b/_layouts/single.html
@@ -2,7 +2,7 @@
 layout: default
 ---
 <div id="main" role="main">
-  {% include page__hero.html %}
+  {% include blue-hero.html %}
   {% if page.url != "/" and site.breadcrumbs %}
     {% unless paginator %}
       {% include breadcrumbs.html %}

diff --git a/assets/css/main.scss b/assets/css/main.scss
@@ -19,6 +19,17 @@ details.flash {
   &[open] { box-shadow: 0 0 0 0.2em rgba(3,102,214,0.3); }
 }
 
+.bg-blue-dark {
+  background-color: $blue-600 !important;
+}
+
+.octicon { fill: currentColor; }
+
+.site-header .octicon-mark-github {
+  width: 1.5em;
+  height: 1.5em;
+}
+
 .markdown-body {
   font-size: 16px;
 

diff --git a/index.html b/index.html
@@ -42,7 +42,7 @@
 ---
 <div class="bg-blue text-white py-2 py-md-6 text-center">
   <div class="container-lg p-responsive my-6">
-    <h1 class="alt-h1" itemprop="headline">{{ site.title }}</h1>
+    <h1 class="alt-h1 lh-condensed" itemprop="headline">{{ site.title }}</h1>
     <p>{{ page.excerpt }}</p>
   </div>
 </div>

diff --git a/paths/electron/electron.md b/paths/electron/electron.md
@@ -21,7 +21,7 @@ courses:
     link: /electron/share-your-app
 ---
 <div class="mb-6">
-  {% include page__hero.html %}
+  {% include blue-hero.html %}
 </div>
 
 {% include timeline.html %}