webby 0.3.0 → 0.4.0

data/History.txt

@@ -1,3 +1,8 @@
+== 0.4.0 / 2007-09-18
+
+* Updated the Blueprint CSS stylesheets to version 0.5
+* Updating documentation and comments
+
 == 0.3.0 / 2007-09-17
 
 * Added support for CodeRay syntax highlighting

data/Manifest.txt

@@ -9,8 +9,6 @@ data/content/css/blueprint/Readme.txt
 data/content/css/blueprint/lib/buttons.css
 data/content/css/blueprint/lib/compressed.css
 data/content/css/blueprint/lib/grid.css
-data/content/css/blueprint/lib/img/baseline-black.png
-data/content/css/blueprint/lib/img/baseline.png
 data/content/css/blueprint/lib/img/grid.png
 data/content/css/blueprint/lib/img/icons/cross.png
 data/content/css/blueprint/lib/img/icons/textfield_key.png
@@ -53,8 +51,6 @@ website/Rakefile
 website/content/css/blueprint/lib/buttons.css
 website/content/css/blueprint/lib/compressed.css
 website/content/css/blueprint/lib/grid.css
-website/content/css/blueprint/lib/img/baseline-black.png
-website/content/css/blueprint/lib/img/baseline.png
 website/content/css/blueprint/lib/img/grid.png
 website/content/css/blueprint/lib/img/icons/cross.png
 website/content/css/blueprint/lib/img/icons/textfield_key.png

data/README.txt

@@ -6,16 +6,34 @@ Webby
 
 == DESCRIPTION:
 
-Webby is a tool for creating and managing static websites. Web pages
-are written using ERB, Textile, Markdown, HAML, etc. The Webby rake tasks
-transform the pages into valid HTML, and these pages can be uploaded to a
-web server for general consumption.
+Webby is a super fantastic little website management system. It would be called a _content management system_ if it were a bigger kid. But, it's just a runt with a special knack for transforming text. And that's really all it does - manages the legwork of turning text into something else, an *ASCII Alchemist* if you will.
+
+Webby works by combining the contents of a *page* with a *layout* to produce HTML. The layout contains everthing common to all the pages - HTML headers, navigation menu, footer, etc. - and the page contains just the information for that page. You can use your favorite markup language to write your pages; Webby supports quite a few.
+
+Install Webby and try it out!
 
 == FEATURES:
 
