Moved back to the default Jekyll theme

sondr3 · Feb 10, 2015 · 67eaa12 · 67eaa12
1 parent d577a8b
commit 67eaa12
Show file tree

Hide file tree

Showing 20 changed files with 680 additions and 1,244 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,17 +4,21 @@
 ## BREAKING CHANGES
 Gulp was updated to version 4.0 and much of the Gulpfile was updated
 accordingly, hence a lot of old tasks were removed and a few new ones
-introduced. This is breaking in the sense that people who have previously
-installed Jekyllized have to learn some new commands, but for those who have
-previously installed nothing will change, this is just an informal update.
+introduced.
+
+This isn't strictly breaking as it won't affect people who have installed and
+are running a site with Jekyllized nor will it change for people who are new but
+if you are updating or coming from a previous install some things might not be
+as it was.
 
 #### Changes
 * **Gulp:** Updated to Gulp 4.0 and changed the majority of the Gulpfile and
   most of the tasks there as well, this should be considered a breaking
   change.
 * **Jekyll:** Updated to Jekyll 3.0-beta since both Jekyll and Gulp is currently
-  moving towards a new major version, the biggest change is the inclusion of
-  incremental regeneration.
+  moving towards a new major version, with one of the biggest changes being
+  incremental regeneration. Also moved back to the default theme for Jekyll with
+  some minor tweaks to suit this project better.
 * **Archives:** Added yearly and monthly archives and archives for tags and
   categories.
 * **Jekyll directory:** Everything is now output to a `dist` folder instead of a

diff --git a/app/templates/app/404.html b/app/templates/app/404.html
@@ -5,5 +5,7 @@
 
 <div class="page">
   <h1 class="page-title">404: Page not found</h1>
-  <p class="lead">Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. <a href="/">Head back home</a> to try finding it again.</p>
+  <p class="lead">Sorry, we've misplaced that URL or it's pointing to something
+  that doesn't exist. <a href="/">Head back home</a> to try finding it
+  again.</p>
 </div>
diff --git a/app/templates/app/_includes/footer.html b/app/templates/app/_includes/footer.html
@@ -0,0 +1,44 @@
+<footer class="site-footer">
+
+  <div class="wrapper">
+
+    <h2 class="footer-heading">{{ site.title }}</h2>
+
+    <div class="footer-col-wrapper">
+      <div class="footer-col footer-col-1">
+        <ul class="contact-list">
+          <li>{{ site.title }}</li>
+          <li><a href="mailto:{{ site.author.email }}">{{ site.author.email }}</a></li>
+        </ul>
+      </div>
+
+      <div class="footer-col footer-col-2">
+        <ul class="social-media-list">
+          <li>
+            <a href="https://twitter.com/{{ site.author.twitter }}">
+               <span class="icon icon--twitter">
+                <svg viewBox="0 0 16 16">
+                  <path fill="#828282" d="M15.969,3.058c-0.586,0.26-1.217,0.436-1.878,0.515c0.675-0.405,1.194-1.045,1.438-1.809
+                  c-0.632,0.375-1.332,0.647-2.076,0.793c-0.596-0.636-1.446-1.033-2.387-1.033c-1.806,0-3.27,1.464-3.27,3.27
+                  c0,0.256,0.029,0.506,0.085,0.745C5.163,5.404,2.753,4.102,1.14,2.124C0.859,2.607,0.698,3.168,0.698,3.767
+                  c0,1.134,0.577,2.135,1.455,2.722C1.616,6.472,1.112,6.325,0.671,6.08c0,0.014,0,0.027,0,0.041c0,1.584,1.127,2.906,2.623,3.206
+                  C3.02,9.402,2.731,9.442,2.433,9.442c-0.211,0-0.416-0.021-0.615-0.059c0.416,1.299,1.624,2.245,3.055,2.271
+                  c-1.119,0.877-2.529,1.4-4.061,1.4c-0.264,0-0.524-0.015-0.78-0.046c1.447,0.928,3.166,1.469,5.013,1.469
+                  c6.015,0,9.304-4.983,9.304-9.304c0-0.142-0.003-0.283-0.009-0.423C14.976,4.29,15.531,3.714,15.969,3.058z"/>
+                  </svg>
+              </span>
+
+              <span class="username">{{ site.author.twitter }}</span>
+            </a>
+          </li>
+        </ul>
+      </div>
+
+      <div class="footer-col footer-col-3">
+        <p class="text">{{ site.description }}</p>
+      </div>
+    </div>
+
+  </div>
+
+</footer>
diff --git a/app/templates/app/_includes/head.html b/app/templates/app/_includes/head.html
@@ -1,23 +1,16 @@
 <head>
-  <link href="http://gmpg.org/xfn/11" rel="profile">
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  <!-- Enable responsiveness on mobile devices-->
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
-
-  <title>
-    {% if page.title == "Home" %}
-      {{ site.title }} &middot; {{ site.tagline }}
-    {% else %}
-      {{ page.title }} &middot; {{ site.title }}
-    {% endif %}
-  </title>
+  <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
+  <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
+  <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
 
   <!-- CSS -->
   <!-- build:css /assets/stylesheets/style.min.css -->
   <link rel="stylesheet" href="/assets/stylesheets/style.css">
   <!-- endbuild -->
-  <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=PT+Serif:400,400italic,700|PT+Sans:400">
 
   <!-- Icons -->
   <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/assets/images/touch/apple-touch-icon-144-precomposed.png">

