alembic-jekyll-theme 1.5.3 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: febc34aaac364870b5b4b25b60481a2c3b0cbcd2
-  data.tar.gz: 6100552b2b71e516f94d9db31ad6a9472c5acf87
+  metadata.gz: 8d15229ed503c602eb02d030a471df0614ad9c0c
+  data.tar.gz: 9f5135283f74917bdd690977d27ea4fc95076c43
 SHA512:
-  metadata.gz: ced7b7e03c165625105fe5ad2d7e921622ae2efa3d86716f11d581e99493033f190beddcc3923d1021bde46716cca1d4209926f949e98297be4d04dd2fb97075
-  data.tar.gz: 722fef4bbbb52dfa97f3dfd35142ba4997366b52d3c930f0b64c668b2c9cda26a5be6e19378622c2c8fe4c1ba70abbae89bc5b6d323dde3679e1721f09b0ff2b
+  metadata.gz: 84f1f68866d0250febd7a0beb37e7cfa6b9aa4b14570722098ea007afc31b6de008e936e26dd9f14d8790b96fb93e8b24009c405ae5b7c57bc74ed7ff681fb73
+  data.tar.gz: cba5a0151614c046ad4f604054fb9948de40679c3b57830cd1e18053914351df80ad71e0d7af35f026d0d2d3554899ed530bb5bc111d46f458e1fa3d0a3bc5db

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 David Darnes
+Copyright (c) 2017 David Darnes
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -25,18 +25,18 @@ Alembic is a starting point for [Jekyll](https://jekyllrb.com/) projects. Rather
 
 ## Features
 
-- Available as a starter kit or as [Jekyll 3.3 theme gem](http://jekyllrb.com/docs/themes/)
-- Tested in all major browsers, that includes IE as well as Edge
+- Available as a starter kit or as [Jekyll theme gem](http://jekyllrb.com/docs/themes/)
+- Simple and elegant design that can be used out of the box or as solid starting point
+- Tested in all major browsers, including IE and Edge
+- Configurable colours and typography in a single settings file
 - Extensive set of shortcodes to include various elements; such as buttons, icons, figure images and more
 - Solid typographic framework from [Sassline](https://sassline.com/)
 - Configurable navigation via a single file
 - Modular Jekyll components
-- Easily interchangeable sidebar
 - Post category support in the form of a single post index page grouped by category
 - Built in live search using JavaScript
 - Contact form built in using [Formspree](https://formspree.io/)
 - Works on [GitHub Pages](https://pages.github.com/) out of the box
-- Built with [Jekyll](https://jekyllrb.com/) 3.3
 - Designed with [Siteleaf](http://www.siteleaf.com/) in mind
 - Has 9 of the most popular networks as performant sharing buttons
 - Has documentation
@@ -53,6 +53,7 @@ Here are a few examples of Alembic out in the wild being used in a variety of wa
 - [www.10people.co.uk](http://www.10people.co.uk/)
 - [hrkeni.me](http://hrkeni.me/)
 - [venuthatikonda.github.io](https://venuthatikonda.github.io/)
+- [ccs17.bsc.es](https://ccs17.bsc.es/)
 
 ## Installation
 
@@ -60,26 +61,30 @@ Here are a few examples of Alembic out in the wild being used in a variety of wa
 
 1. [Fork the repo](https://github.com/daviddarnes/alembic#fork-destination-box)
 2. Clone down the repo with `$ git clone git@github.com:username/reponame.git`
-3. Delete the `demo/` folder and `screenshot.png` files
-4. Change the `CNAME` record to your projects' record
-5. Install bundler with `$ gem install bundler`
-6. Install gems with `$ bundle install`
-7. Run Jekyll with `$ bundle exec jekyll serve --watch`
-8. Begin hacking for your project
+3. Delete the following unnecessary files/folders: `demo/`, `CODE_OF_CONDUCT.md`, `CONTRIBUTING.md`, `LICENSE`, `screenshot.png`
+4. Change the `placeholder-logo.svg` and `placeholder-social.png` in the `assets/` folder to your own branding
+5. Configure your site settings using the `_config.yml`, more info can be found in [Configuration](#configuration)
+5. Change the `CNAME` record to your projects' record
+6. Install bundler with `$ gem install bundler`
+7. Install gems with `$ bundle install`
+8. Run Jekyll with `$ bundle exec jekyll serve --watch`
+9. Begin hacking for your project
 
 ### As a Jekyll 3.3 theme gem
 
 1. Download the starter `/demo` content, [quick download link](https://minhaskamal.github.io/DownGit/#/home?url=https://github.com/daviddarnes/alembic/tree/master/demo)
-2. Install bundler with `$ gem install bundler`
-3. Install gems with `$ bundle install`
-4. Run Jekyll with `$ bundle exec jekyll serve --watch`
-5. Begin hacking for your project
+2. Configure your site settings using the `_config.yml`, more info can be found in [Configuration](#configuration)
+3. Create a `placeholder-logo.svg` and `placeholder-social.png` in a new `assets/` folder
+4. Install bundler with `$ gem install bundler`
+5. Install gems with `$ bundle install`
+6. Run Jekyll with `$ bundle exec jekyll serve --watch`
+7. Begin hacking for your project
 
 ### Boilerplate & Theme differences
 
 The boilerplate kit is better for more drastic hacking and changes, a project that's quite different to any other and needs a lot of custom work done. Additionally you'll only be able to use this method if you want to host it on GitHub Pages, as [themes can't be submitted](https://pages.github.com/themes/)... yet.
 
-Using the theme will allow you to receive updates made and will be more programmatic. To make your own changes you'll need to overwrite the files with your own. For example: If I want to change the colours of my site I'll need to copy the [`_colors.scss`](https://github.com/daviddarnes/alembic/blob/master/_sass/_colors.scss) file and create my own in `_sass/colors.scss` with my own changes. This is the same for all files within the theme, which means your own project will be more lean than if you were to use the boilerplate.
+Using the theme will allow you to receive updates made and will be more programmatic. To make your own changes you'll need to overwrite the files with your own. For example: If I want to change the colours and typography of my site I'll need to copy the [`_settings.scss`](https://github.com/daviddarnes/alembic/blob/master/_sass/_settings.scss) file and create my own in `_sass/_settings.scss` with my own changes. This is the same for all files within the theme, which means your own project will be more lean than if you were to use the boilerplate.
 
 ## Configuration
 
@@ -92,7 +97,16 @@ There's a number of settings you'll need to change before you can start hacking
 You'll need to change the `description`, `title` and `url` to match with the project. You'll also need to replace the `/assets/placeholder-logo.svg` `/assets/placeholder-social.png` with project logo and default social image. The `email` needs to be changed to the email you want to receive contact form enquires with. The `disqus` value should be changed to your project username on [Disqus](https://disqus.com). Look for the `Site settings` comment within the `/_config.yml` file. The `repo` setting is optional, for now, and can be removed entirely, if you wish.
 
 ### Site navigation
-There are 3 different navigation types: one for the header, one for the footer and one for a set of social links shown in the aside (or sidebar). If the header or footer navigation are removed, they will fallback to a list of pages within the site. The `social_navigation` properties should either be one that is already in the list (so `Twitter` or `Facebook`) or simply `link`, This is so an icon can be set for the link. Look for the `Site navigation` comment within the `/_config.yml` file.
+There are a total of 4 different navigation types:
+
+- `navigation_header`: The links shown in the header (it is also used on the 404 page)
+- `navigation_footer`: The links shown in the footer
+- `social_links`: The social icon links that are shown in the sidebar
+- `sharing_links`: The social sharing buttons that are shown at the bottom of blog posts
+
+All navigations can be edited using the `_config.yml` file. To see example usage either look for the `Site navigation` comment within the `/_config.yml` file or see [the nav-share.html include](#nav-sharehtml).
+
+If there are no items for the `navigation_header` or `navigation_footer`, they will fallback to a list of pages within the site. The `social_navigation` properties should either be one that is already in the list (so `Twitter` or `Facebook`) or simply `link`, this is so an icon can be set for the link.
 
 ## Using includes
 
@@ -101,7 +115,7 @@ There are 2 main types of includes: ones designed for the site and ones that are
 ### `button.html`
 A button that can link to a page of any kind.
 
-Example usage: `{% include button.html text="I'm a button" link="https://daviddarnes.com" %}`
+Example usage: `{% include button.html text="I'm a button" link="https://david.darn.es" %}`
 
 Available options:
 - `text`: The text of the button _required_
@@ -117,7 +131,7 @@ Example usage: `{% include figure.html image="/uploads/feature-image.jpg" captio
 Available options:
 - `image`: The image shown _required_
 - `caption`: A caption to explain the image
-- `position`: The position of the image. `left`, `right` or `full`
+- `position`: The position of the image, `left` or `right`
 
 ### `icon.html`
 An icon.
@@ -184,8 +198,6 @@ This include has no options. This include will add a block of javascript to the
 
 As well as `page`, `post`, `blog`, there are a few alternative layouts that can be used on pages:
 
-- `page-aside-left`: Places the aside (sidebar) to the left of the content
-- `home`: Removes the aside entirely, leaving the full width for the main content (typically used for home page designs)
 - `categories`: Shows all posts grouped by category, with an index of categories in a left hand sidebar
 - `search`: Adds a search field to the page as well as a simplified version of the sidebar to allow more focus on the search results
 
@@ -193,6 +205,7 @@ As well as `page`, `post`, `blog`, there are a few alternative layouts that can
 
 There are some more specific options you can apply when creating a page or a post:
 
+- `aside: true`: Adds a sidebar to the page or post, this is false by default and will not appear
 - `comments: false`: Turns off comments for that post
 - `feature_image: "/uploads/feature-image.jpg"`: Adds a full width feature image at the top of the page
 - `feature_text: "Example text"`: Adds text to the top of the page as a full width feature with solid colour; supports markdown. This can be used in conjunction with the `feature_image` option to create a feature image with text over it

data/_includes/nav-default.html

@@ -1,7 +1,7 @@
 <nav class="nav">
   <ul class="list list--nav">
     {% for item in site.pages %}
-      {% unless item.title == false or item.url contains "/page" or item.url contains "/404.html" or item.url contains "/feed." %}
+      {% unless item.title == false or item.url contains "/page" or item.url contains "/404.html" or item.url contains "/feed." or item.url contains ".json" %}
         <li class="item  item--nav{% if item.url == page.url %}  item--current{% endif %}">
           {% if item.collectionpage %}
       			{% assign collectiondata = site.collections | where: "label", item.collectionpage | first %}

data/_includes/nav-header.html

@@ -1,6 +1,9 @@
 {% if site.navigation_header %}
 <nav class="nav  nav--header">
-  <ul class="list list--nav">
+  <button class="button  button--nav">
+    {% include icon.html id="nav" %}
+  </button>
+  <ul class="list  list--nav">
     {% for item in site.navigation_header %}
       <li class="item  item--nav{% if item[1] == page.url %}  item--current{% endif %}">
         <a href="{{ item[1] }}" title="Page - {{ item[0] }}">{{ item[0] }}</a>
@@ -11,3 +14,23 @@
 {% else %}
   {% include nav-default.html %}
 {% endif %}
+<script type="text/javascript">
+const applyToggle = (list, button, breakpoint, itemCount) => {
+  const navList = document.querySelector(list)
+  if (document.body.clientWidth < breakpoint && navList.childElementCount >= itemCount) {
+    const navHeight = navList.clientHeight
+    const navButton = document.querySelector(button)
+    navList.style.maxHeight = '0px'
+
+    navButton.onclick = () => {
+      if (navList.style.maxHeight == '0px') {
+        navList.style.maxHeight = `${navHeight}px`
+      } else {
+        navList.style.maxHeight = '0px'
+      }
+    }
+  }
+}
+
+applyToggle('.list--nav', '.button', 640, 6)
+</script>

data/_includes/post-categories.html

@@ -4,6 +4,7 @@
 		<h2 id="{{ category_name | slugify }}">{{ category_name }}</h2>
 		<ul class="list  list--posts">
 			{% for page in site.categories[category_name] %}
+				{% assign has_categories = true %}
 				<li class="item  item--post">
 				 	<article class="article  article--post  typeset">
 					 	<h3><a href="{{ page.url }}" title="Post - {{ page.title }}">{{ page.title }}</a></h3>
@@ -16,3 +17,9 @@
 		{% unless forloop.last %}<hr/>{% endunless %}
 	</section>
 {% endfor %}
+
+{% if has_categories != true %}
+	<section class="section  typeset">
+		<p>There are no categorised posts</p>
+	</section>
+{% endif %}

data/_includes/post-list.html

@@ -1,5 +1,4 @@
 {% if paginator.posts %}
-
 	<section class="section  typeset">
 		<ul class="list  list--posts">
 			{% for page in paginator.posts %}
@@ -16,21 +15,20 @@
 		</ul>
 		{% include post-pagination.html %}
 	</section>
-
 {% else %}
-	<h3>Latest blog posts</h3>
-	<ul class="list  list--posts">
-		{% for page in site.posts limit: 4 %}
-			<li class="item  item--post">
-				<article class="article  article--post">
-
-					<h4><a href="{{ page.url }}" title="Post - {{ page.title }}">{{ page.title }}</a></h4>
-					{% include post-meta.html %}
-					{{ page.excerpt | markdownify | truncatewords: 60 }}
+	<section class="section  typeset">
+		<ul class="list  list--posts">
+			{% for page in site.posts %}
+				<li class="item  item--post">
+					<article class="article  article--post">
 
-				</article>
-			</li>
-		{% endfor %}
-	</ul>
+						<h2><a href="{{ page.url }}" title="Post - {{ page.title }}">{{ page.title }}</a></h2>
+						{% include post-meta.html %}
+						{{ page.excerpt | markdownify | truncatewords: 60 }}
 
+					</article>
+				</li>
+			{% endfor %}
+		</ul>
+	</section>
 {% endif %}

data/_includes/post-related.html

@@ -1,6 +1,7 @@
 <h3>Related posts</h3>
 <ul class="list  list--posts">
   {% for page in site.related_posts limit: 3 %}
+    {% assign has_related = true %}
     <li class="item  item--post">
       <article class="article  article--post  typeset">
 
@@ -11,4 +12,8 @@
       </article>
     </li>
   {% endfor %}
+
+  {% if has_related != true %}
+    <p>There are no related posts</p>
+  {% endif %}
 </ul>

data/_includes/site-aside.html

@@ -1,31 +1,23 @@
-<aside class="aside  typeset">
+<aside class="aside  typeset{% if include.align == "left" %}  aside--left{% endif %}">
 
-  {% unless page.layout == "categories" or page.collection == "posts" %}
-    <h3>About this site</h3>
-    <p>{{ site.description }}</p>
-  {% endunless %}
+  {% if page.layout == "post" %}
+    <section class="section  section--related-posts">
+      {% include post-related.html %}
+    </section>
 
-  {% unless page.layout == "categories" or page.layout == "search" or page.collection == "posts" or paginator.posts %}
-    {% include post-list.html %}
-  {% endunless %}
+  {% elsif page.layout == "page" or page.layout == "home" or page.layout == "blog" %}
+    <section class="section  section--description">
+      <h3>About this site</h3>
+      <p>{{ site.description }}</p>
+      {% include nav-social.html %}
+    </section>
 
-  {% if page.layout == "categories" %}
+  {% elsif page.layout == "categories" %}
     <section class="section  section--category-index">
       <h3>Index</h3>
       {% include nav-categories.html %}
     </section>
-  {% endif %}
 
-  {% if page.collection == "posts" %}
-    {% include post-related.html %}
   {% endif %}
 
-  {% if page.collection == "posts" or paginator.posts %}
-    {% include button.html text="Subscribe to posts &nbsp;" icon="rss" link="/feed.xml" %}
-  {% endif %}
-
-  {% unless page.layout == "categories" %}
-    {% include nav-social.html %}
-  {% endunless %}
-
 </aside>

data/_includes/site-footer.html

@@ -1,9 +1,9 @@
 <footer class="footer">
   <div class="container">
-    {% include nav-footer.html %}
-    
     <div class="copyright  typeset">
       <small class="small">&copy; {{ site.title }} {{ site.time | date: '%Y' }}</small>
     </div>
+
+    {% include nav-footer.html %}
   </div>
 </footer>

data/_includes/site-form.html

@@ -1,5 +1,5 @@
 <div class="form  form--contact">
-    <form id="contact-form" action="" method="POST">
+    <form class="contact-form" action="" method="POST">
         <label class="label" for="name">Name: <span class="required">*</span></label>
         <input class="input" id="name" type="text" name="name" value="" placeholder="Your Name" required="required" />
 
@@ -21,7 +21,7 @@
 <script>
 	var email = "{{ site.email | split: "" | reverse | join: "" }}";
 	var unraveledEmail = email.split("").reverse().join("");
-	var form = document.getElementById("contact-form");
-		form.setAttribute("action", "://formspree.io/" + unraveledEmail);
+	var form = document.querySelector(".contact-form");
+		form.setAttribute("action", "https://formspree.io/" + unraveledEmail);
 </script>
 <noscript>Please enable JavaScript to use the form.</noscript>

data/_includes/site-icons.svg

@@ -21,4 +21,5 @@
   <symbol id="youtube" viewBox="0 0 16 16"><path d="M0 7.345c0-1.294.16-2.59.16-2.59s.156-1.1.636-1.587c.608-.637 1.408-.617 1.764-.684C3.84 2.36 8 2.324 8 2.324s3.362.004 5.6.166c.314.038.996.04 1.604.678.48.486.636 1.588.636 1.588S16 6.05 16 7.346v1.258c0 1.296-.16 2.59-.16 2.59s-.156 1.102-.636 1.588c-.608.638-1.29.64-1.604.678-2.238.162-5.6.166-5.6.166s-4.16-.037-5.44-.16c-.356-.067-1.156-.047-1.764-.684-.48-.487-.636-1.587-.636-1.587S0 9.9 0 8.605v-1.26zm6.348 2.73V5.58l4.323 2.255-4.32 2.24h-.002z"/></symbol>
   <symbol id="link" viewBox="0 0 16 16"><path d="M5.86 12.7l-.81.8c-.7.7-1.84.7-2.54 0a1.75 1.75 0 0 1 0-2.5l2.98-2.96c.61-.61 1.77-1.52 2.62-.68a1 1 0 1 0 1.4-1.4c-1.44-1.43-3.57-1.17-5.42.67L1.1 9.6a3.72 3.72 0 0 0 0 5.32 3.78 3.78 0 0 0 5.34 0l.8-.8a1 1 0 1 0-1.39-1.42zm9.03-11.5c-1.55-1.53-3.7-1.6-5.14-.19l-1 1a1 1 0 1 0 1.39 1.41l1-1c.75-.74 1.72-.43 2.35.2a1.75 1.75 0 0 1 0 2.5l-3.17 3.15c-1.46 1.45-2.14.77-2.43.48a1 1 0 0 0-1.4 1.4c.67.67 1.43 1 2.23 1 .98 0 2.01-.5 3-1.47l3.17-3.15a3.72 3.72 0 0 0 0-5.32z"/></symbol>
   <symbol id="email" viewBox="0 0 16 11"><path fill-rule="evenodd" d="M1.33 0h13.34L8 5 1.33 0zM16 0v11H0V0l8 6 8-6z"/></symbol>
+  <symbol id="nav" viewBox="0 0 16 11"><path d="M0 12h16v-2H0v2zm0-5h16V5H0v2zm0-7v2h16V0H0z"/></symbol>
 </svg>

data/_includes/site-search.html

@@ -30,9 +30,9 @@
         const resultsArray = findResults(this.value, pages);
         const html = resultsArray.map(item => {
           return `
-              <li class="item">
+              <li class="item  item--result">
                   <article class="article  typeset">
-                      <h4><a href="{{ site.url }}${item.url}" title="Result - ${item.title}">${item.title}</a></h4>
+                      <h4><a href="${item.url}" title="Result - ${item.title}">${item.title}</a></h4>
                       <p>${item.excerpt}</p>
                   </article>
               </li>`;

data/_layouts/blog.html

@@ -10,10 +10,16 @@ layout: default
 
     <article class="article  article--page  typeset">
 
-			{% assign collectiondata = site.collections | where: "label", page.collectionpage | first %}
-			<h1>{{ collectiondata.title }}</h1>
+			{% if paginator.posts %}
+				{% assign collectiondata = site.collections | where: "label", page.collectionpage | first %}
+				<h1>{{ collectiondata.title }}</h1>
+				{{ collectiondata.description | markdownify }}
 
-			{{ collectiondata.description | markdownify }}
+			{% else %}
+				<h1>{{ page.title }}</h1>
+				{{ content }}
+				
+			{% endif %}
 
     </article>
 
@@ -21,7 +27,7 @@ layout: default
 
   </div>
 
-  {% include site-aside.html %}
+  {% if page.aside == true %}{% include site-aside.html %}{% endif %}
 
 </main>
 

data/_layouts/categories.html

@@ -6,9 +6,9 @@ layout: default
 
 <main class="main  container">
 
-	<div class="content  content--aside-left">
+	<div class="content">
 
-		<article class="article  article--page typeset">
+		<article class="article  article--page  typeset">
 
 	    <h1>{{ page.title }}</h1>
 
@@ -20,7 +20,7 @@ layout: default
 
 	</div>
 
-	{% include site-aside.html %}
+	{% if page.aside == true %}{% include site-aside.html align="left" %}{% endif %}
 
 </main>
 

data/_layouts/default.html

@@ -24,7 +24,7 @@
 
 		{% include site-favicons.html %}
 	</head>
-	<body class="layout-{{ page.layout }}  {{ page.title | slugify }}">
+	<body class="layout-{{ page.layout }}{% if page.title %}  {{ page.title | slugify }}{% endif %}">
 		{% include site-icons.svg %}
 
 		{{ content }}

data/_layouts/page.html

@@ -14,7 +14,7 @@ layout: default
 
   </article>
 
-  {% include site-aside.html %}
+	{% if page.aside == true %}{% include site-aside.html %}{% endif %}
 
 </main>
 

data/_layouts/post.html

@@ -18,7 +18,7 @@ layout: default
 
   </article>
 
-  {% include site-aside.html %}
+	{% if page.aside == true %}{% include site-aside.html %}{% endif %}
 
 </main>
 

data/_sass/_settings.scss

@@ -0,0 +1,39 @@
+// Background colours
+$backgroundColour: #ffffff;
+$codeBackgroundColour: #f4f4f4;
+$featureBackgroundColour: #eeeeee;
+$accentColour: #05bf85;
+
+// Text colours
+$headingColour: #333333;
+$bodyColour: #555555;
+$linkColour: #05bf85;
+$hoverColour: #008000;
+$focusColour: #fa407a;
+$captionColour: #aaaaaa;
+$white: #ffffff;
+
+// Typography
+$bodytype: (
+  font-family: 'Georgia, serif',
+  regular: 400,
+  bold: 700,
+  italic: italic,
+  cap-height: 0.75
+);
+
+$headingtype: (
+  font-family: '"Merriweather", serif',
+  regular: 400,
+  bold: 700,
+  cap-height: 0.75
+);
+
+$monospacetype: (
+  font-family: 'Menlo, monospace',
+  regular: 400,
+  cap-height: 0.68
+);
+
+// Font import, if you're using a non-standard web font
+@import url('https://fonts.googleapis.com/css?family=Merriweather:400,700');

data/_sass/sassline-base/_typography.scss

@@ -36,7 +36,7 @@ a {
 
   // Nice underlines for text links.
   p a, li a {
-    background-image: linear-gradient(to bottom,rgba(0, 0, 0, 0) 50%,lighten($linkColour,20%) 50%);
+    background-image: linear-gradient(to bottom,rgba(0, 0, 0, 0) 50%,$linkColour 50%);
     background-position: 0 93%;
     background-repeat: repeat-x;
     background-size: 100% 0.15rem;
@@ -46,7 +46,7 @@ a {
                 -0.15rem 0 $backgroundColour;
 
     &:hover, &:active, &:focus {
-      background-image: linear-gradient(to bottom,rgba(0, 0, 0, 0) 50%,lighten($hoverColour,20%) 50%);
+      background-image: linear-gradient(to bottom,rgba(0, 0, 0, 0) 50%,$hoverColour 50%);
     }
   }
 

data/_sass/sassline-base/_variables.scss

@@ -94,15 +94,3 @@ $white: #FFFFFF !default;
 // Background colours.
 $backgroundColour: #FCFCFC !default;
 $codeBackgroundColour: #F5F4F2 !default;
-
-
-// Alembic reassigned variables
-$headingColour: $color__site--heading;
-$bodyColour: $color__site--body;
-$linkColour: $color__site--link;
-$hoverColour: $color__site--link--hover;
-$captionColour: $color__site--captions;
-$white: #fff;
-
-$backgroundColour: $color__site--background;
-$codeBackgroundColour: darken($color__site--background, 5%);

data/assets/styles.scss

@@ -2,10 +2,9 @@
 title: false
 ---
 
-
 // Frameworks & Imports
 @charset "utf-8";
-@import "colors";
+@import "settings";
 @import "normalize";
 @import "sassline-base";
 @import "syntax";
@@ -14,8 +13,8 @@ title: false
 
 // Structural elements
 body {
-  background: $color__site--background;
-  color: $color__site--body;
+  background: $backgroundColour;
+  color: $bodyColour;
   height: 100%;
   display: flex;
   @include flex-direction(column);
@@ -32,18 +31,17 @@ body {
 // Header, feature and footer
 .header,
 .footer {
+  .nav {
+    text-align: right;
+  }
   .container {
-    padding: 1rem 0;
     @include flexbox;
-    @include flex-direction(column);
-    @include align-items(center);
-    text-align: center;
-  }
-  @include breakpoint(break-1) {
-    .container {
-      @include flex-direction(row);
-      @include justify-content(space-between);
-      text-align: inherit;
+    @include flex-direction(row);
+    @include justify-content(space-between);
+    padding: 1rem 0;
+    text-align: inherit;
+    @include breakpoint(break-1) {
+      @include align-items(center);
     }
   }
 }
@@ -52,7 +50,7 @@ body {
   padding-bottom: .4rem;
   margin-bottom: 1.6rem;
   text-align: center;
-  background: $color__site--accent;
+  background: $featureBackgroundColour;
   background-size: cover;
   background-position: center;
   @include flexbox;
@@ -75,18 +73,25 @@ body {
 
 .small {
   padding-top: .8rem;
-  color: $color__site--captions;
+  color: $captionColour;
   display: inline-block;
 }
 
 .footer {
-  background: lighten(invert($color__site--background), 15%);
+  background: $headingColour;
+  color: $captionColour;
   a {
-    color: invert($color__site--heading);
+    color: $captionColour;
     &:hover {
-      color: lighten(invert($color__site--body), 15%);
+      color: $backgroundColour;
     }
   }
+  .container {
+    @include flex-wrap(wrap);
+  }
+  .small {
+    padding-top: 0;
+  }
 }
 
 
@@ -95,7 +100,7 @@ body {
   &--paginator {
     @include flexbox;
     @include justify-content(space-between);
-    color: $color__site--captions;
+    color: $captionColour;
     text-align: center;
   }
   &--social {
@@ -107,27 +112,20 @@ body {
   min-width: 20%;
 }
 
-.copyright {
-  @include breakpoint(break-1) {
-    @include order(-1);
-  }
-}
-
 
 // Main content
 .main {
   @include flexbox;
   @include flex-direction(column);
+  @include flex(1, 0, auto);
+  @include justify-content(flex-start);
   margin-bottom: 1.6rem;
   @include breakpoint(break-1) {
+    @include justify-content(center);
     @include flex-direction(row);
   }
 }
 
-.main {
-  @include flex(1, 0, auto);
-}
-
 .header,
 .feature,
 .footer {
@@ -138,21 +136,9 @@ body {
   width: 100%;
   @include breakpoint(break-1) {
     width: 62%;
-    margin-right: 4%;
     &--full {
       width: 100%;
       margin-right: 0%;
-      .figure--full {
-        left: 50%;
-      }
-    }
-    &--aside-left {
-      margin-right: 0;
-      margin-left: 4%;
-      @include order(2);
-      .figure--full {
-        left: 19.4%;
-      }
     }
   }
 }
@@ -167,9 +153,19 @@ body {
   max-width: 100%;
   @include breakpoint(break-1) {
     max-width: 34%;
+    margin-left: 4%;
     @include flex(1, 0, auto);
     opacity: 0.5;
     transition: opacity .1s;
+    .section {
+      position: sticky;
+      top: 0;
+    }
+    &--left {
+      margin-left: 0;
+      margin-right: 4%;
+      order: -1;
+    }
     &:hover {
       opacity: 1;
     }
@@ -178,10 +174,6 @@ body {
 
 .section {
   margin: 0;
-  &--category-index {
-    position: sticky;
-    top: 0;
-  }
 }
 
 
@@ -195,7 +187,12 @@ body {
   &--categories {
     list-style: none;
   }
-  .item--post {
+  &--nav {
+    overflow: hidden;
+    transition: .2s;
+  }
+  .item--post,
+  .item--result {
     margin-left: 0;
   }
   &--categories {
@@ -208,14 +205,18 @@ body {
 .item {
   &--nav {
     display: inline-block;
-    margin-left: 1rem;
+    width: 100%;
+    @include breakpoint(break-1) {
+      width: auto;
+      margin-left: 1rem;
+    }
     &:first-of-type {
       margin-left: 0;
     }
   }
   &--current {
     a {
-      color: $color__site--link--current;
+      opacity: 0.5;
     }
   }
 }
@@ -230,7 +231,7 @@ body {
     display: inline-block;
     transition: fill .1s;
     &:hover {
-      fill: darken($color__site--link, 10%);
+      fill: $hoverColour;
     }
   }
 }
@@ -254,20 +255,7 @@ img {
 
 .figure {
   line-height: 0;
-  &--full {
-    width: 100vw;
-    position: relative;
-    left: 50%;
-    margin-left: -50vw;
-    .caption {
-      padding-left: .8rem;
-      padding-right: .8rem;
-    }
-  }
   @include breakpoint(break-1) {
-    &--full {
-      left: 80.6%;
-    }
     &--left {
       float: left;
       padding-right: .8rem;
@@ -318,7 +306,9 @@ input[type="text"],
 input[type="email"],
 input[type="search"],
 input[type="submit"],
-textarea {
+input[type="color"],
+textarea,
+select {
   padding: .6rem 1.2rem;
   margin-bottom: .6rem;
   transition: color .1s, background-color .1s, border .1s;
@@ -332,12 +322,27 @@ textarea {
   }
 }
 
+input[type="color"] {
+  padding: 0;
+  height: 2.4rem;
+  &::-webkit-color-swatch-wrapper {
+  	padding: 0;
+    &:after {
+      content: "Color";
+    }
+  }
+  &::-webkit-color-swatch {
+  	border: none;
+  }
+}
+
 input[type="submit"],
 button,
 .button {
   cursor: pointer;
   display: inline-block;
-  background: $color__site--accent;
+  color: $backgroundColour;
+  background: $accentColour;
   position: relative;
   transition: box-shadow .1s;
   will-change: box-shadow;
@@ -351,14 +356,31 @@ button,
   }
 }
 
+.button--nav {
+  @include breakpoint(break-1) {
+    display: none;
+  }
+  background: none;
+  color: $linkColour;
+  margin-bottom: 0;
+  min-height: 4rem;
+  min-width: 4rem;
+  &:hover,
+  &:focus {
+    box-shadow: none;
+    color: $hoverColour;
+  }
+}
+
 a,
 button,
 .button,
 input,
-textarea {
+textarea,
+select {
   &:focus,
   &:hover:focus {
-    outline: solid .12rem invert($color__site--accent);
+    outline: solid .12rem $focusColour;
   }
 }
 
@@ -369,14 +391,20 @@ a:hover:focus {
 input[type="text"],
 input[type="email"],
 input[type="search"],
-textarea {
+input[type="color"],
+textarea,
+select {
   width: 100%;
-  border: 1px solid $color__site--captions;
+  border: 1px solid $captionColour;
   &:hover {
-    border-color: darken($color__site--captions, 20%);
+    border-color: $bodyColour;
   }
 }
 
+select {
+  background: $codeBackgroundColour;
+}
+
 textarea {
     resize: vertical;
 }
@@ -398,39 +426,46 @@ pre code {
 }
 
 ::-webkit-input-placeholder {
-  color: darken($color__site--captions, 30%);
+  opacity: 0.5;
 }
 ::-moz-placeholder {
-  color: darken($color__site--captions, 30%);
+  opacity: 0.5;
 }
 :-ms-input-placeholder {
-  color: darken($color__site--captions, 30%);
+  opacity: 0.5;
 }
 :-moz-placeholder {
-  color: darken($color__site--captions, 30%);
+  opacity: 0.5;
 }
 
 ::selection {
-  background: $color__site--heading;
-  color: $color__site--background;
+  background: $headingColour;
+  color: $backgroundColour;
   text-shadow: none;
 }
 
+
 // Sassline overrides
 .typeset {
   .button,
   button {
     background-image: none;
     text-shadow: none;
-    color: lighten(invert($color__site--body), 15%);
+    color: $backgroundColour;
     &:hover,
     &:active,
     &:focus {
       background-image: none;
-      color: lighten(invert($color__site--body), 15%);
+      color: $backgroundColour;
     }
   }
   hr {
     width: 100%;
   }
+  li {
+    > p {
+      padding: 0;
+      margin: 0;
+    }
+  }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alembic-jekyll-theme
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 2.0.2
 platform: ruby
 authors:
 - David Darnes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: jekyll-sitemap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: jekyll-mentions
   requirement: !ruby/object:Gem::Requirement
@@ -72,70 +72,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: jekyll-redirect-from
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: jekyll-feed
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: jemoji
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.14'
 description: A Jekyll boilerplate theme designed to be a starting point for any Jekyll
   website. Rather than starting from scratch, this boilerplate is designed to get
   the ball rolling immediately.
@@ -176,15 +176,12 @@ files:
 - _layouts/blog.html
 - _layouts/categories.html
 - _layouts/default.html
-- _layouts/home.html
-- _layouts/page-aside-left.html
 - _layouts/page.html
 - _layouts/post.html
-- _layouts/search.html
-- _sass/_colors.scss
 - _sass/_flex.scss
 - _sass/_normalize.scss
 - _sass/_sassline-base.scss
+- _sass/_settings.scss
 - _sass/_syntax.scss
 - _sass/sassline-base/_mixins.scss
 - _sass/sassline-base/_modular-scale.scss

data/_layouts/home.html

@@ -1,19 +0,0 @@
----
-layout: default
----
-
-{% include site-header.html %}
-
-<main class="main  container">
-
-	<article class="article  article--page  content  content--full  typeset">
-
-    <h1>{{ page.title }}</h1>
-
-    {{ content }}
-
-  </article>
-
-</main>
-
-{% include site-footer.html %}

data/_layouts/page-aside-left.html

@@ -1,21 +0,0 @@
----
-layout: default
----
-
-{% include site-header.html %}
-
-<main class="main  container">
-
-	<article class="article  article--page  content  content--aside-left  typeset">
-
-    <h1>{{ page.title }}</h1>
-
-    {{ content }}
-
-  </article>
-
-  {% include site-aside.html %}
-
-</main>
-
-{% include site-footer.html %}

data/_layouts/search.html

@@ -1,27 +0,0 @@
----
-layout: default
----
-
-{% include site-header.html %}
-
-<main class="main  container">
-
-	<div class="content">
-
-    <article class="article  article--page  typeset">
-
-			<h1>{{ page.title }}</h1>
-
-			{{ content }}
-
-    </article>
-
-		{% include site-search.html %}
-
-  </div>
-
-  {% include site-aside.html %}
-
-</main>
-
-{% include site-footer.html %}

data/_sass/_colors.scss

@@ -1,10 +0,0 @@
-// Colours
-$color__site--background: #fff;
-$color__site--heading: #333;
-$color__site--body: darken($color__site--heading, 10%);
-$color__feature--background: darken($color__site--background, 5%);
-$color__site--captions: lighten($color__site--heading, 50%);
-$color__site--link: #05bf85;
-$color__site--link--hover: darken($color__site--link, 10%);
-$color__site--link--current: desaturate($color__site--link, 100%);
-$color__site--accent: #05bf85;