bonsai 1.1.5 → 1.1.6

data/CHANGES

@@ -1,3 +1,17 @@
+= 1.1.6 (27/02/2010)
+
+* Updates to default templates
+  - Sans-serif rather than serif
+  - Bit cleaner
+  - Contains copyright info
+  - Thanks to Philip Harrison (Added to Credits in README.md)
+
+= 1.1.5 (16/02/2010)
+
+* Fixed an issue that affected v.1.1.4 only where an old
+  sitemap would cause the server to crash. All future updates
+  will contain this fix / warning.  
+
 = 1.1.4 (12/02/2010)
 
 * Using the gem bundler for development environments

data/README.md

@@ -24,6 +24,13 @@ Bonsai is a static web site generator, it uses the best tools available for site
 
 Type `bonsai --help` for any help with commands
 
+## Presentation
+
+* Introducing Bonsai - at Melbourne Ruby, January 2010
+
+  * [Video](http://vimeo.com/9537550) (with slides)
+  * [Slides](http://www.slideshare.net/benschwarz/introducing-bonsai)
+
 
 ## Development server
 
@@ -75,6 +82,7 @@ When I found something that didn't quite work, was too slow or perhaps not even
   * [Justin Ridgewell](git://github.com/somedumbme91)
   * [Ralph von der Heyden](http://github.com/ralph)
   * [David Goodlad](http://github.com/dgoodlad)
+  * [Philip Harrison](http://github.com/Harrison)
 
 ## Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-1.1.5
+1.1.6

data/bonsai.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bonsai}
-  s.version = "1.1.5"
+  s.version = "1.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Schwarz"]
-  s.date = %q{2010-02-15}
+  s.date = %q{2010-02-27}
   s.default_executable = %q{bonsai}
   s.description = %q{A static site generator that uses the best toolset available}
   s.email = %q{ben.schwarz@gmail.com}

data/lib/bonsai/templates/content/1.varieties/1.fig/default.yml

@@ -1,3 +1,4 @@
 :headline: Tasty fruit!
 :body: |
-  Donec gravida posuere arcu. Nulla facilisi. Phasellus imperdiet. Vestibulum at metus. Integer euismod. Nullam placerat rhoncus sapien. Ut euismod. Praesent libero. Morbi pellentesque libero sit amet ante. Maecenas tellus. Maecenas erat. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
+  Donec gravida posuere arcu. Nulla facilisi. Phasellus imperdiet. Vestibulum at metus. Integer euismod. Nullam placerat rhoncus sapien. Ut euismod. Praesent libero. Morbi pellentesque libero sit amet ante. Maecenas tellus. Maecenas erat. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
+  

data/lib/bonsai/templates/content/1.varieties/2.maple/default.yml

@@ -1,3 +1,4 @@
 :headline: Japanese maple
 :body: |
-  Donec gravida posuere arcu. Nulla facilisi. Phasellus imperdiet. Vestibulum at metus. Integer euismod. Nullam placerat rhoncus sapien. Ut euismod. Praesent libero. Morbi pellentesque libero sit amet ante. Maecenas tellus. Maecenas erat. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
+  Donec gravida posuere arcu. Nulla facilisi. Phasellus imperdiet. Vestibulum at metus. Integer euismod. Nullam placerat rhoncus sapien. Ut euismod. Praesent libero. Morbi pellentesque libero sit amet ante. Maecenas tellus. Maecenas erat. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.
+  

data/lib/bonsai/templates/content/2.cultivation/default.yml

@@ -1,3 +1,4 @@
 :headline: Cultivation techniques 
 :body: |
-  Donec gravida posuere arcu. Nulla facilisi. Phasellus imperdiet. Vestibulum at metus. Integer euismod. Nullam placerat rhoncus sapien. Ut euismod. Praesent libero. Morbi pellentesque libero sit amet ante. Maecenas tellus. Maecenas erat. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas
+  Donec gravida posuere arcu. Nulla facilisi. Phasellus imperdiet. Vestibulum at metus. Integer euismod. Nullam placerat rhoncus sapien. Ut euismod. Praesent libero. Morbi pellentesque libero sit amet ante. Maecenas tellus. Maecenas erat. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas
+  

data/lib/bonsai/templates/content/3.history/default.yml

@@ -1,3 +1,4 @@
 :headline: History of the Bonsai
 :body: |
-  Donec gravida posuere arcu. Nulla facilisi. Phasellus imperdiet. Vestibulum at metus. Integer euismod. Nullam placerat rhoncus sapien. Ut euismod. Praesent libero. Morbi pellentesque libero sit amet ante. Maecenas tellus. Maecenas erat. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas
+  Donec gravida posuere arcu. Nulla facilisi. Phasellus imperdiet. Vestibulum at metus. Integer euismod. Nullam placerat rhoncus sapien. Ut euismod. Praesent libero. Morbi pellentesque libero sit amet ante. Maecenas tellus. Maecenas erat. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas
+  

data/lib/bonsai/templates/content/index/default.yml

@@ -1,3 +1,7 @@
 :headline: Welcome to Bonsai
 :body: |
-  A designer knows he has achieved perfection not when there is nothing left to add, but when there is nothing left to take away. 
+  A designer knows he has achieved perfection not when there is nothing left to add, but when there is nothing left to take away.
+
+  Donec gravida posuere arcu. Nulla facilisi. Phasellus imperdiet. Vestibulum at metus. Integer euismod. Nullam placerat rhoncus sapien. Ut euismod. Praesent libero. Morbi pellentesque libero sit amet ante. Maecenas tellus. Maecenas erat. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas
+
+  

data/lib/bonsai/templates/public/css/base.less

@@ -1,25 +1,21 @@
 /* HTML resets */
-h1, h2, h3, h4, h5, h6, p, ol, ul { margin: 0; padding: 0; font-weight: normal; }
+h1, h2, h3, h4, h5, h6, p, ol, ul, li div, body, html, img, form, fieldset, input, textarea, p{ margin: 0; padding: 0; font-weight: normal; font-size: 100%; outline: none; border: none;}
 
 /* HTML5 block elements */
 header, section, article, footer, aside, nav { display: block; }
 
-
-
-
-
 /* Put your styles below here */
 #wrapper { margin: 0 auto; width: 660px; }
 
+body { font-family: "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif; }
+
 header { 
 	position: relative; margin-top: 5em;
 	
-	span { display: block; }
-	
 	#logo { 
-		width: 145px; height: 145px; -moz-border-radius: 72px; -webkit-border-radius: 72px; border-radius: 72px; background-color: black; color: white; position: relative; margin: 0 auto;
-		a { color: white; text-decoration: none; position: absolute; margin: 1em 0 0 1.5em; text-align: center; text-transform: lowercase; }
-	}
+		text-align: center; width: 145px; height: 145px; -moz-border-radius: 72px; -webkit-border-radius: 72px; background-color: black; color: white; margin: 0 auto; 
+		a { font-weight: 100; color: white; text-transform: lowercase; text-decoration: none; position: absolute; margin: 1em 0 0em 1.5em; }
+}
 	
 	#navigation {
 		margin: 5em 0; text-transform: lowercase; text-align: center;  font-style: italic; font-size: 0.8em;
@@ -41,4 +37,14 @@ nav li { display: inline; list-style-type: none; }
 }
 
 nav, footer { margin: 1em 0; }
+
 h1, h2, h3, h4, h5, h6 { margin: 1.25em 0; }
+
+h1 { font-size: 2em; }
+h2 { font-size: 1.6em; }
+h3 { font-size: 1.4em; }
+h4 { font-size: 1.2em; }
+h5 { font-size: 1em; }
+h6 { font-size: 0.9em; }
+
+p { font-size: 0.8em; line-height: 140%; margin-bottom: 10px; }

data/lib/bonsai/templates/templates/default.mustache

@@ -1,12 +1,17 @@
 <!DOCTYPE html>
 <html lang="en">
   {{> shared/head}}
-  <body id="{{slug}}" class="default">
+  <body id="{{slug}}">
     <section id="wrapper">
-      {{> shared/header}}
-      {{{body}}}
+      {{> shared/header}}	
+	  
+	    <article>
+	      <h2>{{headline}}</h2>
+		    {{{body}}}
+	    </article>
+	
       {{> shared/footer}}
     </section>
     {{> shared/analytics }}
   </body>
-</html>
+</html>

data/lib/bonsai/templates/templates/products.mustache

@@ -1,17 +1,23 @@
 <!DOCTYPE html>
 <html lang="en">
   {{> shared/head}}
-  <body id="{{slug}}" class="default">
+  <body id="{{slug}}">
     <section id="wrapper">
       {{> shared/header}}
-        
-      <ul id="sub-navigation">
-        {{# children}}
-          <li><a href="{{permalink}}">{{name}}</a></li>
-        {{/ children}}
-      </ul>
-      {{{body}}}
     
+  	  <article>
+  	  	<h2>{{headline}}</h2>
+        {{{body}}}
+  	  </article>
+	  
+  	  <nav id="sub-navigation">
+        <ol>
+  	      {{# children}}
+  	        <li><a href="{{permalink}}">{{name}}</a></li>
+  	      {{/ children}}
+  	    </ol>
+      </nav>
+	  
       {{> shared/footer}}
     </section>
   </body>

data/lib/bonsai/templates/templates/shared/footer.mustache

@@ -1,3 +1,3 @@
 <footer>  
-  <p>Built with <a href="http://www.tinytree.info">Bonsai</a></p>
+  <p>Built with <a href="http://www.tinytree.info">Bonsai</a> © {{copyright}} - {{site_name}}</p>
 </footer>

data/lib/bonsai/templates/templates/shared/head.mustache

@@ -1,6 +1,6 @@
 <head>
-  <meta http-equiv="Content-type" content="text/html; charset=utf-8">
-  <title>{{headline}}</title>
+  <meta charset=UTF-8>
+  <title>{{headline}} | {{site_name}}</title>
   <link rel="stylesheet" href="/css/base.css" type="text/css">
   <!--[if IE]>
     <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>

data/lib/bonsai/templates/templates/shared/header.mustache

@@ -1,13 +1,5 @@
 <header>
-  <h1 id="logo">
-    <a href="/" rel="home">
-      <span>Tiny</span>
-      <span>Tree</span>
-    </a>
-  </h1>
-  
+  <h1 id="logo"><a href="/" rel="home">Tiny<br />Tree</a></h1>
   {{> shared/nav}}
   {{> shared/breadcrumbs}}
-  <h2>{{headline}}</h2>
-
-</header>
+</header>

data/lib/bonsai/templates/templates/shared/nav.mustache

@@ -1,7 +1,7 @@
-<nav>
-  <ol id="navigation">
-    {{# navigation}}
-      <li><a href="{{permalink}}">{{name}}</a></li>
-    {{/ navigation}}
+<nav id="navigation">
+  <ol>
+  {{# navigation}}
+    <li><a href="{{permalink}}">{{name}}</a></li>
+  {{/ navigation}}
   </ol>
 </nav>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bonsai
 version: !ruby/object:Gem::Version 
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 +11:00
+date: 2010-02-27 00:00:00 +11:00
 default_executable: bonsai
 dependencies: 
 - !ruby/object:Gem::Dependency