abstract some things

benbalter · Dec 21, 2017 · f1a9433 · f1a9433
1 parent 64ffb50
commit f1a9433
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -9,35 +9,13 @@
 
 ## Installation
 
-1. Add this line to your Jekyll site’s Gemfile:
-
-   ```ruby
-   gem "retlab"
-   ```
-
-2. And add this line to your Jekyll site:
+1. Add this line to your site's configuration:
 
    ```yaml
-   theme: retlab
-   ```
-
-3. Run `bundle`
-4. Create a file `assets/css/style.scss` with the following content:
-
-   ```scss
-   ---
-   ---
-
-   $url_base: "{{ site.github.url }}";
-   @import "retlab";
+   remote_theme: benbalter/retlab
    ```
 
-5. Save a header image to `/assets/img/header.png`. It should be 400px by 1140px.
-6. (Optional) install Font Awesome (icons) and Anchor JS (header links) dependencies with the following commands:
-
-   npm install -g bower
-   bower install font-awesome anchor-js —config.directory=assets/vendor
-
+2. Save a header image to `/assets/img/header.png`. It should be 400px by 1140px.
 
 ## Configuration
 
@@ -48,7 +26,6 @@ title: Ben Balter
 description: Attorney, open source developer, product manager
 
 lang: en-US
-branch: master
 
 # Pages to include in header navigation
 nav_pages:
@@ -58,6 +35,11 @@ nav_pages:
   - about.md
   - contact.md
 
+# Pages to include in footer navigation
+footer_page:
+  - books.md
+  - fine-print.md
+
 # Disqus login information, for comments
 disqus:
   shortname: DISQUS_USERNAME
@@ -89,7 +71,7 @@ defaults:
       comments: false
 
 # Plugins
-gems:
+plugins:
   - jekyll-seo-tag
   - jekyll-avatar
   - jekyll-github-metadata

diff --git a/_includes/contact-links.html b/_includes/contact-links.html
@@ -11,5 +11,5 @@
 
 <p class="pgp-key center">
   <a href="{{ "key.asc" | absolute_url }}">PGP:
-  <code>07C6 73FB F30E 01C0 C342 7AB8 DBB6 7C24 6AD3 56C4</code></a>
+  <code>{{ site.pgp_key }}</code></a>
 </p>
diff --git a/_includes/improve.html b/_includes/improve.html
@@ -1,6 +1,6 @@
 <div class="row improve-article-wrapper">
   <div class="col-sm-4 col-sm-offset-1">
-     <a class="btn btn-primary btn-lg" href="{{ site.github.repository_url }}/edit/{{ site.branch }}/{{ page.path }}" title="Help improve article {{ page.path }}">Edit</a>
+     <a class="btn btn-primary btn-lg" href="{% github_edit_link %}" title="Help improve article {{ page.path }}">Edit</a>
    </div>
    <div class="col-sm-6 col-sm-offset-1">
    <p class="improve-article">This content is open source. <br />

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link type="text/plain" rel="author" href="{{ site.github.url }}/humans.txt" />
+    <link type="text/plain" rel="author" href="{{ "humans.txt" | absolute_url }}" />
     <link rel="shortcut icon" href="{{ "/favicon.ico?v=" | append: site.github.build_revision | relative_url }}">
     <link href="{{ "/assets/css/style.css?v=" | append: site.github.build_revision | relative_url }}" rel="stylesheet" media="screen">
 
@@ -42,12 +42,12 @@
       	{% endif %}
       		<div class="fine-print">
             <ul>
-              <li>
-                <a href="{{ "/books-for-geeks/" | relative_url }}">Recomended Reading</a>
-              </li>
-              <li>
-                <a href="{{ "/fine-print/" | relative_url }}">Fine Print</a>
-              </li>
+              {% for path in site.footer_pages %}
+                {% assign footer_page=site.pages | where:"path",path | first %}
+                <li>
+                  <a href="{{ page.url | relative_url }}">{{ page.title }}</a>
+                </li>
+              {% endfor %}
               <li>
                 <a href="{{ "/feed.xml" | relative_url }}" aria-label="Atom Feed"><i class="fa fa-rss"></i></a>
               </li>
@@ -57,9 +57,9 @@
       </div>
     </div><!--/.container-->
 
-    <script src="{{ "/assets/js/bundle.js" | relative_url }}"></script>
+    <script src="{{ "/assets/js/bundle.js?=" | append: site.github.build_revision | relative_url }}"></script>
     <script src="https://platform.twitter.com/oct.js" type="text/javascript"></script>
-    <script type="text/javascript">twttr.conversion.trackPid('l6bfl', { tw_sale_amount: 0, tw_order_quantity: 0 });</script>
+    <script type="text/javascript">twttr.conversion.trackPid('{{ site.twitter.property_id }}', { tw_sale_amount: 0, tw_order_quantity: 0 });</script>
 
   </body>
 </html>