diff options
author | Brandon Mathis <brandon@imathis.com> | 2011-06-07 10:45:01 -0400 |
---|---|---|
committer | Brandon Mathis <brandon@imathis.com> | 2011-06-07 10:45:01 -0400 |
commit | d8b796acb9275e74324c3ea04324314ecbe1b664 (patch) | |
tree | 475d78d3b5ee9f5bba1bf8147e8368aa9278e4fa /source/_includes | |
parent | 8698a276f937cb1cd6f67f7f213e2ea438500d7e (diff) | |
download | my_new_personal_website-d8b796acb9275e74324c3ea04324314ecbe1b664.tar.xz my_new_personal_website-d8b796acb9275e74324c3ea04324314ecbe1b664.zip |
Another massive commit:
1. Major improvements to the responsive styling.
2. Toggleable sidebar
3. Upgraded to modernizr 2.0 which includes Respond.js
4. IE7-9 testing and fixes
5. New theming system which should make forkers happy
6. New rake task for installing Octopress themes
7. Magic
Diffstat (limited to 'source/_includes')
-rw-r--r-- | source/_includes/article.html | 30 | ||||
-rw-r--r-- | source/_includes/delicious.html | 3 | ||||
-rw-r--r-- | source/_includes/disqus_thread.html | 7 | ||||
-rw-r--r-- | source/_includes/footer.html | 11 | ||||
-rw-r--r-- | source/_includes/google_analytics.html | 12 | ||||
-rw-r--r-- | source/_includes/head.html | 40 | ||||
-rw-r--r-- | source/_includes/header.html | 1 | ||||
-rw-r--r-- | source/_includes/navigation.html | 11 | ||||
-rw-r--r-- | source/_includes/pinboard.html | 3 | ||||
-rw-r--r-- | source/_includes/sidebar.html | 26 | ||||
-rw-r--r-- | source/_includes/twitter.html | 13 |
11 files changed, 0 insertions, 157 deletions
diff --git a/source/_includes/article.html b/source/_includes/article.html deleted file mode 100644 index 3481cf21..00000000 --- a/source/_includes/article.html +++ /dev/null @@ -1,30 +0,0 @@ -<header> - {% if index %} - <h1><a href="{{ page.url }}">{{ page.title }}</a></h1> - {% else %} - <h1>{{ page.title }}</h1> - {% endif %} - {% unless page.nometa %} - {% if page.author %} - {% assign author = page.author %} - {% else %} - {% assign author = site.author %} - {% endif %} - <p> - {% if author %} - <span class="byline author vcard">By <span class="fn">{{ author }}</span></span> - {% endif %} - {% if page.date %} - <time datetime="{{ page.date | datetime }}" pubdate>{{ page.date | ordinalize }}</time> - {% endif %} - {% if page.updated %} - <time class="updated" datetime="{{ page.updated | datetime }}" pubdate>Updated {{ page.updated | ordinalize }}</time> - {% endif %} - </p> - {% endunless %} -</header> -{% if index %} -<div class="entry">{{ content | exerpt(content, page.url, 'Continue reading »') | smart_quotes }}</div> -{% else %} -<div class="entry">{{ content | smart_quotes }}</div> -{% endif %} diff --git a/source/_includes/delicious.html b/source/_includes/delicious.html deleted file mode 100644 index 02b9e6bd..00000000 --- a/source/_includes/delicious.html +++ /dev/null @@ -1,3 +0,0 @@ -<h1>On Delicious</h1> -<script type="text/javascript" src="http://feeds.delicious.com/v2/js/{{ site.delicious_user }}?title=&count={{ site.delicious_count }}&sort=date&extended"></script> -<p><a href="http://delicious.com/{{ site.delicious_user }}">My Delicious Bookmarks »</a></p> diff --git a/source/_includes/disqus_thread.html b/source/_includes/disqus_thread.html deleted file mode 100644 index 036b9d7b..00000000 --- a/source/_includes/disqus_thread.html +++ /dev/null @@ -1,7 +0,0 @@ -<script type="text/javascript"> - var disqus_url = "{{ site.url }}{{ page.url }}"; -</script> -<noscript> - <a href="http://{{ site.disqus_short_name }}.disqus.com/?url=ref">View the discussion thread</a> -</noscript> -<script type="text/javascript" src="http://disqus.com/forums/{{ site.disqus_short_name }}/embed.js"></script> diff --git a/source/_includes/footer.html b/source/_includes/footer.html deleted file mode 100644 index 5b40083e..00000000 --- a/source/_includes/footer.html +++ /dev/null @@ -1,11 +0,0 @@ -<p> - Copyright © {{ site.time | date: "%Y" }} - {{ site.author }} - - <span class="credit">Powered by <a href="http://octopress.org">Octopress</a></span> -</p> -{% if site.pinboard_user %} - <script language="javascript" src="/javascripts/pinboard.js"></script> - <script language="javascript"> - var linkroll = 'pinboard_linkroll'; //id target for pinboard list - pinboardNS_fetch_script("http://feeds.pinboard.in/json/v1/u:{{ site.pinboard_user }}/?cb=pinboardNS_show_bmarks\&count={{ site.pinboard_count }}"); - </script> -{% endif %} diff --git a/source/_includes/google_analytics.html b/source/_includes/google_analytics.html deleted file mode 100644 index b659a634..00000000 --- a/source/_includes/google_analytics.html +++ /dev/null @@ -1,12 +0,0 @@ -<script src="http://www.google-analytics.com/ga.js" type="text/javascript"></script> -<script type="text/javascript"> - var _gaq = _gaq || []; - _gaq.push(['_setAccount', '#{page.google_analytics_tracking_id}']); - _gaq.push(['_trackPageview']); - - (function() { - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga); - })(); -</script> diff --git a/source/_includes/head.html b/source/_includes/head.html deleted file mode 100644 index b311ca69..00000000 --- a/source/_includes/head.html +++ /dev/null @@ -1,40 +0,0 @@ -<!DOCTYPE html> -<!--[if IEMobile 7 ]><html class="no-js iem7" manifest="default.appcache?v=1"><![endif]--> -<!--[if lt IE 7 ]><html class="no-js ie6" lang="en"><![endif]--> -<!--[if IE 7 ]><html class="no-js ie7" lang="en"><![endif]--> -<!--[if IE 8 ]><html class="no-js ie8" lang="en"><![endif]--> -<!--[if (gte IE 9)|(gt IEMobile 7)|!(IEMobile)|!(IE)]><!--><html class="no-js" manifest="default.appcache?v=1" lang="en"><!--<![endif]--> -<head> - <meta charset="utf-8"> - {% if page.title %} - <title>{{site.title}}: {{page.title}}{% if site.author %} - {{ site.author }}{% endif %}</title> - {% else %} - <title>{{site.title}}{% if site.author %} - {{ site.author }}{% endif %}</title> - {% endif %} - <meta name="author" content="{{site.author}}"> - {% if page.description %} - <meta name="description" content="{{page.description}}"/> - {% endif %} - - <!-- http://t.co/dKP3o1e --> - <meta name="HandheldFriendly" content="True"> - <meta name="MobileOptimized" content="320"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - - {% if page.keywords %} - <meta name="keywords" content="{{page.keywords}}"/> - {% endif %} - - <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css"> - <!--<script src="/javascripts/octopress.js" type="text/javascript"></script>--> - <script src="/javascripts/libs/modernizr-1.7.js"></script> - <script src="/javascripts/libs/ios-viewport-scaling-bug-fix.js"></script> - <script src="/javascripts/libs/json2.js"></script> - <script src="/javascripts/libs/jXHR.js"></script> - <script src="/javascripts/libs/ender.js"></script> - <script src="/javascripts/syntax-helper.js"></script> - {% if site.google_analytics_tracking_id %} - {% include google_analytics.html %} - {% endif %} - <link href="/atom.xml" rel="alternate" title="{{site.title}}" type="application/atom+xml"/> -</head> diff --git a/source/_includes/header.html b/source/_includes/header.html deleted file mode 100644 index 4e0519e6..00000000 --- a/source/_includes/header.html +++ /dev/null @@ -1 +0,0 @@ -<h1><a href="/">{{ site.title }}</a></h1> diff --git a/source/_includes/navigation.html b/source/_includes/navigation.html deleted file mode 100644 index 23f594eb..00000000 --- a/source/_includes/navigation.html +++ /dev/null @@ -1,11 +0,0 @@ -<div> - <a href="/atom.xml">Subscribe</a> - <form action="{{ site.simple_search }}" method="get"> - <input class="search" type="text" name="q" results="0" placeholder="Search"/> - <input type="hidden" name="q" value="site:{{ site.url | search_url }}" /> - </form> -</div> -<ul> - <li><a href="/">Blog</a></li> - <li><a href="/about/">About</a></li> -</ul> diff --git a/source/_includes/pinboard.html b/source/_includes/pinboard.html deleted file mode 100644 index 3cd269d0..00000000 --- a/source/_includes/pinboard.html +++ /dev/null @@ -1,3 +0,0 @@ -<h1>My Pinboard</h1> -<ul id="pinboard_linkroll">Fetching linkroll...</ul> -<p><a href="http://pinboard.in/u:{{ site.pinboard_user }}">My Pinboard Bookmarks »</a></p> diff --git a/source/_includes/sidebar.html b/source/_includes/sidebar.html deleted file mode 100644 index 03890462..00000000 --- a/source/_includes/sidebar.html +++ /dev/null @@ -1,26 +0,0 @@ -<section> - <h1>About Me</h1> - <p>Hi, I'm Octopress!</p> -</section> -{% if page.single and site.recent_posts %} -<section> - <h1>Recent Posts</h1> - <ul id="recent_posts"> - {% for post in site.posts limit: site.recent_posts %} - <li class="post"> - <a href="{{ post.url }}">{{ post.title }}</a> - </li> - {% endfor %} - </ul> - </section> -{% endif %} -{% if site.twitter_user %} - <section>{% include twitter.html %}</section> -{% endif %} -{% if site.delicious_user %} - <section>{% include delicious.html %}</section> -{% endif %} -{% if site.pinboard_user %} - <section>{% include pinboard.html %}</section> -{% endif %} - diff --git a/source/_includes/twitter.html b/source/_includes/twitter.html deleted file mode 100644 index 81f2cebd..00000000 --- a/source/_includes/twitter.html +++ /dev/null @@ -1,13 +0,0 @@ -<h1>Latest Tweets</h1> -<ul id="tweets"> - Status updating... -</ul> -<p>Follow <a href="http://twitter.com/{{site.twitter_user}}">@{{ site.twitter_user }}</a></p> -{% if site.twitter_user %} - <script> - var twitter_user = "{{site.twitter_user}}"; - var show_replies = {{site.show_replies}}; - var tweet_count = {{site.tweet_count}}; - </script> - <script src="/javascripts/twitter.js" type="text/javascript"></script> -{% endif %} |