From c7d5365f81552cae16bbb91696ca3e67b4a0a2e9 Mon Sep 17 00:00:00 2001 From: Brandon Mathis Date: Sun, 15 May 2011 18:33:00 -0400 Subject: major refactoring, improved file watching, changed site to public to support rack via pow (http://pow.cx) also implemented the basics of a 320 and up design refresh on the classic theme. This should make it great for mobile reading --- source/_includes/article.html | 15 +- source/_includes/delicious.html | 2 +- source/_includes/head.html | 27 +- source/_includes/header.html | 9 - source/_includes/navigation.html | 8 +- source/_includes/pinboard.html | 2 +- source/_includes/sidebar.html | 8 +- source/_includes/twitter.html | 12 +- source/_layouts/default.html | 23 +- source/_layouts/page.html | 10 + source/about.haml | 6 +- source/images/rss.png | Bin 6905 -> 504 bytes source/images/search.png | Bin 0 -> 333 bytes source/images/search_bg.png | Bin 1058 -> 0 bytes .../javascripts/libs/DOMAssistantCompressed-2.8.js | 4 + .../libs/ios-viewport-scaling-bug-fix.js | 20 + source/javascripts/libs/modernizr-1.7.min.js | 2 + source/javascripts/libs/respond.js | 8 + source/javascripts/libs/selectivizr-min.js | 5 + source/javascripts/mootools-1.2.4.2-more.js | 100 - source/javascripts/mootools-more-1.3.1.1.js | 1322 ----- source/javascripts/mootools-yui-compressed.js | 5492 -------------------- source/javascripts/octopress.js | 76 - source/javascripts/pinboard.js | 2 +- source/javascripts/twitter.js | 108 +- source/sass/screen.scss | 17 - source/sass/themes/classic/_partials.scss | 13 - source/sass/themes/classic/_style.scss | 4 - source/sass/themes/classic/core/_layout.scss | 91 - source/sass/themes/classic/core/_theme.scss | 45 - source/sass/themes/classic/core/_typography.scss | 159 - source/sass/themes/classic/partials/_blog.scss | 23 - source/sass/themes/classic/partials/_footer.scss | 11 - source/sass/themes/classic/partials/_header.scss | 11 - .../sass/themes/classic/partials/_navigation.scss | 30 - source/sass/themes/classic/partials/_page.scss | 8 - source/sass/themes/classic/partials/_search.scss | 19 - source/sass/themes/classic/partials/_shared.scss | 12 - source/sass/themes/classic/partials/_sidebar.scss | 38 - source/sass/themes/classic/partials/_syntax.scss | 279 - source/sass/themes/classic/partials/_twitter.scss | 15 - source/test/typography.haml | 11 +- 42 files changed, 185 insertions(+), 7862 deletions(-) create mode 100644 source/_layouts/page.html create mode 100644 source/images/search.png delete mode 100644 source/images/search_bg.png create mode 100644 source/javascripts/libs/DOMAssistantCompressed-2.8.js create mode 100644 source/javascripts/libs/ios-viewport-scaling-bug-fix.js create mode 100644 source/javascripts/libs/modernizr-1.7.min.js create mode 100644 source/javascripts/libs/respond.js create mode 100755 source/javascripts/libs/selectivizr-min.js delete mode 100644 source/javascripts/mootools-1.2.4.2-more.js delete mode 100644 source/javascripts/mootools-more-1.3.1.1.js delete mode 100644 source/javascripts/mootools-yui-compressed.js delete mode 100644 source/sass/screen.scss delete mode 100644 source/sass/themes/classic/_partials.scss delete mode 100644 source/sass/themes/classic/_style.scss delete mode 100644 source/sass/themes/classic/core/_layout.scss delete mode 100644 source/sass/themes/classic/core/_theme.scss delete mode 100644 source/sass/themes/classic/core/_typography.scss delete mode 100644 source/sass/themes/classic/partials/_blog.scss delete mode 100644 source/sass/themes/classic/partials/_footer.scss delete mode 100644 source/sass/themes/classic/partials/_header.scss delete mode 100644 source/sass/themes/classic/partials/_navigation.scss delete mode 100644 source/sass/themes/classic/partials/_page.scss delete mode 100644 source/sass/themes/classic/partials/_search.scss delete mode 100644 source/sass/themes/classic/partials/_shared.scss delete mode 100644 source/sass/themes/classic/partials/_sidebar.scss delete mode 100644 source/sass/themes/classic/partials/_syntax.scss delete mode 100644 source/sass/themes/classic/partials/_twitter.scss (limited to 'source') diff --git a/source/_includes/article.html b/source/_includes/article.html index aa7f8194..92f06720 100644 --- a/source/_includes/article.html +++ b/source/_includes/article.html @@ -1,18 +1,21 @@
+

{{ page.title }}

- {% if site.author or site.author == page.author %} - + {% elsif page.author %} - + + {% endif %} + {% if page.date %} + + {% endif %} + {% if page.updated %} + {% endif %}

-

{{ page.title }}

{% if index %}
{{ content | exerpt(content, page.url, 'Continue reading »') | smart_quotes }}
{% else %}
{{ content | smart_quotes }}
{% endif %} - -{% if page.updated %}

updated

{% endif %} diff --git a/source/_includes/delicious.html b/source/_includes/delicious.html index 8e97b0fd..02b9e6bd 100644 --- a/source/_includes/delicious.html +++ b/source/_includes/delicious.html @@ -1,3 +1,3 @@ -

On Delicious

+

On Delicious

My Delicious Bookmarks »

diff --git a/source/_includes/head.html b/source/_includes/head.html index 4a3fb31c..1d3329ba 100644 --- a/source/_includes/head.html +++ b/source/_includes/head.html @@ -1,26 +1,25 @@ + + {{page.title}} - {{site.title}} - + {% if page.description %} {% endif %} + + + + + + {% if page.keywords %} {% endif %} + - - - - - - {% if site.twitter_user %} - - - {% endif %} + + + {% if site.google_analytics_tracking_id %} {% include google_analytics.html %} {% endif %} diff --git a/source/_includes/header.html b/source/_includes/header.html index 4c35d0b8..4e0519e6 100644 --- a/source/_includes/header.html +++ b/source/_includes/header.html @@ -1,10 +1 @@

{{ site.title }}

-{% if site.google_custom_search_id && site.google_custom_search_id %} - -{% endif %} diff --git a/source/_includes/navigation.html b/source/_includes/navigation.html index 97d95938..23f594eb 100644 --- a/source/_includes/navigation.html +++ b/source/_includes/navigation.html @@ -1,5 +1,11 @@ +
+ Subscribe +
+ + +
+
diff --git a/source/_includes/pinboard.html b/source/_includes/pinboard.html index 602645c5..3cd269d0 100644 --- a/source/_includes/pinboard.html +++ b/source/_includes/pinboard.html @@ -1,3 +1,3 @@ -

My Pinboard

+

My Pinboard

My Pinboard Bookmarks »

diff --git a/source/_includes/sidebar.html b/source/_includes/sidebar.html index 86f659b5..c5e3bd01 100644 --- a/source/_includes/sidebar.html +++ b/source/_includes/sidebar.html @@ -1,8 +1,10 @@ -

About Me

-

Yo everybody!

+
+

About Me

+

Hi, I'm Octopress!

+
{% if site.recent_posts %}
-

Recent Posts

+

Recent Posts