spree 0.8.0 → 0.8.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.8.1
+
+* # 372 - Remove all vendored gems.
+
 == 0.8.0
 
 * # 273 -	Improve usefulness of prototypes

data/config/environment.rb

@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-SPREE_GEM_VERSION = '0.8.0' unless defined? SPREE_GEM_VERSION
+SPREE_GEM_VERSION = '0.8.1' unless defined? SPREE_GEM_VERSION
           
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -31,8 +31,8 @@ Spree::Initializer.run do |config|
   config.gem "activemerchant", :lib => "active_merchant", :version => '>=1.4.1'
   config.gem "tlsmail", :version => '0.0.1'
   config.gem 'activerecord-tableless', :lib => 'tableless', :version => '>=0.1.0'
-  config.gem 'haml', :version => "2.1.0"
-  config.gem 'chriseppstein-compass', :lib => 'compass', :source => "http://gems.github.com", :version => '0.6.1'
+  config.gem 'haml-edge', :lib=> 'haml', :version => "2.1.3"
+  config.gem 'chriseppstein-compass', :lib => 'compass', :source => "http://gems.github.com", :version => '0.6.6'
   config.gem 'calendar_date_select', :version => '1.15'    
   config.gem 'searchlogic', :version => '1.6.6'                           
 

data/lib/spree.rb

@@ -9,7 +9,7 @@ unless defined? Spree::Version
     module Version
       Major = '0'
       Minor = '8'
-      Tiny  = '0'
+      Tiny  = '1'
 
       class << self
         def to_s

data/public/stylesheets/compiled/screen.css

@@ -30,9 +30,8 @@ blockquote, q {
   font-family: inherit;
   vertical-align: baseline;
   quotes: "" ""; }
-  blockquote:before,
-  blockquote:after,   q:before,
-  q:after {
+  blockquote:before, q:before,
+  blockquote:after, q:after {
     content: ""; }
 
 th, td, caption {
@@ -273,7 +272,7 @@ caption {
   display: inline;
   float: left;
   margin-right: 10px; }
-  * html .column,   * html div.span-1,   * html div.span-2,   * html div.span-3,   * html div.span-4,   * html div.span-5,   * html div.span-6,   * html div.span-7,   * html div.span-8,   * html div.span-9,   * html div.span-10,   * html div.span-11,   * html div.span-12,   * html div.span-13,   * html div.span-14,   * html div.span-15,   * html div.span-16,   * html div.span-17,   * html div.span-18,   * html div.span-19,   * html div.span-20,   * html div.span-21,   * html div.span-22,   * html div.span-23,   * html div.span-24 {
+  * html .column, * html div.span-1, * html div.span-2, * html div.span-3, * html div.span-4, * html div.span-5, * html div.span-6, * html div.span-7, * html div.span-8, * html div.span-9, * html div.span-10, * html div.span-11, * html div.span-12, * html div.span-13, * html div.span-14, * html div.span-15, * html div.span-16, * html div.span-17, * html div.span-18, * html div.span-19, * html div.span-20, * html div.span-21, * html div.span-22, * html div.span-23, * html div.span-24 {
     overflow-x: hidden; }
 
 .last, div.last {
@@ -539,365 +538,159 @@ input.span-24, textarea.span-24, select.span-24 {
 .prepend-23 {
   padding-left: 920px; }
 
-.pull-1 {
+.pull-1, .pull-2, .pull-3, .pull-4, .pull-5, .pull-6, .pull-7, .pull-8, .pull-9, .pull-10, .pull-11, .pull-12, .pull-13, .pull-14, .pull-15, .pull-16, .pull-17, .pull-18, .pull-19, .pull-20, .pull-21, .pull-22, .pull-23, .pull-24 {
   display: inline;
   float: left;
-  position: relative;
+  position: relative; }
+
+.pull-1 {
   margin-left: -40px; }
 
 .pull-2 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -80px; }
 
 .pull-3 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -120px; }
 
 .pull-4 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -160px; }
 
 .pull-5 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -200px; }
 
 .pull-6 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -240px; }
 
 .pull-7 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -280px; }
 
 .pull-8 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -320px; }
 
 .pull-9 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -360px; }
 
 .pull-10 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -400px; }
 
 .pull-11 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -440px; }
 
 .pull-12 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -480px; }
 
 .pull-13 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -520px; }
 
 .pull-14 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -560px; }
 
 .pull-15 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -600px; }
 
 .pull-16 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -640px; }
 
 .pull-17 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -680px; }
 
 .pull-18 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -720px; }
 
 .pull-19 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -760px; }
 
 .pull-20 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -800px; }
 
 .pull-21 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -840px; }
 
 .pull-22 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -880px; }
 
 .pull-23 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -920px; }
 
 .pull-24 {
-  display: inline;
-  float: left;
-  position: relative;
   margin-left: -960px; }
 