diff --git a/app/templates/app/_includes/header.html b/app/templates/app/_includes/header.html
@@ -0,0 +1,24 @@
+<header class="site-header">
+
+  <div class="wrapper">
+
+    <a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>
+
+    <nav class="site-nav">
+      <a href="#" class="menu-icon">
+        <svg viewBox="0 0 18 15">
+          <path fill="#424242" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
+          <path fill="#424242" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484 h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
+          <path fill="#424242" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
+        </svg>
+      </a>
+
+      <div class="trigger">
+          <a class="page-link" href="/about/">About</a>
+          <a class="page-link" href="/">Home</a>
+      </div>
+    </nav>
+
+  </div>
+
+</header>
diff --git a/app/templates/app/_includes/sidebar.html b/app/templates/app/_includes/sidebar.html
diff --git a/app/templates/app/_layouts/default.html b/app/templates/app/_layouts/default.html
@@ -5,26 +5,15 @@
 
   <body>
 
-    {% include sidebar.html %}
+    {% include header.html %}
 
-    <!-- Wrap is the content to shift when toggling the sidebar. We wrap the
-         content to avoid any CSS collisions with our real content. -->
-    <div class="wrap">
-      <div class="masthead">
-        <div class="container">
-          <h3 class="masthead-title">
-            <a href="/" title="Home">{{ site.title }}</a>
-            <small>{{ site.tagline }}</small>
-          </h3>
-        </div>
-      </div>
-
-      <div class="container content">
+    <div class="page-content">
+      <div class="wrapper">
         {{ content }}
       </div>
     </div>
 
-    <label for="sidebar-checkbox" class="sidebar-toggle"></label>
+    {% include footer.html %}
 
   <!-- JS -->
   <!-- build:js /assets/javascript/index.min.js -->

diff --git a/app/templates/app/_layouts/page.html b/app/templates/app/_layouts/page.html
@@ -1,8 +1,13 @@
 ---
 layout: default
 ---
+<article class="post">
 
-<div class="page">
-  <h1 class="page-title">{{ page.title }}</h1>
-  {{ content }}
-</div>
+  <header class="post-header">
+    <h1 class="post-title">{{ page.title }}</h1>
+  </header>
+
+  <div class="post-content">
+    {{ content }}
+  </div>
+</article>
diff --git a/app/templates/app/_layouts/post.html b/app/templates/app/_layouts/post.html
@@ -1,25 +1,15 @@
 ---
 layout: default
 ---
+<article class="post" itemscope itemtype="http://schema.org/BlogPosting">
 
-<div class="post">
-  <h1 class="post-title">{{ page.title }}</h1>
-  <span class="post-date">{{ page.date | date_to_string }}</span>
-  {{ content }}
-</div>
+  <header class="post-header">
+    <h1 class="post-title" itemprop="name headline">{{ page.title }}</h1>
+    <p class="post-meta"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%b %-d, %Y" }}</time>{% if page.author %} • <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{{ page.author }}</span></span>{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
+  </header>
 
-<div class="related">
-  <h2>Related Posts</h2>
-  <ul class="related-posts">
-    {% for post in site.related_posts limit:3 %}
-      <li>
-        <h3>
-          <a href="{{ post.url }}">
-            {{ post.title }}
-            <small>{{ post.date | date_to_string }}</small>
-          </a>
-        </h3>
-      </li>
-    {% endfor %}
-  </ul>
-</div>
+  <div class="post-content" itemprop="articleBody">
+    {{ content }}
+  </div>
+
+</article>
diff --git a/app/templates/app/_posts/2014-03-02-introducing-poole.md b/app/templates/app/_posts/2014-03-02-introducing-poole.md
diff --git a/app/templates/app/about.md b/app/templates/app/about.md
@@ -1,30 +1,15 @@
 ---
 layout: page
 title: About
+permalink: /about/
 ---
 
-<p class="message">
-  Hey there! This page is included as an example. Feel free to customize it for your own use upon downloading. Carry on!
-</p>
+This is the base Jekyll theme. You can find out more info about customizing your
+Jekyll theme, as well as basic Jekyll usage documentation at
+[jekyllrb.com](http://jekyllrb.com/)
 
-In the novel, *The Strange Case of Dr. Jeykll and Mr. Hyde*, Mr. Poole is Dr. Jekyll's virtuous and loyal butler. Similarly, Poole is an upstanding and effective butler that helps you build Jekyll themes. It's made by [@mdo](https://twitter.com/mdo).
+You can find the source code for the Jekyll new theme at:
+[github.com/jglovier/jekyll-new](https://github.com/jglovier/jekyll-new)
 
-There are currently two themes built on Poole:
-
-* [Hyde](http://hyde.getpoole.com)
-* [Lanyon](http://lanyon.getpoole.com)
-
-Learn more and contribute on [GitHub](https://github.com/poole).
-
-## Setup
-
-Some fun facts about the setup of this project include:
-
-* Built for [Jekyll](http://jekyllrb.com)
-* Developed on GitHub and hosted for free on [GitHub Pages](https://pages.github.com)
-* Coded with [Sublime Text 2](http://sublimetext.com), an amazing code editor
-* Designed and developed while listening to music like [Blood Bros Trilogy](https://soundcloud.com/maddecent/sets/blood-bros-series)
-
-Have questions or suggestions? Feel free to [open an issue on GitHub](https://github.com/poole/issues/new) or [ask me on Twitter](https://twitter.com/mdo).
-
-Thanks for reading!
+You can find the source code for Jekyll at
+[github.com/jekyll/jekyll](https://github.com/jekyll/jekyll)