octopress-genesis-theme 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32d5f7e9176584bfaa80812d9fb84ad4bb6be3dc
-  data.tar.gz: cb5829a501b655dac1f4a24c4039b91111100192
+  metadata.gz: 6c24ab057d5e870e250f5db02d9912b47bc88d62
+  data.tar.gz: a2179152ee3d08bd1fa4817a3ad605a51c6f62c2
 SHA512:
-  metadata.gz: f519acee6b7401d5feaacbabe2dfe4c2a863b3362db2c7e9ca944d4b4a5de5ae14a3442807d3e9db9fd814f039c6979ca1a25ac717de8dd5ef41de7b18e91a52
-  data.tar.gz: da333c5ad070fb023d6be6472198bbcfd2198040e1571ca25ec8d84e38367db51587c7e013e0249472ac4407fa0e518e361c0e20e3b0ef30deeed75e407a6087
+  metadata.gz: fe10e81531edfde37e0ecccb4bd7ad81acccb0d3d622cdb4d794c97d6aff5eaad1d7f3df528284bcb384014b76a6d782e49ea603d024f541327335f949ec72cd
+  data.tar.gz: 5ba1911ad2b3213919f23af2e4129b4443287467adf8f5c4607bd3522fa959eaa53741c21e00a120f51963eb7a820759b9cd3778fade1c677fdcb775391e3873

data/README.md

@@ -6,19 +6,21 @@ Note: This theme is in alpha development. What's left to do? See [the issues](ht
 
 ## Installation
 
-Add this line to your application's Gemfile:
+If you're using bundler add this gem to your site's Gemfile in the `:jekyll_plugins` group:
 
-    gem 'octopress-genesis-theme'
+    group :jekyll_plugins do
+      gem 'octopress-genesis-theme'
+    end
 
-And then execute:
+Then install the gem with Bundler
 
     $ bundle
 
-Or install it yourself as:
+To install manually without bundler:
 
     $ gem install octopress-genesis-theme
 
-Next add it to your gems list in Jekyll's `_config.yml`
+Then add the gem to your Jekyll configuration.
 
     gems:
       - octopress-genesis-theme
@@ -39,9 +41,8 @@ the defaults.
 
 ```yaml
 # Settings for main header
-header:
-  title: My Octopress Blog
-  subtitle: A clever subtitle (optional)
+title: My Octopress Blog
+subtitle: A clever subtitle (optional)
  
 # Links for main navigation
 nav:
@@ -49,18 +50,13 @@ nav:
   - { url: '/archive', title: 'Archive' }
   - { url: '/feed', title: 'RSS' }
 
-# Settings for category index generator
-category:
-  prefix: Category
-  url:    category
-
 post_index:
   excerpt_posts: true
   permalink_label: "Permalink"
   read_more_label: "Continue Reading →"
 
 # Center the text in post and page headings.
-center-headings: true
+center_headings: true
 ```
 
 You can also easily overwrite stylesheets, layouts, partials and basically everything about

data/assets/config.yml

@@ -1,40 +1,18 @@
 # Settings for main header
-header:
-  title: My Octopress Blog
-  subtitle:
+title: My Octopress Blog
+subtitle:
  
 # Links for main navigation
 nav:
-  - { url: '/', title: 'Home' }
+  - { url: '/', title: 'Posts' }
   - { url: '/archive/', title: 'Archive' }
-  - { url: '/feed/', title: 'RSS' }
-
-# Settings for category generator
-category:
-  title:  Category
-  dir:   'categories'
-  feeds: false
-    
-  # The base url for categories
-  # An empty string means categories will live at the root directory.
-
-  # To add per category feeds, use an array of category names you want feeds for.
-  # for example:
-  # feeds:
-  #   - news
-  #   - programming
+  - { url: '/feed/', title: 'Subscribe' }
 
 post_index:
-  excerpt_articles: true
+  excerpt_articles: false
   permalink_label: "Permalink"
   read_more_label: "Continue Reading →"
 
-feeds:
-  count: 10
-  main_feed: true
-  linkpost_feed: true
-  article_feed: true
-  excerpt_articles: false
-
-center_headings: true
 search: google
