Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for Poole 2 and Jekyll 3 #137

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,5 @@ validation-report.json

# Folders to ignore
node_modules
.sass-cache
.jekyll-metadata
2 changes: 1 addition & 1 deletion 404.html
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@

<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="{{ site.baseurl }}">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="{{ site.baseurl }}/">Head back home</a> to try finding it again.</p>
</div>
43 changes: 25 additions & 18 deletions _config.yml
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,26 +1,33 @@
# Dependencies
markdown: redcarpet
highlighter: pygments

# Permalinks
permalink: pretty
relative_permalinks: true
permalink: pretty

# Setup
title: Hyde
tagline: 'A Jekyll theme'
description: 'A brazen two-column <a href="http://jekyllrb.com" target="_blank">Jekyll</a> theme that pairs a prominent sidebar with uncomplicated content. Made by <a href="https://twitter.com/mdo" target="_blank">@mdo</a>.'
url: http://hyde.getpoole.com
baseurl: /
title: Hyde
tagline: A Jekyll theme
description: >
A brazen two-column <a href="http://jekyllrb.com" target="_blank">Jekyll</a>
theme that pairs a prominent sidebar with uncomplicated content.
Made by <a href="https://twitter.com/mdo" target="_blank">@mdo</a>.
url: http://hyde.getpoole.com
paginate: 5
baseurl: ""

author:
name: 'Mark Otto'
url: https://twitter.com/mdo
# Assets
sass:
style: :compressed

paginate: 5
# About/contact
author:
name: Mark Otto
url: https://twitter.com/mdo
email: [email protected]

# Custom vars
version: 2.1.0

version: 2.1.0
github:
repo: https://github.com/poole/hyde
repo: https://github.com/poole/hyde

# Gems
gems:
- jekyll-paginate
- jekyll-gist
23 changes: 7 additions & 16 deletions _includes/head.html
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<head>
<link href="http://gmpg.org/xfn/11" rel="profile">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv="content-type" content="text/html; charset=utf-8">

<!-- Enable responsiveness on mobile devices-->
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>
{% if page.title == "Home" %}
Expand All @@ -14,16 +10,11 @@
{% endif %}
</title>

<!-- CSS -->
<link rel="stylesheet" href="{{ site.baseurl }}public/css/poole.css">
<link rel="stylesheet" href="{{ site.baseurl }}public/css/syntax.css">
<link rel="stylesheet" href="{{ site.baseurl }}public/css/hyde.css">
<link rel="stylesheet" href="{{ site.baseurl }}/css/poole.css">
<link rel="stylesheet" href="{{ site.baseurl }}/css/hyde.css">
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=PT+Sans:400,400italic,700|Abril+Fatface">

<!-- Icons -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.baseurl }}public/apple-touch-icon-144-precomposed.png">
<link rel="shortcut icon" href="{{ site.baseurl }}public/favicon.ico">

<!-- RSS -->
<link rel="alternate" type="application/rss+xml" title="RSS" href="/atom.xml">
<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">
<link rel="alternate" type="application/atom+xml" title="{{ site.title }}" href="{{ site.baseurl }}/atom.xml">
</head>
26 changes: 11 additions & 15 deletions _includes/sidebar.html
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,28 +1,22 @@
<div class="sidebar">
{% assign homeurl = site.baseurl | append: "/" %}
<aside class="sidebar">
<div class="container sidebar-sticky">
<div class="sidebar-about">
<h1>
<a href="{{ site.baseurl }}">
{{ site.title }}
</a>
</h1>
<h1><a href="{{ homeurl }}" title="Home">{{ site.title }}</a></h1>
<p class="lead">{{ site.description }}</p>
</div>

<nav class="sidebar-nav">
<a class="sidebar-nav-item{% if page.url == site.baseurl %} active{% endif %}" href="{{ site.baseurl }}">Home</a>
<a class="sidebar-nav-item{% if page.url == homeurl %} active{% endif %}" href="{{ homeurl }}">Home</a>

{% comment %}
The code below dynamically generates a sidebar nav of pages with
`layout: page` in the front-matter. See readme for usage.
{% endcomment %}

{% assign pages_list = site.pages %}
{% for node in pages_list %}
{% if node.title != null %}
{% if node.layout == "page" %}
<a class="sidebar-nav-item{% if page.url == node.url %} active{% endif %}" href="{{ node.url }}">{{ node.title }}</a>
{% endif %}
{% for node in site.pages %}
{% if node.title != null and node.layout == "page" %}
<a class="sidebar-nav-item{% if page.url == node.url %} active{% endif %}" href="{{ node.url }}">{{ node.title }}</a>
{% endif %}
{% endfor %}

