Merge pull request #4 from information-safety/poole-updates

Poole updates
information-safety · Nov 25, 2016 · a9d2d12 · a9d2d12
2 parents 7745a4e + 9a05395
commit a9d2d12
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 32 deletions.
diff --git a/_config.yml b/_config.yml
@@ -2,11 +2,7 @@
 exclude: [vendor]
 
 # Permalinks
-#
-# Use of `relative_permalinks` ensures post links from the index work properly.
 permalink:           pretty
-# relative_permalinks no longer work in Jekyll v3
-#relative_permalinks: true
 
 # Setup
 title:               Infomation Safety
@@ -40,3 +36,8 @@ google_analytics:    UA-70082859-1
 #version:             2.0.0
 #github:
 #  repo:              https://github.com/poole/poole
+
+# Gems
+gems:
+  - jekyll-paginate
+  - jekyll-gist
diff --git a/_includes/head.html b/_includes/head.html
@@ -1,8 +1,5 @@
 <head>
   <meta charset="UTF-8">
-  <link href="http://gmpg.org/xfn/11" rel="profile">
-
-  <!-- Enable responsiveness on mobile devices-->
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   <title>
@@ -13,14 +10,8 @@
     {% endif %}
   </title>
 
-  <!-- CSS -->
   <link rel="stylesheet" href="{{ site.baseurl }}/styles.css">
-
-  <!-- Icons -->
   <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.baseurl }}/public/apple-touch-icon-precomposed.png">
   <link rel="shortcut icon" href="{{ site.baseurl }}/public/favicon.ico">
-
-  <!-- RSS -->
   <link rel="alternate" type="application/atom+xml" title="{{ site.title }}" href="{{ site.baseurl }}/atom.xml">
-
 </head>
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -15,16 +15,14 @@ <h1 class="post-title">{{ page.title }}</h1>
 
 {% if site.related_posts != empty %}
 <aside class="related">
-  <h2>Related Posts</h2>
+  <h3>Related posts</h3>
   <ul class="related-posts">
     {% for post in site.related_posts limit:3 %}
       <li>
-        <h3>
-          <a href="{{ site.baseurl }}{{ post.url }}">
-            {{ post.title }}
-            <small><time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date_to_string }}</time></small>
-          </a>
-        </h3>
+        <a href="{{ site.baseurl }}{{ post.url }}">
+          {{ post.title }}
+          <small><time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date_to_string }}</time></small>
+        </a>
       </li>
     {% endfor %}
   </ul>

diff --git a/_sass/_base.scss b/_sass/_base.scss
@@ -15,25 +15,25 @@ body {
 }
 
 html {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 16px;
-  line-height: 1.5;
+  font-family: $root-font-family;
+  font-size: $root-font-size;
+  line-height: $root-line-height;
 
-  @media (min-width: 38em) {
-    font-size: 18px;
+  @media (min-width: $large-breakpoint) {
+    font-size: $large-font-size;
   }
 }
 
 body {
-  color: #515151;
-  background-color: #fff;
+  color: $body-color;
+  background-color: $body-bg;
   -webkit-text-size-adjust: 100%;
       -ms-text-size-adjust: 100%;
 }
 
 // No `:visited` state is required by default (browsers will use `a`)
 a {
-  color: #268bd2;
+  color: $link-color;
   text-decoration: none;
 
   // `:focus` is linked to `:hover` for basic accessibility

diff --git a/_sass/_code.scss b/_sass/_code.scss
@@ -5,13 +5,13 @@
 
 code,
 pre {
-  font-family: Menlo, Monaco, "Courier New", monospace;
+  font-family: $code-font-family;
 }
 
 code {
   padding: .25em .5em;
   font-size: 85%;
-  color: #bf616a;
+  color: $code-color;
   background-color: #f9f9f9;
   border-radius: 3px;
 }

diff --git a/_sass/_posts.scss b/_sass/_posts.scss
@@ -6,6 +6,10 @@
 .page,
 .post {
   margin-bottom: 4em;
+
+  li + li {
+    margin-top: .25rem;
+  }
 }
 
 // Blog post or page title
@@ -36,7 +40,9 @@
 .related {
   padding-top: 2rem;
   padding-bottom: 2rem;
+  margin-bottom: 2rem;
   border-top: 1px solid #eee;
+  border-bottom: 1px solid #eee;
 }
 
 .related-posts {

diff --git a/_sass/_type.scss b/_sass/_type.scss
@@ -4,7 +4,7 @@
 
 h1, h2, h3, h4, h5, h6 {
   margin-bottom: .5rem;
-  font-weight: bold;
+  font-weight: 600;
   line-height: 1.25;
   color: #313131;
   text-rendering: optimizeLegibility;

diff --git a/_sass/_variables.scss b/_sass/_variables.scss
@@ -0,0 +1,30 @@
+$gray-1: #f9f9f9;
+$gray-2: #ccc;
+$gray-3: #767676;
+$gray-4: #515151;
+$gray-5: #313131;
+
+$red: #ac4142;
+$orange: #d28445;
+$yellow: #f4bf75;
+$green: #90a959;
+$cyan: #75b5aa;
+$blue: #268bd2;
+// $blue: #6a9fb5;
+$brown: #8f5536;
+
+$root-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+$root-font-size: 16px;
+$root-line-height: 1.5;
+
+$body-color: #515151;
+$body-bg: #fff;
+$link-color: $blue;
+
+$border-color: #e5e5e5;
+
+$large-breakpoint: 38em;
+$large-font-size: 18px;
+
+$code-font-family: Menlo, Monaco, "Courier New", monospace;
+$code-color: #bf616a;
diff --git a/atom.xml b/atom.xml
@@ -13,7 +13,7 @@ layout: null
 
  {% for post in site.posts %}
  <entry>
-   <title>{{ post.title }}</title>
+   <title>{{ post.title | xml_escape }}</title>
    <link href="{{ site.url }}{{ site.baseurl }}{{ post.url }}"/>
    <updated>{{ post.date | date_to_xmlschema }}</updated>
    <id>{{ site.url }}{{ post.id }}</id>

diff --git a/styles.scss b/styles.scss
@@ -17,6 +17,7 @@
 // Designed, built, and released under MIT license by @mdo. Learn more at
 // https://github.com/poole/poole.
 
+@import "variables";
 @import "base";
 @import "type";
 @import "syntax";