-.push-1 {
+.push-1, .push-2, .push-3, .push-4, .push-5, .push-6, .push-7, .push-8, .push-9, .push-10, .push-11, .push-12, .push-13, .push-14, .push-15, .push-16, .push-17, .push-18, .push-19, .push-20, .push-21, .push-22, .push-23, .push-24 {
   display: inline;
   float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -40px;
-  margin-bottom: 1.5em;
-  margin-left: 40px; }
+  position: relative; }
+
+.push-1 {
+  margin: 0 -40px 1.5em 40px; }
 
 .push-2 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -80px;
-  margin-bottom: 1.5em;
-  margin-left: 80px; }
+  margin: 0 -80px 1.5em 80px; }
 
 .push-3 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -120px;
-  margin-bottom: 1.5em;
-  margin-left: 120px; }
+  margin: 0 -120px 1.5em 120px; }
 
 .push-4 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -160px;
-  margin-bottom: 1.5em;
-  margin-left: 160px; }
+  margin: 0 -160px 1.5em 160px; }
 
 .push-5 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -200px;
-  margin-bottom: 1.5em;
-  margin-left: 200px; }
+  margin: 0 -200px 1.5em 200px; }
 
 .push-6 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -240px;
-  margin-bottom: 1.5em;
-  margin-left: 240px; }
+  margin: 0 -240px 1.5em 240px; }
 
 .push-7 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -280px;
-  margin-bottom: 1.5em;
-  margin-left: 280px; }
+  margin: 0 -280px 1.5em 280px; }
 
 .push-8 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -320px;
-  margin-bottom: 1.5em;
-  margin-left: 320px; }
+  margin: 0 -320px 1.5em 320px; }
 
 .push-9 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -360px;
-  margin-bottom: 1.5em;
-  margin-left: 360px; }
+  margin: 0 -360px 1.5em 360px; }
 
 .push-10 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -400px;
-  margin-bottom: 1.5em;
-  margin-left: 400px; }
+  margin: 0 -400px 1.5em 400px; }
 
 .push-11 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -440px;
-  margin-bottom: 1.5em;
-  margin-left: 440px; }
+  margin: 0 -440px 1.5em 440px; }
 
 .push-12 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -480px;
-  margin-bottom: 1.5em;
-  margin-left: 480px; }
+  margin: 0 -480px 1.5em 480px; }
 
 .push-13 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -520px;
-  margin-bottom: 1.5em;
-  margin-left: 520px; }
+  margin: 0 -520px 1.5em 520px; }
 
 .push-14 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -560px;
-  margin-bottom: 1.5em;
-  margin-left: 560px; }
+  margin: 0 -560px 1.5em 560px; }
 
 .push-15 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -600px;
-  margin-bottom: 1.5em;
-  margin-left: 600px; }
+  margin: 0 -600px 1.5em 600px; }
 
 .push-16 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -640px;
-  margin-bottom: 1.5em;
-  margin-left: 640px; }
+  margin: 0 -640px 1.5em 640px; }
 
 .push-17 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -680px;
-  margin-bottom: 1.5em;
-  margin-left: 680px; }
+  margin: 0 -680px 1.5em 680px; }
 
 .push-18 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -720px;
-  margin-bottom: 1.5em;
-  margin-left: 720px; }
+  margin: 0 -720px 1.5em 720px; }
 
 .push-19 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -760px;
