<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>assets/about-niven.jpg</filename>
    </added>
    <added>
      <filename>assets/about.gif</filename>
    </added>
    <added>
      <filename>assets/contact.gif</filename>
    </added>
    <added>
      <filename>assets/friends-of-niven.gif</filename>
    </added>
    <added>
      <filename>assets/press.gif</filename>
    </added>
    <added>
      <filename>assets/privacy.gif</filename>
    </added>
    <added>
      <filename>assets/shipping.gif</filename>
    </added>
    <added>
      <filename>assets/store-locator.gif</filename>
    </added>
    <added>
      <filename>templates/page.about.liquid</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,6 +1,7 @@
 body{
   margin:0;
   font:12px/14px Helvetica,Arial,sans-serif;
+  color:#666;
 }
 /* General reset */
 img{border-style:none;}
@@ -468,3 +469,8 @@ form,fieldset{
 #sidebar h2.lavender, #header ul li.lavender a:hover { color:#96c; }
 #sidebar h2.candles, #header ul li.candles a:hover { color:#999; }
 #sidebar h2.kitchen, #header ul li.kitchen a:hover { color:#f60; }
+
+#page.shipping {width:380px; float:left;}
+#page.about {width:620px; float:right;}
+img.about-niven {padding-top:16px;}
+input.submit-checkout {float:right;}
\ No newline at end of file</diff>
      <filename>assets/layout.css</filename>
    </modified>
    <modified>
      <diff>@@ -1,74 +1,66 @@
-&lt;div id=&quot;content&quot;&gt;
 &lt;script type=&quot;text/javascript&quot;&gt;
   function remove_item(id) {
       document.getElementById('updates_'+id).value = 0;
       document.getElementById('cartform').submit();
   }
+  function update_item(id) {
+      document.getElementById('cartform').submit();
+  }
 &lt;/script&gt;
-
-&lt;div&gt;
-
-  {% if cart.item_count == 0 %} 
-    &lt;div id=&quot;cart&quot;&gt;
-      &lt;h4&gt;Your shopping cart is looking rather empty&amp;hellip;&lt;/h4&gt;
-      &lt;p&gt;Looking for something specific?&lt;/p&gt;
-      &lt;form action=&quot;/search&quot; method=&quot;get&quot;&gt;
-      &lt;input id=&quot;search-input-body&quot; type=&quot;text&quot; name=&quot;q&quot; /&gt; &lt;input type=&quot;button&quot; value=&quot;Search&quot; /&gt;
-      &lt;/form&gt;
-      &lt;script type=&quot;text/javascript&quot;&gt;document.getElementById('search-input-body').focus()&lt;/script&gt;  
+{% if cart.item_count == 0 %} 
+  &lt;div id=&quot;content&quot;&gt;
+    &lt;h4&gt;Your shopping cart is looking rather empty&amp;hellip;&lt;/h4&gt;
+  &lt;/div&gt;
+{% else %}
+&lt;form action=&quot;/cart&quot; method=&quot;post&quot; id=&quot;cartform&quot;&gt;
+&lt;div class=&quot;trade&quot;&gt;
+  &lt;div class=&quot;checkout&quot;&gt;
+    &lt;a href=&quot;/&quot; class=&quot;continue&quot;&gt;Continue Shopping&lt;/a&gt;
+    &lt;input type=&quot;image&quot; value=&quot;Checkout!&quot; name=&quot;checkout&quot; class=&quot;submit-checkout&quot; src=&quot;{{ 'checkout.gif' | asset_url }}&quot; /&gt;
+    &lt;!-- &lt;a href=&quot;#&quot; class=&quot;check&quot;&gt;Check Out&lt;/a&gt; --&gt;
+  &lt;/div&gt;
+  &lt;div class=&quot;top&quot;&gt;
+    &lt;span&gt;Product&lt;/span&gt;
+    &lt;ul&gt;
+      &lt;li&gt;&amp;nbsp;&lt;/li&gt;
+      &lt;li class=&quot;price&quot;&gt;Price&lt;/li&gt;
+      &lt;li class=&quot;quantity&quot;&gt;Quantity&lt;/li&gt;
+      &lt;li class=&quot;total&quot;&gt;Total&lt;/li&gt;
+    &lt;/ul&gt;
+  &lt;/div&gt;
+  {% for item in cart.items %}
+  &lt;div class=&quot;product&quot;&gt;
+    &lt;div class=&quot;box&quot;&gt;
+      &lt;a href=&quot;{{item.product.url}}&quot; title=&quot;View {{item.title | escape }} Page&quot;&gt;&lt;img src=&quot;{{item.product.featured_image | product_img_url: 'thumb' }}&quot; alt=&quot;{{item.title | escape }}&quot; /&gt;
+      &lt;p&gt;{{ item.title }}
+      {% if item.variant.title != 'Default' %}
+         ({{item.variant.title}})
+      {% endif %}&lt;/p&gt;&lt;/a&gt;
     &lt;/div&gt;
-  {% else %}
-    &lt;form action=&quot;/cart&quot; method=&quot;post&quot; id=&quot;cartform&quot;&gt;
-
-    &lt;div id=&quot;cart&quot;&gt;
-  
-      &lt;ul id=&quot;line-items&quot;&gt;
-        {% for item in cart.items %}
-        &lt;li id=&quot;item-{{item.id}}&quot; class=&quot;clearfix&quot;&gt;
-          &lt;div class=&quot;thumb&quot;&gt;
-            &lt;div class=&quot;prodimage&quot;&gt;
-            &lt;a href=&quot;{{item.product.url}}&quot; title=&quot;View {{item.title | escape }} Page&quot;&gt;&lt;img src=&quot;{{item.product.featured_image | product_img_url: 'thumb' }}&quot; alt=&quot;{{item.title | escape }}&quot; /&gt;&lt;/a&gt;
-          &lt;/div&gt;&lt;/div&gt;
-          &lt;h3 style=&quot;width:400px;&quot;&gt;
-        &lt;a href=&quot;{{item.product.url}}&quot; title=&quot;View {{item.title | escape }} Page&quot;&gt;
-          {{ item.title }}
-          {% if item.variant.title != 'Default' %}
-             ({{item.variant.title}})
-          {% endif %}
-        &lt;/a&gt;  
-      &lt;/h3&gt;
-          &lt;small class=&quot;itemcost&quot;&gt;Costs {{ item.price | money }} each, &lt;span class=&quot;money&quot;&gt;{{item.line_price | money }}&lt;/span&gt; total.&lt;/small&gt;
-          &lt;p class=&quot;right&quot;&gt;
-            &lt;label for=&quot;updates_{{item.variant.id}}&quot;&gt;How many? &lt;/label&gt; 
-            &lt;input type=&quot;text&quot; size=&quot;4&quot; name=&quot;updates[{{item.variant.id}}]&quot; id=&quot;updates_{{item.variant.id}}&quot; value=&quot;{{item.quantity}}&quot; onfocus=&quot;this.select();&quot;/&gt;&lt;br /&gt;
-            &lt;a href=&quot;#&quot; onclick=&quot;remove_item({{item.variant.id}}); return false;&quot; class=&quot;remove&quot;&gt;&lt;img style=&quot;padding:15px 0 0 0;margin:0;&quot; src=&quot;{{ 'delete.gif' | asset_url }}&quot; alt=&quot;&quot; /&gt;&lt;/a&gt;
-          &lt;/p&gt;
-        &lt;/li&gt;
-        {% endfor %}
-
-        &lt;li id=&quot;total&quot;&gt;
-          &lt;input type=&quot;image&quot; id=&quot;update-cart&quot; name=&quot;update&quot; value=&quot;Update My Cart&quot; src=&quot;{{ 'update.gif' | asset_url }}&quot; /&gt;
-          Subtotal: 
-          &lt;span class=&quot;money&quot;&gt;{{ cart.total_price | money_with_currency }}&lt;/span&gt;
-        &lt;/li&gt;
-
-      &lt;/ul&gt;
-
-    &lt;/div&gt;
-  
-      &lt;div class=&quot;info&quot;&gt;
-      &lt;input type=&quot;image&quot; value=&quot;Checkout!&quot; name=&quot;checkout&quot; src=&quot;{{ 'checkout.gif' | asset_url }}&quot; /&gt;
-      &lt;/div&gt;
-  
-      {% if additional_checkout_buttons %}
-      &lt;div class=&quot;additional-checkout-buttons&quot;&gt;
-        &lt;p&gt;- or -&lt;/p&gt;
-        {{ content_for_additional_checkout_buttons }}
-      &lt;/div&gt;
-      {% endif %}
-  
-    &lt;/form&gt;
-  {% endif %}
-
+    &lt;ul&gt;
+      &lt;li&gt;&amp;nbsp;&lt;/li&gt;
+      &lt;li class=&quot;price&quot;&gt;{{ item.price | money }}&lt;/li&gt;
+      &lt;li class=&quot;quantity&quot;&gt;
+        &lt;input type=&quot;text&quot; size=&quot;4&quot; name=&quot;updates[{{item.variant.id}}]&quot; id=&quot;updates_{{item.variant.id}}&quot; value=&quot;{{item.quantity}}&quot; onfocus=&quot;this.select();&quot;/&gt;&lt;br /&gt;
+        &lt;a href=&quot;#&quot; onclick=&quot;update_item({{item.variant.id}}); return false;&quot;&gt;Update&lt;/a&gt;
+      &lt;/li&gt;
+      &lt;li class=&quot;total&quot;&gt;{{ item.line_price | money }}&lt;/li&gt;
+    &lt;/ul&gt;
+    &lt;a href=&quot;#&quot; onclick=&quot;remove_item({{item.variant.id}}); return false;&quot; class=&quot;remove&quot;&gt;Remove&lt;/a&gt;
+  &lt;/div&gt;
+  {% endfor %}
+  &lt;div class=&quot;subtotal&quot;&gt;
+    &lt;strong&gt;Subtotal:&lt;/strong&gt; {{ cart.total_price | money_with_currency }}
+  &lt;/div&gt;
+  &lt;div class=&quot;checkout&quot;&gt;
+    &lt;a href=&quot;/&quot; class=&quot;continue&quot;&gt;Continue Shopping&lt;/a&gt;
+    &lt;input type=&quot;image&quot; value=&quot;Checkout!&quot; name=&quot;checkout&quot; class=&quot;submit-checkout&quot; src=&quot;{{ 'checkout.gif' | asset_url }}&quot; /&gt;
+    &lt;!-- &lt;a href=&quot;#&quot; class=&quot;check&quot;&gt;Check Out&lt;/a&gt; --&gt;
+  &lt;/div&gt;
+&lt;/div&gt;
+&lt;!--
+&lt;div class=&quot;additional-checkout-buttons&quot;&gt;
+  {{ content_for_additional_checkout_buttons }}
 &lt;/div&gt;
-&lt;/div&gt;
\ No newline at end of file
+--&gt;
+{% endif %}</diff>
      <filename>templates/cart.liquid</filename>
    </modified>
    <modified>
      <diff>@@ -1,10 +1,9 @@
-&lt;div id=&quot;content&quot;&gt;
-&lt;div id=&quot;page&quot;&gt;
-  &lt;h2&gt;{{page.title}}&lt;/h2&gt;
+&lt;div id=&quot;page&quot; class='{{ page.handle }}'&gt;
+  {% capture file_name %}{{ page.handle }}.gif{% endcapture %}
+  &lt;h2&gt;&lt;img src=&quot;{{ file_name | asset_url }}&quot; alt=&quot;{{page.title}}&quot;/&gt;&lt;/h2&gt;
 
   &lt;div class=&quot;article textile&quot;&gt;
     {{page.content}}
   &lt;/div&gt;
 
-&lt;/div&gt;
 &lt;/div&gt;
\ No newline at end of file</diff>
      <filename>templates/page.liquid</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>1cb298d90750928d1ac1333b2506f5a65da4087c</id>
    </parent>
  </parents>
  <author>
    <name>Darcy Brown</name>
    <email>darcy@dbcodeproject.com</email>
  </author>
  <url>http://github.com/dbcodeproject/nivenmorgan/commit/ee137c41d9e151990063a26868a53e98c15bf65b</url>
  <id>ee137c41d9e151990063a26868a53e98c15bf65b</id>
  <committed-date>2009-10-09T11:46:08-07:00</committed-date>
  <authored-date>2009-10-09T11:46:08-07:00</authored-date>
  <message>update to cart and pages</message>
  <tree>413fa885264cf4680175b37bbe8f089da256de2a</tree>
  <committer>
    <name>Darcy Brown</name>
    <email>darcy@dbcodeproject.com</email>
  </committer>
</commit>