+
+center_headings: false

data/assets/includes/archive-post.html

@@ -1,6 +1,6 @@
 <article class="archive {{ post.class }}" role="article">
   <header class="archive-entry-header">
-    <h1 class="archive-entry-title">{{ post.title_link }}</h1>
+    <h2 class="archive-entry-title">{{ post.title_link }}</h2>
     <div class="archive-entry-date">{{ post.date_html }}</div>
   </header>
 
@@ -10,9 +10,8 @@
   <p>
     {% filter join_lines:bullet | compact_newlines %}
     {{ post.permalink }}
-    {% if categories and categories != '' %}
-    <span class="article-categories">posted in {{ categories }}</span>
-    {% endif %}
+    {%_ categories post %}
+    {%_ tags post %}
     {% endfilter %}
   </p>
   </footer>

data/assets/includes/index-post.html

@@ -1,12 +1,10 @@
-{% assign post_content = (theme.post-index.excerpt-articles ? post.excerpt : post.content) %}
-{% assign excerpted = true if post_content != post.content %}
-{% assign classnames = post.class | join: " " | classify if post.class %}
-{% assign classnames += " excerpt" if excerpted %}
-{% assign permalink_label = (excerpted ? theme.post-index.read_more_label : theme.post-index.permalink-label) %}
+{% assign post_content = (theme.excerpt_articles ? post.excerpt : post.content) %}
+{% assign permalink_label = (post.excerpted ? theme.post_index.read_more_label : theme.post_index.permalink_label) %}
 
-<article class="entry {{ classnames }}" role="article">
+<article class="entry {% return 'excerpted' if excerpted %}" role="article">
   <header class="entry-header">
     <h1 class="entry-title">{{ post.title_link }}</h1>
+    {% if post.subtitle %}<h2 class="entry-subtitle">{{ post.subtitle }}</h2>{% endif %}
     <div class="entry-meta">{{ post.date_html }}</div>
   </header>
 
@@ -14,5 +12,7 @@
 
   <footer class='entry-footer'>
     <a class='permalink' rel="full-article" href="{{ post.url }}">{{ permalink_label }}</a>
+    {%_ categories post %}
+    {%_ tags post %}
   </footer>
 </article>

data/assets/includes/post-nav.html

@@ -1,16 +1,16 @@
 {% if page.previous.url or page.next.url %}
 <nav role="pagination" class="post-nav">
 {% if page.previous.url %}
-<a class="previous-post" href="{{page.previous.url}}" title="Previous Article: {{page.previous.title_text}}">
+<a class="previous-post" href="{{ page.previous.url }}" title="Previous Article: {{ page.previous.title_text }}">
   <div class='previous-post-marker'><span class='previous-post-arrow'>&larr;</span> Previous Article</div>
-  <h6 class='previous-post-title'>{{page.previous.title_html}}</h6>
+  <h6 class='previous-post-title'>{{ page.previous.title_html }}</h6>
   <div class="previous-post-date">{{ page.previous.date_html }}</div>
 </a>
 {% endif %}
 {% if page.next.url %}
-<a class="next-post" href="{{page.next.url}}" title="Next Article: {{page.next.title_text}}">
+<a class="next-post" href="{{ page.next.url }}" title="Next Article: {{ page.next.title_text }}">
   <div class='next-post-marker'>Next Article <span class='next-post-arrow'>&rarr;</span></div>
-  <h6 class='next-post-title'>{{page.next.title_html}}</h6>
+  <h6 class='next-post-title'>{{ page.next.title_html }}</h6>
   <div class="next-post-date">{{ page.next.date_html }}</div>
 </a>
 {% endif %}

data/assets/includes/search/google.html

@@ -1,4 +1,4 @@
 <form class='site-search' action="https://google.com/search" method="get">
-  <input type="hidden" name="q" value="site:{{ site.url | strip_url_protocol }}">
+  <input type="hidden" name="sitesearch" value="{{ site.url | strip_url_protocol }}">
   <input class="search-input" type="text" name="q" results="0" placeholder="Search&hellip;" accesskey="/">
 </form>