-  margin-bottom: 1.5em;
-  margin-left: 760px; }
+  margin: 0 -760px 1.5em 760px; }
 
 .push-20 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -800px;
-  margin-bottom: 1.5em;
-  margin-left: 800px; }
+  margin: 0 -800px 1.5em 800px; }
 
 .push-21 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -840px;
-  margin-bottom: 1.5em;
-  margin-left: 840px; }
+  margin: 0 -840px 1.5em 840px; }
 
 .push-22 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -880px;
-  margin-bottom: 1.5em;
-  margin-left: 880px; }
+  margin: 0 -880px 1.5em 880px; }
 
 .push-23 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -920px;
-  margin-bottom: 1.5em;
-  margin-left: 920px; }
+  margin: 0 -920px 1.5em 920px; }
 
 .push-24 {
-  display: inline;
-  float: right;
-  position: relative;
-  margin-top: 0;
-  margin-right: -960px;
-  margin-bottom: 1.5em;
-  margin-left: 960px; }
+  margin: 0 -960px 1.5em 960px; }
 
 .showgrid {
   background: url(grid.png); }
@@ -1318,13 +1111,13 @@ ul#product-thumbnails {
   float: left;
   margin-right: 10px;
   width: 470px; }
-  * html #signup #new-customer,   * html #login #existing-customer {
+  * html #signup #new-customer, * html #login #existing-customer {
     overflow-x: hidden; }
-  #signup #new-customer h2,   #login #existing-customer h2 {
+  #signup #new-customer h2, #login #existing-customer h2 {
     margin-bottom: .25em; }
-  #signup #new-customer p,   #login #existing-customer p {
+  #signup #new-customer p, #login #existing-customer p {
     margin-bottom: 10px; }
-    #signup #new-customer p input.title,     #login #existing-customer p input.title {
+    #signup #new-customer p input.title, #login #existing-customer p input.title {
       padding: 3px;
       margin: 0px; }
 
@@ -1337,11 +1130,11 @@ ul#product-thumbnails {
   background: #F4B4B4 url(/images/shadow_top.png) repeat-x scroll 0pt -50px;
   border: 1px solid #000;
   color: #000; }
-  .formError p,   .errorExplanation p {
+  .formError p, .errorExplanation p {
     margin: 0px; }
-  .formError ul,   .errorExplanation ul {
+  .formError ul, .errorExplanation ul {
     margin-bottom: 0px; }
-  .formError h2,   .errorExplanation h2 {
+  .formError h2, .errorExplanation h2 {
     font-weight: bold;
     font-size: 1.0em;
     margin: 0px; }
@@ -1394,20 +1187,20 @@ div#checkout label.radio {
   display: inline; }
 div#checkout div#methods p, div#checkout div#registration_choice p {
   margin-bottom: 7px; }
-  div#checkout div#methods p input, div#checkout div#methods p label,   div#checkout div#registration_choice p input, div#checkout div#registration_choice p label {
+  div#checkout div#methods p input, div#checkout div#methods p label, div#checkout div#registration_choice p input, div#checkout div#registration_choice p label {
     display: inline;
     float: none; }
-  div#checkout div#methods p label,   div#checkout div#registration_choice p label {
+  div#checkout div#methods p label, div#checkout div#registration_choice p label {
     margin: 0px 0px 0px 5px;
     top: -1px;
     width: 300px; }
-  div#checkout div#methods p input,   div#checkout div#registration_choice p input {
+  div#checkout div#methods p input, div#checkout div#registration_choice p input {
     width: 15px; }
 div#checkout #registration {
   background: transparent url(/images/steps/1.png) top right no-repeat; }
   div#checkout #registration.completed, div#checkout #registration.disabled {
     background-image: none; }
-    div#checkout #registration.completed h2,     div#checkout #registration.disabled h2 {
+    div#checkout #registration.completed h2, div#checkout #registration.disabled h2 {
       background: transparent url(/images/steps/1_small.png) top left no-repeat; }
   div#checkout #registration div#registration_choice {
     float: left;
