aboutsummaryrefslogtreecommitdiff
path: root/source/_layouts
diff options
context:
space:
mode:
authorBrandon Mathis <brandon@imathis.com>2011-05-15 18:33:00 -0400
committerBrandon Mathis <brandon@imathis.com>2011-05-15 18:33:00 -0400
commitc7d5365f81552cae16bbb91696ca3e67b4a0a2e9 (patch)
tree76c57e41828a3492535cde7fe82bef98ccea0eb4 /source/_layouts
parente4c2d5790bac6a74037638fde049c374fc44cc7b (diff)
downloadmy_new_personal_website-c7d5365f81552cae16bbb91696ca3e67b4a0a2e9.tar.xz
my_new_personal_website-c7d5365f81552cae16bbb91696ca3e67b4a0a2e9.zip
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
Diffstat (limited to 'source/_layouts')
-rw-r--r--source/_layouts/default.html23
-rw-r--r--source/_layouts/page.html10
2 files changed, 27 insertions, 6 deletions
diff --git a/source/_layouts/default.html b/source/_layouts/default.html
index 553c1bec..f69043b7 100644
--- a/source/_layouts/default.html
+++ b/source/_layouts/default.html
@@ -1,15 +1,26 @@
<!DOCTYPE html>
-<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]-->
{% include head.html %}
-<body id="{{ page.body_id }}">
+<body {% if page.body_id %} id="{{ page.body_id }}" {% endif %} {% if page.no_sidebar %} class="no-sidebar" {% endif %}>
<header><div>{% include header.html %}</div></header>
- <nav id="nav"><div>{% include navigation.html %}</div></nav>
- <div id="page">
+ <nav><div>{% include navigation.html %}</div></nav>
+ <div>
<div>
- <div id="main"><article>{{ content }}</article></div>
- <aside>{% include sidebar.html %}</aside>
+ <div id="articles">{{ content }}</div>
+ {% unless page.no_sidebar %}
+ <aside>{% include sidebar.html %}</aside>
+ {% endunless %}
</div>
</div>
<footer><div>{% include footer.html %}</div></footer>
+ <!--[if (lt IE 9) & (!IEMobile)]>
+ <script src="javascripts/libs/DOMAssistantCompressed-2.8.js"></script>
+ <script src="javascripts/libs/selectivizr-1.0.1.js"></script>
+ <script src="javascripts/libs/respond.min.js"></script>
+ <![endif]-->
</body>
</html>
diff --git a/source/_layouts/page.html b/source/_layouts/page.html
new file mode 100644
index 00000000..3b568349
--- /dev/null
+++ b/source/_layouts/page.html
@@ -0,0 +1,10 @@
+---
+layout: default
+---
+
+<article>
+ {% include article.html %}
+ {% if site.disqus_short_name %}
+ <div id="disqus_thread">{% include disqus_thread.html %}</div>
+ {% endif %}
+</article>