data/assets/includes/site-header.html

@@ -1,4 +1,4 @@
 <header role="banner" class="site-header">
-  <h1 class="site-title"><a class="site-title-link" href="{% return site.root || '/' %}">{{ theme.header.title}}</a></h1>
-  {% if theme.header.subtitle %}<p class='site-subtitle'>{{ theme.header.subtitle }}</p>{% endif %}
+  <h1 class="site-title"><a class="site-title-link" href="{% return site.root || '/' %}">{{ theme.title }}</a></h1>
+  {% if theme.subtitle %}<p class='site-subtitle'>{{ theme.subtitle }}</p>{% endif %}
 </header>

data/assets/layouts/base.html

@@ -1,7 +1,6 @@
 <!DOCTYPE html>
-<html lang="{% return page.lang || site.lang || 'en' %}">
+<html class="{{ page.class }}" lang="{% return page.lang || site.lang || 'en' %}" >
 <head>
-<title>{% return post.title_text || page.title %}</title>
 {% include theme:head.html | expand_urls %}
 </head>
 <body>

data/assets/layouts/post.html

@@ -1,7 +1,7 @@
 ---
 layout: theme:default
 ---
-<article class="post entry {{ page.class }} {% return 'graphic-title' if page.title-graphic %} {% return 'linkpost' if entry.linkpost %}" role="article">
+<article class="post entry {% return 'graphic-title' if page.title-graphic %} {% return 'linkpost' if entry.linkpost %}" role="article">
   {% if page.title-graphic %}
     <header class="entry-header" style='background-image: url("{{ page.title-graphic }}")'>
   {% else %}
@@ -9,7 +9,7 @@ layout: theme:default
   {% endif %}
     {% assign title = (page.linkpost ? page.title_link : page.title_html) %}
     <h1 class="entry-title">{{ title }}</h1>
-    {% if page.subtitle %}<p class="entry-subtitle">{{ page.subtitle }}</p>{% endif %}
+    {% if page.subtitle %}<h2 class="entry-subtitle">{{ page.subtitle }}</h2>{% endif %}
     <div class="entry-meta">{{ page.date_html }}</div>
     <div class="entry-social header">{% include theme:social/post-header.html %}</div>
     {% yield header %}
@@ -18,17 +18,17 @@ layout: theme:default
   <div class="entry-content">{{ content }}</div>
 
   <footer class='entry-footer' role='contentinfo'>
-    <p class="entry-meta">
+    <div class="entry-meta">
       {% yield footer %}
       {% assign author = page.author || site.author %}
       {% if author %}
-        <div class='author-credit'>Written by: {{ author }}</div>
+        <span class='author-credit'>Written by {{ author }}</span> &mdash; 
       {% endif %}
-      <div class='posted-date'>Published: {{ page.date_time_html }}</div>
-      {% if page.categories %} 
-        <div class="categories">Categories: {{ page.categories | category_links }}</div>
+      <span class='posted-date'>{{ page.date_time_html }}</span>
+      {% if page.categories.size > 0 %} 
+        &mdash; <span class="categories">{{ page.categories | category_links }}</span>
       {% endif %}
-    </p>
+    </div>
     <div class="entry-social footer">{% include theme:social/post-footer.html %}</div>
   </footer>
 </article>

data/assets/stylesheets/_entry.scss

@@ -1,8 +1,16 @@
 .entry {
-  margin: { top: 4em; bottom: 4em; }
+  margin: { top: 4rem; bottom: 4rem; }
   + .entry {
-    border-top: 1px solid $page-border;
-    padding-top: 2em;
+    padding-top: 2rem;
+    &:before {
+      content: "";
+      display: block;
+      max-width: $main-content-max - ($content-pad * 2);
+      border-top: 1px solid $page-border;
+      margin: 0 auto;
+      position: relative;
+      top: -2rem;
+    }
   }
 }
 
@@ -63,23 +71,24 @@
     padding: { top: 10%; bottom: 10%; }
   }
 