-* Provides +webby+ for creating new websites 
-* Uses rake for building HTML from the pages and layouts
-* Provides templates for quickly creating new pages
+* choose your templating language: *eRuby*, *Textile*, *Markdown*, *HAML*
+* support for {CodeRay}[http://coderay.rubychan.de/] syntax highlighting
+* quick and speedy - only builds pages that have changed
+* deploy anywhere - it's just HTML, no special server stuff required
+* happy {rake}[http://docs.rubyrake.org/] tasks for deploying your website to a server
+* build new pages from templates for quicker blog posts and news items
+
+But Wait! There's More!
+
+Webby has a great _autobuild_ feature that continously generates HTML whenever the *pages* or *layouts* change. The HTML is served up via {heel}[http://copiousfreetime.rubyforge.org/heel/], a static file webserver based on mongrel. Whenever you change a page, you can immediately see those changes without having to run any commands.
+
+   $ rake autobuild
+   heel --root output --daemonize
+   -- starting autobuild (Ctrl-C to stop)
+   - started at 10:21:26
+   creating output/index.html
+   - started at 10:22:57
+   creating output/index.html
+
+Webby is not limited to producing HTML. By no means! Do you ever get tired of repeating the same color code <b>#D3C4A2</b> in your CSS files? Webby can help. Need some customized JavaScript for your website. Webby can help. Anytime you find yourself repeating the same bit of text over and over, then you should be using Webby.
 
 == INSTALL:
 
@@ -34,7 +52,10 @@ web server for general consumption.
    $ rake create:page another/new_page.rhtml
    creating content/another/new_page.rhtml
 
-   $ rake build
+   $ rake autobuild
+   heel --root output --daemonize
+   -- starting autobuild (Ctrl-C to stop)
+   - started at 07:01:30
    creating output/index.html
    creating output/new_page.html
    creating output/another/new_page.html
@@ -44,6 +65,8 @@ web server for general consumption.
 * rake
 * rspec
 * directory_watcher
+* hpricot
+* heel
 
 == LICENSE:
 

data/Rakefile

@@ -1,11 +1,7 @@
 # $Id$
 
-require 'rubygems'
-require 'rake'
-require 'spec'
-require 'webby'
-require 'fileutils'
 load './tasks/setup.rb'
+require 'webby'
 
 task :default => 'spec:run'
 
@@ -28,6 +24,7 @@ PROJ.rdoc_exclude << '^(\.\/|\/)?website'
 PROJ.spec_opts << '--color'
 
 depend_on 'directory_watcher', '1.0.0'
+depend_on 'heel'
 depend_on 'hpricot'
 depend_on 'rspec'
 

data/data/content/css/blueprint/Readme.txt

@@ -1,4 +1,4 @@
-Blueprint CSS framework (http://bjorkoy.com/blueprint)
+Blueprint CSS framework 0.5 (http://bjorkoy.com/blueprint)
 ----------------------------------------------------------------
 
 Welcome to Blueprint! This is a CSS framework designed to 
@@ -37,8 +37,8 @@ How to use Blueprint
 Here's a quick primer on how to use BP:
 http://code.google.com/p/blueprintcss/wiki/Tutorial
 
-Each file is also heavily commented, so you'll learn a
-lot by reading through them.
+Each file is also heavily commented, so you'll 
+learn a lot by reading through them.
 
 
 Files in Blueprint
@@ -68,6 +68,13 @@ contains lots of (hopefully) clarifying comments.
 * lib/reset.css
   This file resets CSS values that browsers tend to set for you.
 
+* lib/buttons.css
+  Provides some great CSS-only buttons.
+
+* lib/compressed.css
+  A compressed version of the core files. Use this on every live site.
+  See screen.css for instructions.
+
 
 Credits
 ----------------------------------------------------------------

data/data/content/css/blueprint/lib/buttons.css

@@ -1,7 +1,8 @@
 /* -------------------------------------------------------------- 
   
    Buttons.css
-   * Gives you some great buttons for many purposes.
+   * Version:   0.5 (28/8/2007)
+   * Website:   http://code.google.com/p/blueprintcss/
    
    Created by Kevin Hale [particletree.com]
    * particletree.com/features/rediscovering-the-button-element
@@ -24,7 +25,6 @@
      <img src="css/blueprint/lib/img/icons/cross.png" alt=""/> Cancel
    </a>
    
-   
 -------------------------------------------------------------- */
 
 a.button, button {

data/data/content/css/blueprint/lib/compressed.css

@@ -1,127 +1,137 @@
-/* Blueprint Comressed Version */
+/* Blueprint Compressed Version */
+
 
 /* reset.css */
-html,body,div,span,applet,object,iframe, h1,h2,h3,h4,h5,h6,p,blockquote,pre, a,abbr,acronym,address,big,cite,code, del,dfn,em,font,img,ins,kbd,q,s,samp, small,strike,strong,sub,sup,tt,var, dl,dt,dd,ol,ul,li, fieldset,form,label,legend, table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;}
+html,body,div,span,applet,object,iframe, h1,h2,h3,h4,h5,h6,p,blockquote,pre, a,abbr,acronym,address,big,cite,code, del,dfn,em,font,img,ins,kbd,q,s,samp, strike,strong,sub,sup,tt,var, dl,dt,dd,ol,ul,li, fieldset,form,label,legend, table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;}
 body{line-height:1;color:#333;background:white;}
 table{border-collapse:separate;border-spacing:0;}
 caption,th,td{text-align:left;font-weight:normal;}
 blockquote:before,blockquote:after,q:before,q:after{content:"";}
 blockquote,q{quotes:"" "";}
 
-/* typograpghy.css */
-body{font-family:"Lucida Grande",Helvetica,Arial,Verdana,sans-serif;line-height:1.5;}
-body{font-size:75%;}
-html > body{font-size:12px;}
-h1,h2,h3,h4,h5,h6{font-family:Helvetica,Arial,"Lucida Grande",Verdana,sans-serif;color:#111;clear:both;}
-h1{font-size:3em;}
-h2{font-size:2em;}
-h3{font-size:1.5em;line-height:2;}
-h4{font-size:1.2em;line-height:1.25;font-weight:bold;}
-h5{font-size:1em;font-weight:bold;}
-h6{font-size:1em;}
-p{margin:0 0 1.5em 0;text-align:justify;}
+
+/* typography.css */
+body{font-size:12px;line-height:18px;}
+h1,h2,h3, h4,h5,h6{font-family:Constantia,"Palatino Linotype",Palatino,Georgia,"Times New Roman",Times,serif;}
+body{font-family:Frutiger,Univers,"Helvetica Neue","Lucida Grande",Calibri,Helvetica,Verdana,sans-serif;}
+pre{font-family:Corbel,Verdana,"Bitstream Vera Sans",sans-serif;}
+code{font-family:Consolas,"Bitstream Vera Sans Mono","Courier New",Monaco,Courier,monospace;}
+h1,h2,h3,h4,h5,h6{color:#111;clear:both;}
+h1{font-size:30px;line-height:36px;padding:0 0 18px 0;}
+h2{font-size:20px;line-height:36px;}
+h3{font-size:16px;line-height:36px;}
+h4{font-size:14px;font-weight:bold;}
+h5{font-size:12px;font-weight:bold;}
+h6{font-size:12px;}
+p{margin:0 0 18px 0;text-align:justify;}
 p.last{margin-bottom:0;}
-p img{float:left;margin:1.5em 1.5em 1.5em 0;padding:0;}
+p img{float:left;margin:18px 18px 18px 0;padding:0;}
 p img.top{margin-top:0;}
-ul,ol{margin:0 0 1.5em 1.5em;}
+a{color:#125AA7;text-decoration:underline;}
+a:hover{color:#000;}
+ul,ol{margin:0 0 18px 18px;}
+ul{list-style-type:circle;}
 ol{list-style-type:decimal;}
-dl{margin:1.5em 0;}
+dl{margin:0 0 18px 0;}
 dl dt{font-weight:bold;}
-a{color:#125AA7;text-decoration:underline;outline:none;}
-a:hover{color:#000;}
-blockquote{margin:1.5em 0 1.5em 1.5em;color:#666;font-style:italic;}
+blockquote{margin:0 0 18px 18px;color:#666;font-style:italic;}
 strong{font-weight:bold;}
 em{font-style:italic;}
-pre{margin-bottom:1.3em;background:#eee;border:0.1em solid #ddd;padding:1.5em;}
-code{font:0.9em Monaco,monospace;}
-hr{background:#B2CCFF;color:#B2CCFF;clear:both;float:none;width:100%;height:0.1em;margin:0 0 1.4em 0;border:none;}
-* html hr{margin:0 0 1.2em 0;}
-table{margin-bottom:1.4em;border-top:0.1em solid #ddd;border-left:0.1em solid #ddd;}
-th,td{height:1em;padding:0.2em 0.4em;border-bottom:0.1em solid #ddd;border-right:0.1em solid #ddd;}
+pre{margin-bottom:18px;background:#eee;border:1px solid #ddd;padding:16px;}
+hr{background:#B2CCFF;color:#B2CCFF;clear:both;float:none;width:100%;height:2px;margin:0 0 16px 0;border:none;}
+table{margin-bottom:16px;border-top:1px solid #ddd;border-left:1px solid #ddd;}
+th,td{height:13px;padding:2px 4px;border-bottom:1px solid #ddd;border-right:1px solid #ddd;}
 th{font-weight:bold;}
-label{font-weight:bold;}
-textarea{height:180px;width:300px;}
-p.small{font-size:0.8em;margin-bottom:1.875em;line-height:1.875em;}
-p.large{font-size:1.2em;line-height:2.5em;}
+p.small{font-size:10px;margin-bottom:18px;}
+p.large{font-size:14px;line-height:36px;}
 p.quiet{color:#666;}
 .hide{display:none;}
-.alt{color:#666;font-family:"Warnock Pro","Goudy Old Style","Palatino","Book Antiqua",serif;font-size:1.2em;line-height:1%;font-style:italic;}
+.alt{color:#666;font-family:"Warnock Pro","Goudy Old Style","Palatino","Book Antiqua",Georgia,serif;font-size:1.2em;line-height:1%;font-style:italic;}
 .dquo{margin-left:-.7em;}
-p.incr,.incr p{font-size:0.83333em;line-height:1.44em;margin-bottom:1.8em;}
+p.incr,.incr p{font-size:10px;line-height:1.44em;margin-bottom:18px;}
+.caps{font-variant:small-caps;letter-spacing:1px;text-transform:lowercase;font-size:1.2em;line-height:1%;font-weight:bold;}
+
 
 /* grid.css */
 body{text-align:center;margin:36px 0;}
-.container{text-align:left;position:relative;padding:0;margin:0 auto;width:960px;}
-.column{float:left;margin:0 10px;padding:0;}
+.container{text-align:left;position:relative;padding:0;margin:0 auto;width:950px;}
+.column{float:left;margin-right:10px;padding:0;}
 * html .column{overflow-x:hidden;}
-.border{padding-right:9px;margin-right:0;border-right:1px solid #ddd;}
-.first{margin-left:0;}
+.border{padding-right:4px;margin-right:5px;border-right:1px solid #ddd;}
+.span-1{width:30px;}
+.span-2{width:70px;}
+.span-3{width:110px;}
+.span-4{width:150px;}
+.span-5{width:190px;}
+.span-6{width:230px;}
+.span-7{width:270px;}
+.span-8{width:310px;}
+.span-9{width:350px;}
+.span-10{width:390px;}
+.span-11{width:430px;}
+.span-12{width:470px;}
+.span-13{width:510px;}
+.span-14{width:550px;}
+.span-15{width:590px;}
+.span-16{width:630px;}
+.span-17{width:670px;}
+.span-18{width:710px;}
+.span-19{width:750px;}
+.span-20{width:790px;}
+.span-21{width:830px;}
+.span-22{width:870px;}
+.span-23{width:910px;}
+.span-24{width:950px;margin:0;}
 .last{margin-right:0;}
-.span-1{width:50px;}
-.span-2{width:120px;}
-.span-3{width:190px;}
-.span-4{width:260px;}
-.span-5{width:330px;}
-.span-6{width:400px;}
-.span-7{width:470px;}
-.span-8{width:540px;}
-.span-9{width:610px;}
-.span-10{width:680px;}
-.span-11{width:750px;}
-.span-12{width:820px;}
-.span-13{width:890px;}
-.span-14{width:960px;margin:0;}
-.append-1{padding-right:70px;}
-.append-2{padding-right:140px;}
-.append-3{padding-right:210px;}
-.append-4{padding-right:280px;}
-.append-5{padding-right:350px;}
-.append-6{padding-right:420px;}
-.append-7{padding-right:490px;}
-.append-8{padding-right:560px;}
-.append-9{padding-right:630px;}
-.append-10{padding-right:700px;}
-.append-11{padding-right:770px;}
-.append-12{padding-right:840px;}
-.append-13{padding-right:910px;}
-.prepend-1{padding-left:70px;}
-.prepend-2{padding-left:140px;}
-.prepend-3{padding-left:210px;}
-.prepend-4{padding-left:280px;}
-.prepend-5{padding-left:350px;}
-.prepend-6{padding-left:420px;}
-.prepend-7{padding-left:490px;}
-.prepend-8{padding-left:560px;}
-.prepend-9{padding-left:630px;}
-.prepend-10{padding-left:700px;}
-.prepend-11{padding-left:770px;}
-.prepend-12{padding-left:840px;}
-.prepend-13{padding-left:910px;}
-.box{padding:1.5em;margin-bottom:1.5em;background:#F0F0F0;}
-.clear{display:inline-block;}
-.clear:after,.container:after{content:".";display:block;height:0;clear:both;visibility:hidden;}
-* html .clear{height:1%;}
-.clear{display:block;}
-img{margin:0 0 1.5em 0;}
-.pull-1{margin-left:-70px;}
-.pull-2{margin-left:-140px;}
-.pull-3{margin-left:-210px;}
-.push-0{margin:0 0 0 1.5em;float:right;}
-.push-1{margin:0 -88px 0 1.5em;float:right;}
-.push-2{margin:0 -158px 0 1.5em;float:right;}
-.push-3{margin:0 -228px 0 1.5em;float:right;}
+.append-1{padding-right:40px;}
+.append-2{padding-right:80px;}
+.append-3{padding-right:120px;}
+.append-4{padding-right:160px;}
+.append-5{padding-right:200px;}
+.append-6{padding-right:240px;}
+.append-7{padding-right:280px;}
+.append-8{padding-right:320px;}
+.append-9{padding-right:360px;}
+.append-10{padding-right:400px;}
+.append-11{padding-right:440px;}
+.append-12{padding-right:480px;}
+.prepend-1{padding-left:40px;}
+.prepend-2{padding-left:80px;}
+.prepend-3{padding-left:120px;}
+.prepend-4{padding-left:160px;}
+.prepend-5{padding-left:200px;}
+.prepend-6{padding-left:240px;}
+.prepend-7{padding-left:280px;}
+.prepend-8{padding-left:320px;}
+.prepend-9{padding-left:360px;}
+.prepend-10{padding-left:400px;}
+.prepend-11{padding-left:440px;}
+.prepend-12{padding-left:480px;}
+img{margin:0 0 18px 0;}
+.pull-1{margin-left:-40px;}
+.pull-2{margin-left:-80px;}
+.pull-3{margin-left:-120px;}
+.pull-4{margin-left:-160px;}
+.push-0{margin:0 0 0 18px;float:right;}
+.push-1{margin:0 -40px 0 18px;float:right;}
+.push-2{margin:0 -80px 0 18px;float:right;}
+.push-3{margin:0 -120px 0 18px;float:right;}
+.push-4{margin:0 -160px 0 18px;float:right;}
+.pull-1,.pull-2,.pull-3,.pull-4, .push-1,.push-2,.push-3,.push-4{overflow-x:visible;}
+
 
 /* buttons.css */
-a.button,button{display:block;float:left;margin:0 0.583em 0.667em 0;padding:5px 10px 6px 7px;border:0.1em solid #dedede;border-top:0.1em solid #eee;border-left:0.1em solid #eee;background-color:#f5f5f5;line-height:130%;text-decoration:none;font-weight:bold;color:#565656;cursor:pointer;font:100% "Lucida Grande",Tahoma,Arial,Verdana,sans-serif}
-button{width:auto;overflow:visible;padding:4px 10px 3px 7px}
-button[type]{padding:5px 10px 5px 7px;line-height:17px}
-*:first-child+html button[type]{padding:4px 10px 3px 7px}
-button img,a.button img{margin:0 3px -3px 0 !important;padding:0;border:none;width:16px;height:16px}
-button:hover,a.button:hover{background-color:#dff4ff;border:0.1em solid #c2e1ef;color:#336699}
-a.button:active{background-color:#6299c5;border:1px solid #6299c5;color:#fff}
-.positive{color:#529214}
-a.positive:hover,button.positive:hover{background-color:#E6EFC2;border:0.1em solid #C6D880;color:#529214}
-a.positive:active{background-color:#529214;border:0.1em solid #529214;color:#fff}
-.negative{color:#d12f19}
-a.negative:hover,button.negative:hover{background:#fbe3e4;border:0.1em solid #fbc2c4}
-a.negative:active{background-color:#d12f19;border:0.1em solid #d12f19;color:#fff}
+a.button,button{display:block;float:left;margin:0 0.583em 0.667em 0;padding:5px 10px 6px 7px;border:0.1em solid #dedede;border-top:0.1em solid #eee;border-left:0.1em solid #eee;background-color:#f5f5f5;font-family:"Lucida Grande",Tahoma,Arial,Verdana,sans-serif;font-size:100%;line-height:130%;text-decoration:none;font-weight:bold;color:#565656;cursor:pointer;}
+button{width:auto;overflow:visible;padding:4px 10px 3px 7px;}
+button[type]{padding:5px 10px 5px 7px;line-height:17px;}
+*:first-child+html button[type]{padding:4px 10px 3px 7px;}
+button img,a.button img{margin:0 3px -3px 0 !important;padding:0;border:none;width:16px;height:16px;}
+button:hover,a.button:hover{background-color:#dff4ff;border:0.1em solid #c2e1ef;color:#336699;}
+a.button:active{background-color:#6299c5;border:1px solid #6299c5;color:#fff;}
+.positive{color:#529214;}
+a.positive:hover,button.positive:hover{background-color:#E6EFC2;border:0.1em solid #C6D880;color:#529214;}
+a.positive:active{background-color:#529214;border:0.1em solid #529214;color:#fff;}
+.negative{color:#d12f19;}
+a.negative:hover,button.negative:hover{background:#fbe3e4;border:0.1em solid #fbc2c4;}
+a.negative:active{background-color:#d12f19;border:0.1em solid #d12f19;color:#fff;}
+

data/data/content/css/blueprint/lib/grid.css

@@ -1,26 +1,28 @@
 /* -------------------------------------------------------------- 
   
    Grid.css
-   * Creates an easy to use grid of 14 columns.
+   * Version:   0.5 (28/8/2007)
+   * Website:   http://code.google.com/p/blueprintcss/
    
    Based on work by:
+   * Olav Bjorkoy      [bjorkoy.com]
    * Nathan Borror     [playgroundblues.com]
    * Jeff Croft        [jeffcroft.com]
    * Christian Metts   [mintchaos.com]
    * Khoi Vinh         [subtraction.com]
    
-   By default, the grid is 960px wide, with columns 
-   spanning 50px, and a 20px margin between columns.
+   By default, the grid is 950px wide, with 24 columns 
+   spanning 30px, and a 10px margin between columns.
    
    If you need fewer or more columns, use this 
    formula to find the new total width: 
    
-   Total width = (columns * 70) - 20
+   Total width = (columns * 30) - 10
   
 -------------------------------------------------------------- */
 
 body { 
-  text-align: center; /* IE Fix */
+  text-align: center; /* IE6 Fix */
   margin:36px 0;
 }
 
@@ -30,7 +32,7 @@ body {
   position: relative;
   padding: 0;
   margin: 0 auto;   /* Centers layout */
-  width: 960px;     /* Total width */
+  width: 950px;     /* Total width */
 }
 
 
@@ -43,135 +45,105 @@ body {
    
 .column {
   float: left;
-  margin: 0 10px;
+  margin-right: 10px;
   padding: 0;
 }
 * html .column { overflow-x: hidden; } /* IE6 fix */
 
-
 /* Add this class to a column if you want a border on its 
    right hand side. This should be customized to fit your needs. */
 
 .border {
-  padding-right: 9px;
-  margin-right: 0;
+  padding-right: 4px;
+  margin-right: 5px;
   border-right: 1px solid #ddd;
 }
 
 
-/* The first and last elements in a multi-column 
-   block needs one of these classes each. */
-
-.first  { margin-left: 0; }
-.last   { margin-right: 0; }
-
-
 /* Use these classes to set how wide a column should be. */
-.span-1   { width: 50px; }
-.span-2   { width: 120px; }
-.span-3   { width: 190px; }
-.span-4   { width: 260px; }
-.span-5   { width: 330px; }
-.span-6   { width: 400px; }
-.span-7   { width: 470px; }
-.span-8   { width: 540px; }
-.span-9   { width: 610px; }
-.span-10  { width: 680px; }
-.span-11  { width: 750px; }
-.span-12  { width: 820px; }
-.span-13  { width: 890px; }
-.span-14  { width: 960px; margin: 0; }
+.span-1   { width: 30px; }
+.span-2   { width: 70px; }
+.span-3   { width: 110px; }
+.span-4   { width: 150px; }
+.span-5   { width: 190px; }
+.span-6   { width: 230px; }
+.span-7   { width: 270px; }
+.span-8   { width: 310px; }
+.span-9   { width: 350px; }
+.span-10  { width: 390px; }
+.span-11  { width: 430px; }
+.span-12  { width: 470px; }
+.span-13  { width: 510px; }
+.span-14  { width: 550px; }
+.span-15  { width: 590px; }
+.span-16  { width: 630px; }
+.span-17  { width: 670px; }
+.span-18  { width: 710px; }
+.span-19  { width: 750px; }
+.span-20  { width: 790px; }
+.span-21  { width: 830px; }
+.span-22  { width: 870px; }
+.span-23  { width: 910px; }
+.span-24  { width: 950px; margin: 0; }
+
+/* The last element in a multi-column block needs this class. */
+.last     { margin-right: 0; }
 
 /* Add these to a column to append empty cols. */
-.append-1   { padding-right: 70px; }  
-.append-2   { padding-right: 140px; } 
-.append-3   { padding-right: 210px; } 
-.append-4   { padding-right: 280px; } 
-.append-5   { padding-right: 350px; } 
-.append-6   { padding-right: 420px; } 
-.append-7   { padding-right: 490px; } 
-.append-8   { padding-right: 560px; } 
-.append-9   { padding-right: 630px; } 
-.append-10  { padding-right: 700px; }
-.append-11  { padding-right: 770px; }
-.append-12  { padding-right: 840px; }
-.append-13  { padding-right: 910px; }
+.append-1   { padding-right: 40px; }  
+.append-2   { padding-right: 80px; } 
+.append-3   { padding-right: 120px; } 
+.append-4   { padding-right: 160px; } 
+.append-5   { padding-right: 200px; } 
+.append-6   { padding-right: 240px; } 
+.append-7   { padding-right: 280px; } 
+.append-8   { padding-right: 320px; } 
+.append-9   { padding-right: 360px; } 
+.append-10  { padding-right: 400px; } 
+.append-11  { padding-right: 440px; } 
+.append-12  { padding-right: 480px; } 
 
 /* Add these to a column to prepend empty cols. */
-.prepend-1   { padding-left: 70px; }  
-.prepend-2   { padding-left: 140px; } 
-.prepend-3   { padding-left: 210px; } 
-.prepend-4   { padding-left: 280px; } 
-.prepend-5   { padding-left: 350px; } 
-.prepend-6   { padding-left: 420px; } 
-.prepend-7   { padding-left: 490px; } 
-.prepend-8   { padding-left: 560px; } 
-.prepend-9   { padding-left: 630px; } 
-.prepend-10  { padding-left: 700px; }
-.prepend-11  { padding-left: 770px; }
-.prepend-12  { padding-left: 840px; }
-.prepend-13  { padding-left: 910px; }
-
-
-/* Use a .box to create a padded box inside a column. 
-   Sticking to the the baseline. */ 
-   
-.box { 
-  padding: 1.5em; 
-  margin-bottom: 1.5em; 
-  background: #f0f0f0; 
-}
-
-
-/* Clearing floats without extra markup
-   Based on How To Clear Floats Without Structural Markup by PiE
-   [http://www.positioniseverything.net/easyclearing.html] */
-
-.clear { display: inline-block; }   
-.clear:after, .container:after {
-    content: "."; 
-    display: block; 
-    height: 0; 
-    clear: both; 
-    visibility: hidden;
-}
-* html .clear { height: 1%; }
-.clear { display: block; }
+.prepend-1   { padding-left: 40px; }  
+.prepend-2   { padding-left: 80px; } 
+.prepend-3   { padding-left: 120px; } 
+.prepend-4   { padding-left: 160px; } 
+.prepend-5   { padding-left: 200px; } 
+.prepend-6   { padding-left: 240px; } 
+.prepend-7   { padding-left: 280px; } 
+.prepend-8   { padding-left: 320px; } 
+.prepend-9   { padding-left: 360px; } 
+.prepend-10  { padding-left: 400px; } 
+.prepend-11  { padding-left: 440px; } 
+.prepend-12  { padding-left: 480px; } 
 
 
-/* Nudge your elements [subtraction.com/archives/2007/0606_nudge_your_e.php]:
-   All block elements (not hr) inside a col should have a 5px padding on each side.
-   (Not everyone wants this, but feel free to uncomment if you do.) 
-
-p,ul,ol,dl,h1,h2,h3,h4,h5,h6,
-caption,pre,blockquote,input,textarea {
-  padding-left: 5px;
-  padding-right: 5px;
-}
-div, table {
-  margin-left: 5px;
-  margin-right: 5px;
-  padding: 0;
-} */
-
 
 /* Images
 -------------------------------------------------------------- */
 
 /* Remember the baseline (typography.css). */
-img { margin: 0 0 1.5em 0; }
+img { margin: 0 0 18px 0; }
 
 
 /* Use these classes to make an image flow into the column before 
    or after it. This techique can also be used on other objects. */
 
-.pull-1  { margin-left: -70px; }
-.pull-2  { margin-left: -140px; }
-.pull-3  { margin-left: -210px; }
+.pull-1  { margin-left: -40px; }
+.pull-2  { margin-left: -80px; }
+.pull-3  { margin-left: -120px; }
+.pull-4  { margin-left: -160px; }
 
-.push-0  { margin: 0 0 0 1.5em; float: right; } /* Right aligns the image. */
-.push-1  { margin: 0 -88px 0 1.5em; float: right; }
-.push-2  { margin: 0 -158px 0 1.5em; float: right; }
-.push-3  { margin: 0 -228px 0 1.5em; float: right; }
+.push-0  { margin: 0 0 0 18px;      float: right; } /* Right aligns the image. */
+.push-1  { margin: 0 -40px 0 18px;  float: right; }
+.push-2  { margin: 0 -80px 0 18px;  float: right; }
+.push-3  { margin: 0 -120px 0 18px; float: right; }
+.push-4  { margin: 0 -160px 0 18px; float: right; }
+
+.pull-1, .pull-2, .pull-3, .pull-4,
+.push-1, .push-2, .push-3, .push-4 {
+  overflow-x: visible; /* Overrides previous IE6 fix (needs improvement). */
+}
 
+/* EOF */