Permalink
Browse files

Tweak styles and DRY it up.

  • Loading branch information...
1 parent 9ae06bd commit 19f0e27af7a203101a058064b735452117c8b59a @rsese committed Mar 10, 2013
Showing with 59 additions and 147 deletions.
  1. +22 −0 _includes/head.html
  2. +7 −0 _includes/nav.html
  3. +7 −0 _includes/posts.html
  4. +2 −30 _layouts/default.html
  5. +2 −30 _layouts/home.html
  6. +2 −30 _layouts/post.html
  7. +15 −30 assets/css/master.css
  8. +1 −7 blog.html
  9. +1 −20 index.html
View
@@ -0,0 +1,22 @@
+<head>
+ <title>{{ page.title }}</title>
+ <link rel="stylesheet" media="screen" href="/assets/css/master.css"/>
+
+ <!-- enable HTML5 elements in IE7+8 -->
+ <!--[if lt IE 9]>
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
+
+ <script type="text/javascript">
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-25803931-1']);
+ _gaq.push(['_setDomainName', 'hellarobots.com']);
+ _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';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+ </script>
+</head>
View
@@ -0,0 +1,7 @@
+<nav class="main-nav">
+ <ul>
+ <li><a href="/">home</a></li>
+ <li><a href="/blog.html">blog</a></li>
+ <li><a href="/#about">about</a></li>
+ </ul>
+</nav>
View
@@ -0,0 +1,7 @@
+<ul class="naked">
+ {% for post in site.posts %}
+ <li>
+ <h3><span class="post-meta">{{ post.date | date_to_string }}</span> <a href="{{ post.url }}">{{ post.title }}</a></h3>
+ </li>
+ {% endfor %}
+</ul>
View
@@ -1,40 +1,12 @@
<!DOCTYPE html>
<html lang="en">
- <head>
- <title>Hella Robots</title>
- <link rel="stylesheet" media="screen" href="/assets/css/master.css"/>
-
- <!-- enable HTML5 elements in IE7+8 -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-25803931-1']);
- _gaq.push(['_setDomainName', 'hellarobots.com']);
- _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';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
- </script>
- </head>
+ {% include head.html %}
<body id="home">
<div id="container">
<header class="group">
<div class="header-inner">
<h1 class="logo"><a href="/">Hella Robots.</a></h1>
- <nav class="main-nav">
- <ul>
- <li><a href="/">home</a></li>
- <li><a href="/projects.html">projects</a></li>
- <li><a href="/blog.html">blog</a></li>
- <li><a href="/#about">about</a></li>
- </ul>
- </nav>
+ {% include nav.html %}
</div>
</header>
<div id="content">
View
@@ -1,40 +1,12 @@
<!DOCTYPE html>
<html lang="en">
- <head>
- <title>Hella Robots</title>
- <link rel="stylesheet" media="screen" href="/assets/css/master.css"/>
-
- <!-- enable HTML5 elements in IE7+8 -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-25803931-1']);
- _gaq.push(['_setDomainName', 'hellarobots.com']);
- _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';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
- </script>
- </head>
+ {% include head.html %}
<body id="home">
<div id="container">
<header class="group">
<div class="header-inner">
<h1 class="logo"><a href="/">Hella Robots.</a></h1>
- <nav class="main-nav">
- <ul>
- <li><a href="/">home</a></li>
- <li><a href="/projects.html">projects</a></li>
- <li><a href="/blog.html">blog</a></li>
- <li><a href="/#about">about</a></li>
- </ul>
- </nav>
+ {% include nav.html %}
</div>
</header>
<div id="content">
View
@@ -1,40 +1,12 @@
<!DOCTYPE html>
<html lang="en">
- <head>
- <title>{{ page.title }}</title>
- <link rel="stylesheet" media="screen" href="/assets/css/master.css"/>
-
- <!-- enable HTML5 elements in IE7+8 -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-25803931-1']);
- _gaq.push(['_setDomainName', 'hellarobots.com']);
- _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';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
- </script>
- </head>
+ {% include head.html %}
<body id="home">
<div id="container">
<header class="group">
<div class="header-inner">
<h1 class="logo"><a href="/">Hella Robots.</a></h1>
- <nav class="main-nav">
- <ul>
- <li><a href="/">home</a></li>
- <li><a href="/projects.html">projects</a></li>
- <li><a href="/blog.html">blog</a></li>
- <li><a href="/#about">about</a></li>
- </ul>
- </nav>
+ {% include nav.html %}
</div>
</header>
<div id="content">
View
@@ -51,14 +51,12 @@ pre code {
}
#container {
- /* bump down global font size. */
- font-size: .95em;
}
#content {
margin: 0 auto;
padding: 25px 0 0;
- width: 850px;
+ width: 750px;
}
p {
@@ -113,7 +111,7 @@ header .logo a:visited {
.footer-inner,
.header-inner {
margin: 0 auto;
- width: 850px;
+ width: 750px;
}
section {
@@ -127,7 +125,7 @@ section {
#main h2 {
font-size: 1.75em;
- margin-bottom: 0.5em;
+ margin-bottom: 1em;
}
#main h3,
@@ -150,7 +148,7 @@ section {
}
#main ul li {
- margin-bottom: 1em;
+ margin-bottom: 1.5em;
}
#sup-about p {
@@ -213,6 +211,7 @@ footer p {
.hero img {
border-bottom: 1px solid #000;
border-top: 1px solid #000;
+ margin-left: -50px;
}
.hero .overlay {
@@ -224,35 +223,19 @@ footer p {
margin-right: -10px;
padding: 20px 20px 10px 20px;
position: absolute;
- right: 0;
- top: 25px;;
+ right: -50px;
+ top: 40px;
width: 245px;
}
-.figure {
- margin: 1.75em 0;
-}
-
-.span5 {
- width: 245px;
+#container img {
+ margin-left: -50px;
+ margin-bottom: 1.25em;
+ margin-top: 1.25em;
}
-.span6 {
- width: 300px;
-}
-
-.span11 {
- width: 575px;
-}
-
-.span16 {
- width: 850px;
-}
-
-.span5, .span6, .span11, .span16 {
- display: inline;
- float: left;
- margin-left: 30px;
+.figure {
+ margin: 1.75em 0;
}
.first {
@@ -275,9 +258,11 @@ footer p {
.post-meta {
color: #999999;
+ float: left;
font-size: .9em;
font-weight: normal;
margin-bottom: .8em;
+ width: 150px;
}
#main .references {
View
@@ -5,11 +5,5 @@
<div id="sup-blog" class="span11 first">
<h2>Blog</h2>
- <ul class="naked">
- {% for post in site.posts %}
- <li>
- <h3><span class="post-meta">{{ post.date | date_to_string }}</span> <a href="{{ post.url }}">{{ post.title }}</a></h3>
- </li>
- {% endfor %}
- </ul>
+ {% include posts.html %}
</div>
View
@@ -5,26 +5,7 @@
<div id="sup-blog" class="span16 first">
<h2>Blog Latest</h2>
- <ul class="posts">
- <li>
- <h3><a href="2012/11/23/debugging-on-appfog.html">Debugging on AppFog</a></h3>
- <div class="post-meta">November 24, 2012</div>
- <p>A big plus when deploying to a platform as a service (<a href="http://en.wikipedia.org/wiki/Platform_as_a_service">PaaS</a>) is that you're pushing the responsibility for a lot of the systems administration tasks to the PaaS provider, which ideally leaves you to concentrate on writing your application. As a result however, on services like <a href="http://www.appfog.com">AppFog</a> or <a href="http://www.heroku.com">Heroku</a>, you no longer have direct access to the environment your application is running on. So you can't SSH into a box and grep through logs, which some people are used to in their debugging workflow. </p>
- <p><a href="2012/11/23/debugging-on-appfog.html">Read more...</a></p>
- </li>
- <li>
- <h3><a href="2012/01/06/blogging-with-jekyll-quickstart.html">Blogging With Jekyll Quickstart</a></h3>
- <div class="post-meta">January 6, 2012</div>
- <p>If you want to blog these days, you have a number of choices. You can use a free hosted service like <a href="http://www.blogger.com">Google's Blogger</a> or the ever-hip <a href="http://www.tumblr.com">Tumblr</a>, or you can host your own blog using something like <a href="http://www.wordpress.org">Wordpress</a>. Or, if you want a simple setup with no databases or WYSIWIG editors, you can go the static site generator route using <a href="https://github.com/mojombo/jekyll">Jekyll</a>.</p>
- <p><a href="2012/01/06/blogging-with-jekyll-quickstart.html">Read more...</a></p>
- </li>
- <li>
- <h3><a href="2011/12/20/up-and-running-on-phpfog-with-codeigniter.html">Up and Running on PHPFog with CodeIgniter</a></h3>
- <div class="post-meta">December 20, 2011</div>
- <p>If you're a web developer, chances are you've heard of or used Ruby on Rails to develop a web application. As a Ruby programmer, there are other options like Sinatra, but Rails is the dominant Ruby framework today (by at least one measure). PHP on the other hand has a number of MVC frameworks that you can experiment with. CakePHP, Zend, and CodeIgniter are just a few that come to mind; FuelPHP is a bit younger, but looks pretty interesting too.</p>
- <p><a href="2011/12/20/up-and-running-on-phpfog-with-codeigniter.html">Read more...</a></p>
- </li>
- </ul>
+ {% include posts.html %}
</div>
<div id="sup-about" class="span16 first">
<h2 id="about">About</h2>

0 comments on commit 19f0e27

Please sign in to comment.