@@ -1424,7 +1217,7 @@ div#checkout #billing {
   background: transparent url(/images/steps/2.png) top right no-repeat; }
   div#checkout #billing.completed, div#checkout #billing.disabled {
     background-image: none; }
-    div#checkout #billing.completed h2,     div#checkout #billing.disabled h2 {
+    div#checkout #billing.completed h2, div#checkout #billing.disabled h2 {
       background: transparent url(/images/steps/2_small.png) top left no-repeat; }
 div#checkout #shipping {
   background: transparent url(/images/steps/3.png) top right no-repeat; }
@@ -1435,7 +1228,7 @@ div#checkout #shipping {
     width: 12px; }
   div#checkout #shipping.completed, div#checkout #shipping.disabled {
     background-image: none; }
-    div#checkout #shipping.completed h2,     div#checkout #shipping.disabled h2 {
+    div#checkout #shipping.completed h2, div#checkout #shipping.disabled h2 {
       background: transparent url(/images/steps/3_small.png) top left no-repeat;
       padding-left: 32px; }
 div#checkout #shipping_method {
@@ -1444,7 +1237,7 @@ div#checkout #shipping_method {
     padding-top: 0px; }
   div#checkout #shipping_method.completed, div#checkout #shipping_method.disabled {
     background-image: none; }
-    div#checkout #shipping_method.completed h2,     div#checkout #shipping_method.disabled h2 {
+    div#checkout #shipping_method.completed h2, div#checkout #shipping_method.disabled h2 {
       background: transparent url(/images/steps/4_small.png) top left no-repeat; }
   div#checkout #shipping_method div.error {
     display: none; }
@@ -1452,7 +1245,7 @@ div#checkout #payment {
   background: transparent url(/images/steps/5.png) top right no-repeat; }
   div#checkout #payment.completed, div#checkout #payment.disabled {
     background-image: none; }
-    div#checkout #payment.completed h2,     div#checkout #payment.disabled h2 {
+    div#checkout #payment.completed h2, div#checkout #payment.disabled h2 {
       background: transparent url(/images/steps/5_small.png) top left no-repeat; }
   div#checkout #payment p select {
     width: 75px; }
@@ -1460,7 +1253,7 @@ div#checkout #confirmation {
   background: transparent url(/images/steps/6.png) top right no-repeat; }
   div#checkout #confirmation.completed, div#checkout #confirmation.disabled {
     background-image: none; }
-    div#checkout #confirmation.completed h2,     div#checkout #confirmation.disabled h2 {
+    div#checkout #confirmation.completed h2, div#checkout #confirmation.disabled h2 {
       background: transparent url(/images/steps/6_small.png) top left no-repeat; }
   div#checkout #confirmation table.order-summary .price, div#checkout #confirmation table.order-summary .qty {
     width: 165px; }
@@ -1529,36 +1322,35 @@ a.button, input.button {
   height: auto;
   cursor: pointer; }
   button.primary,
-  a.button.primary,   input.button.primary {
+  a.button.primary, input.button.primary {
     font-weight: bold;
     color: #000; }
   button:hover,
-  a.button:hover,   input.button:hover {
+  a.button:hover, input.button:hover {
     background-image: url(/images/buttons/bg-button-hover.png) !important; }
   button.large,
-  a.button.large,   input.button.large {
+  a.button.large, input.button.large {
     font-size: 1.4em !important;
     line-height: 1.4em;
     -moz-border-radius: 5px;
     -webkit-border-radius: 5px; }
   button.small,
-  a.button.small,   input.button.small {
+  a.button.small, input.button.small {
     font-size: .9em;
     line-height: 1.4em;
     padding: 5px 10px;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px; }
     button.small img,
-    a.button.small img,     input.button.small img {
+    a.button.small img, input.button.small img {
       margin: 0 3px 0 0 !important; }
   button.update img,
   button.checkout img,
-  a.button.update img,
-  a.button.checkout img,   input.button.update img,
-  input.button.checkout img {
+  a.button.update img, input.button.update img,
+  a.button.checkout img, input.button.checkout img {
     margin-right: 7px; }
   button img,
-  a.button img,   input.button img {
+  a.button img, input.button img {
     vertical-align: middle; }
 
 input.title {