Expand All @@ -31,6 +25,8 @@ <h1>
<span class="sidebar-nav-item">Currently v{{ site.version }}</span>
</nav>

<p>&copy; {{ site.time | date: '%Y' }}. All rights reserved.</p>
<small>
&copy; <time datetime="{{ site.time | date_to_xmlschema }}">{{ site.time | date: '%Y' }}</time>. All rights reserved.
</small>
</div>
</div>
</aside>
8 changes: 5 additions & 3 deletions _layouts/default.html
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
<!DOCTYPE html>
<html lang="en-us">
<html lang="en">

{% include head.html %}

<body>

{% include sidebar.html %}

<div class="content container">
{{ content }}
<div class="container content">
<main>
{{ content }}
</main>
</div>

</body>
Expand Down
4 changes: 2 additions & 2 deletions _layouts/page.html
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
layout: default
---

<div class="page">
<article class="page">
<h1 class="page-title">{{ page.title }}</h1>
{{ content }}
</div>
</article>
24 changes: 12 additions & 12 deletions _layouts/post.html
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
layout: default
---

<div class="post">
<article class="post">
<h1 class="post-title">{{ page.title }}</h1>
<span class="post-date">{{ page.date | date_to_string }}</span>
<time datetime="{{ page.date | date_to_xmlschema }}" class="post-date">{{ page.date | date_to_string }}</time>
{{ content }}
</div>
</article>

<div class="related">
<h2>Related Posts</h2>
{% if site.related_posts != empty %}
<aside class="related">
<h3>Related posts</h3>
<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>
<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>
</div>
</aside>
{% endif %}
78 changes: 78 additions & 0 deletions _sass/_base.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
// Body resets
//
// Update the foundational and global aspects of the page.

* {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}

html,
body {
margin: 0;
padding: 0;
}

html {
font-family: $root-font-family;
font-size: $root-font-size;
line-height: $root-line-height;

@media (min-width: $large-breakpoint) {
font-size: $large-font-size;
}
}

body {
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: $link-color;
text-decoration: none;

// `:focus` is linked to `:hover` for basic accessibility
&:hover,
&:focus {
text-decoration: underline;
}

strong {
color: inherit;
}
}

img {
display: block;
max-width: 100%;
margin: 0 0 1rem;
border-radius: 5px;
}

table {
margin-bottom: 1rem;
width: 100%;
font-size: 85%;
border: 1px solid #e5e5e5;
border-collapse: collapse;
}

td,
th {
padding: .25rem .5rem;
border: 1px solid #e5e5e5;
}

th {
text-align: left;
}

tbody tr:nth-child(odd) td,
tbody tr:nth-child(odd) th {
background-color: #f9f9f9;
}
78 changes: 78 additions & 0 deletions _sass/_code.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
// Code
//
// Inline and block-level code snippets. Includes tweaks to syntax highlighted
// snippets from Pygments/Rouge and Gist embeds.

code,
pre {
font-family: $code-font-family;
}

code {
padding: .25em .5em;
font-size: 85%;
color: $code-color;
background-color: #f9f9f9;
border-radius: 3px;
}

pre {
margin-top: 0;
margin-bottom: 1rem;
}

pre code {
padding: 0;
font-size: 100%;
color: inherit;
background-color: transparent;
}

// Pygments via Jekyll
.highlight {
padding: 1rem;
margin-bottom: 1rem;
font-size: .8rem;
line-height: 1.4;
background-color: #f9f9f9;
border-radius: .25rem;

pre {
margin-bottom: 0;
overflow-x: auto;
}

.lineno {
display: inline-block; // Ensures the null space also isn't selectable
padding-right: .75rem;
padding-left: .25rem;
color: #999;
// Make sure numbers aren't selectable
-webkit-user-select: none;
-moz-user-select: none;
user-select: none;
}
}


// Gist via GitHub Pages
// .gist .gist-file {
// font-family: Menlo, Monaco, "Courier New", monospace !important;
// }
// .gist .markdown-body {
// padding: 15px;
// }
// .gist pre {
// padding: 0;
// background-color: transparent;
// }
// .gist .gist-file .gist-data {
// font-size: .8rem !important;
// line-height: 1.4;
// }
// .gist code {
// padding: 0;
// color: inherit;
// background-color: transparent;
// border-radius: 0;
// }
15 changes: 15 additions & 0 deletions _sass/_layout.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// Layout
//
// Styles for managing the structural hierarchy of the site.

.container {
max-width: 38rem;
padding-left: 1.5rem;
padding-right: 1.5rem;
margin-left: auto;
margin-right: auto;
}

footer {
margin-bottom: 2rem;
}
Loading