-  &.light-title {
-    .entry-header, .entry-meta {
-      color: #fff;
-      text-shadow: rgba(#000, .5) 0 1px 1px;
-    }
-    .entry-header {
-      position: relative;
-      &:after {
-        content: "";
-        position: absolute;
-        z-index: 0;
-        left: 0;
-        top: 0;
-        bottom: 0;
-        right: 0;
-        background: rgba(#000, .08);
-      }
+}
+
+.light-title {
+  .entry-header, .entry-header .entry-meta {
+    color: #fff;
+    text-shadow: rgba(#000, .5) 0 1px 1px;
+  }
+  .entry-header {
+    position: relative;
+    &:after {
+      content: "";
+      position: absolute;
+      z-index: 0;
+      left: 0;
+      top: 0;
+      bottom: 0;
+      right: 0;
+      background: rgba(#000, .08);
     }
   }
 }

data/assets/stylesheets/_layout.scss

@@ -56,11 +56,12 @@ html, body, .site {
   }
 }
 
+.limit-width,
 .entry-title,
-.entry-meta,
 .entry-subtitle,
 .entry-social,
 .entry-content, 
+header .entry-meta,
 .post-nav,
 .entry-footer {
   max-width: $main-content-max;

data/assets/stylesheets/_sizes.scss

@@ -8,7 +8,7 @@ $max: 1080px;
 
 // Item widths
 $main-sidebar-width: 300px;
-$main-content-max: 900px;
+$main-content-max: 800px;
 $content-pad: 20px;
 
 $h-pad-box: 5%, 40px;

data/assets/stylesheets/_typography.scss

@@ -80,11 +80,6 @@ blockquote {
 hr {
   border: none;
   background: none;
-  width: 100%;
+  margin: 2.65rem auto;
   border-bottom: 1px solid $page-border;
-  &.dark {
-    border-bottom: 1px solid $gray;
-  }
-  &.thick {
-  }
 }

data/assets/stylesheets/index.scss

@@ -1,6 +1,8 @@
+---
+---
 // Theme settings
 
-$center-headings: {{ theme.center-headings }};
+$center-headings: {{ theme.center_headings }};
 
 // Stylesheets
 @import "colors";

data/assets/{pages/archive.html → templates/post_archive.html}

@@ -1,9 +1,8 @@
 ---
 title: Archive
 layout: theme:default
-permalink: /archive/
 ---
-<div class="post-archive">
+<div class="post-archive limit-width">
   {% for post in site.posts reverse %}
     {% assign post_year = post.date | date: "%Y" %}
     {% if post_year != current_year %}
@@ -16,7 +15,3 @@ permalink: /archive/
   {% endfor %}
   </div>
 </div>
-
-
-
-

data/assets/templates/post_index.html

@@ -0,0 +1,9 @@
+---
+layout: theme:default
+paginate: true
+---
+<div class="post-index">
+  {% for post in paginator.posts %}
+    {% include theme:index-post.html %}
+  {% endfor %}
+</div>

data/lib/{octopress-genesis → octopress-genesis-theme}/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Genesis
-    VERSION = "0.0.3"
+    VERSION = "0.0.5"
   end
 end

data/lib/octopress-genesis-theme.rb

@@ -0,0 +1,23 @@
+require 'octopress-ink'
+require 'octopress-linkblog'
+require 'octopress-autoprefixer'
+require 'octopress-date-format'
+require 'octopress-comment-tag'
+require 'octopress-wrap-tag'
+require 'octopress-assign-tag'
+require 'octopress-return-tag'
+require 'octopress-include-tag'
+require 'octopress-content-for'
+require 'octopress-filter-tag'
+require 'octopress-paginate'
+
+require 'octopress-genesis-theme/version'
+
+Octopress::Ink.add_theme({
+  name:          "Octopress Genesis Theme",
+  gem:           "octopress-genesis-theme",
+  path:          File.expand_path(File.join(File.dirname(__FILE__), "../")),
+  version:       Octopress::Genesis::VERSION,
+  source_url:    "https://github.com/octopress/genesis-theme",
+  description:   "A minimalist theme for Jekyll sites build on Octopress Ink"
+})