Merge branch 'jekyll-and-zurb' into devel

Conflicts: _config.yml _layouts/default.html index.html
evansosenko · Dec 29, 2013 · 055fbab · 055fbab
2 parents 27323f4 + 655e52e
commit 055fbab
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/_config.dev.yml b/_config.dev.yml
@@ -1,4 +1,4 @@
-root_url: null
+baseurl: null
 
 assets:
   baseurl: /assets/

diff --git a/_config.testing.yml b/_config.testing.yml
@@ -1,4 +1,4 @@
-root_url: null
+baseurl: null
 
 assets:
   baseurl: /assets/

diff --git a/_config.yml b/_config.yml
@@ -1,7 +1,7 @@
 # Jekyll options.
 name: Evan Sosenko
 domain: http://evansosenko.com
-root_url: http://evansosenko.com
+baseurl: http://evansosenko.com
 cdn_domain: http://razor-x.github.io
 markdown: redcarpet
 pygments: true

diff --git a/_includes/pagination.html b/_includes/pagination.html
@@ -2,7 +2,7 @@
   <nav>
     <ul class="pagination">
       {% if paginator.previous_page %}
-        <li class="arrow"><a href="{{ site.root_url }}{{ paginator.previous_page_path }}">&laquo;</a></li>
+        <li class="arrow"><a href="{{ site.baseurl }}{{ paginator.previous_page_path }}">&laquo;</a></li>
       {% else %}
         <li class="arrow unavailable"><a>&laquo;</a></li>
       {% endif %}
@@ -13,12 +13,12 @@
         {% elsif page == 1 %}
           <li><a href="/">{{ page }}</a></li>
         {% else %}
-          <li><a href="{{ site.root_url }}{{ site.paginate_path | replace: ':num', page }}">{{ page }}</a></li>
+          <li><a href="{{ site.baseurl }}{{ site.paginate_path | replace: ':num', page }}">{{ page }}</a></li>
         {% endif %}
       {% endfor %}
 
       {% if paginator.next_page %}
-        <li class="arrow"><a href="{{ site.root_url }}{{ paginator.next_page_path }}">&raquo;</a></li>
+        <li class="arrow"><a href="{{ site.baseurl }}{{ paginator.next_page_path }}">&raquo;</a></li>
       {% else %}
         <li class="arrow unavailable"><a>&raquo;</a></li>
       {% endif %}

diff --git a/_includes/personal_links.html b/_includes/personal_links.html
@@ -6,6 +6,6 @@
     <li><a class="icon {{ item.icon }}" href="{{ item.url }}"></a></li>
   {% endfor %}
     <li><a href="" data-reveal-id="email_modal">@</a></li>
-    <li><a href="{{ site.root_url }}/cv/">CV</a></li>
+    <li><a href="{{ site.baseurl }}/cv/">CV</a></li>
   </ul>
 </nav>
diff --git a/_includes/social_buttons.html b/_includes/social_buttons.html
@@ -1,6 +1,6 @@
 <aside class="social-buttons">
 {% if site.social.facebook.enabled %}
-  <div class="fb-like" data-href="{{ site.root_url }}{{ page.url }}" data-width="450" data-layout="button_count" data-show-faces="false" data-send="false"></div>
+  <div class="fb-like" data-href="{{ site.baseurl }}{{ page.url }}" data-width="450" data-layout="button_count" data-show-faces="false" data-send="false"></div>
 {% endif %}
 
 {% if site.social.google.enabled %}

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -15,7 +15,7 @@
 
 <body>
   <header id="top">
-    <h1 id="banner"><a id="title" href="{{ site.root_url }}/">Evan <span></span> Sosenko</a></h1>
+    <h1 id="banner"><a id="title" href="{{ site.baseurl }}/">Evan <span></span> Sosenko</a></h1>
     {% if page.personal_links %}
       {% include personal_links.html %}
     {% endif %}

diff --git a/_plugins/tag-picture.rb b/_plugins/tag-picture.rb
@@ -41,7 +41,7 @@ def render(context)
 
       # Gather settings
       site = context.registers[:site]
-      root_url = site.config['root_url']
+      baseurl = site.config['baseurl']
       settings = site.config['picture']
       markup = /^(?:(?<preset>[^\s.:\/]+)\s+)?(?<image_src>[^\s]+\.[a-zA-Z0-9]{3,4})\s*(?<source_src>(?:(source_[^\s.:\/]+:\s+[^\s]+\.[a-zA-Z0-9]{3,4})\s*)+)?(?<html_attr>[\s\S]+)?$/.match(render_markup)
       preset = settings['presets'][ markup[:preset] ] || settings['presets']['default']
@@ -154,14 +154,14 @@ def render(context)
         # Reference: https://github.com/scottjehl/picturefill/issues/79
         source_keys.reverse.each { |source|
           media = " data-media=\"#{instance[source]['media']}\"" unless source == 'source_default'
-          source_tags += "<span data-src=\"#{root_url}#{instance[source][:generated_src]}\"#{media}></span>\n"
+          source_tags += "<span data-src=\"#{baseurl}#{instance[source][:generated_src]}\"#{media}></span>\n"
         }
 
         # Note: we can't indent html output because markdown parsers will turn 4 spaces into code blocks
         picture_tag = "<span #{html_attr_string}>\n"\
                       "#{source_tags}"\
                       "<noscript>\n"\
-                      "<img src=\"#{root_url}#{instance['source_default'][:generated_src]}\" alt=\"#{html_attr['data-alt']}\" />\n"\
+                      "<img src=\"#{baseurl}#{instance['source_default'][:generated_src]}\" alt=\"#{html_attr['data-alt']}\" />\n"\
                       "</noscript>\n"\
                       "</span>\n"
 
@@ -170,9 +170,9 @@ def render(context)
         source_tags = ''
         source_keys.each { |source|
           if source == 'source_default'
-            source_tags += "<img src=\"#{root_url}#{instance[source][:generated_src]}\" alt=\"#{html_attr['alt']}\" />\n"
+            source_tags += "<img src=\"#{baseurl}#{instance[source][:generated_src]}\" alt=\"#{html_attr['alt']}\" />\n"
           else
-            source_tags += "<source src=\"#{root_url}#{instance[source][:generated_src]}\" media=\"#{instance[source]['media']}\" />\n"
+            source_tags += "<source src=\"#{baseurl}#{instance[source][:generated_src]}\" media=\"#{instance[source]['media']}\" />\n"
           end
         }
 
@@ -186,10 +186,10 @@ def render(context)
 
         interchange_data = Array.new
         source_keys.reverse.each do |source|
-          interchange_data << "[#{root_url}#{instance[source][:generated_src]}, #{source == 'source_default' ? '(default)' : instance[source]['media']}]"
+          interchange_data << "[#{baseurl}#{instance[source][:generated_src]}, #{source == 'source_default' ? '(default)' : instance[source]['media']}]"
         end
 
-        picture_tag = %Q{<img src="#{root_url}#{instance['source_default'][:generated_src]}" data-interchange="#{interchange_data.join ', '}" #{html_attr_string} />}
+        picture_tag = %Q{<img src="#{baseurl}#{instance['source_default'][:generated_src]}" data-interchange="#{interchange_data.join ', '}" #{html_attr_string} />}
       end
 
         # Return the markup!

diff --git a/index.html b/index.html
@@ -14,7 +14,7 @@
   <h2>posts and such</h2>
   <ul class="posts">
   {% for post in posts %}
-    <li><a href="{{ site.root_url }}{{ post.url }}">{{ post.title }}</a></li>
+    <li><a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a></li>
   {% endfor %}
   </ul>
 </section>