spree_core 1.0.0.rc3 → 1.0.0.rc4

data/app/views/spree/admin/images/index.html.erb

@@ -2,7 +2,7 @@
 
 <%= render :partial => 'spree/admin/shared/product_tabs', :locals => {:current => 'Images'} %>
 
-<table class="index sortable" data-hook="images_table">
+<table class="index sortable" data-hook="images_table" data-sortable-link="<%= update_positions_admin_product_images_url(@product) %>">
   <tr data-hook="images_header">
     <th><%= t(:thumbnail) %></th>
     <% if @product.has_variants? %>
@@ -13,7 +13,7 @@
   </tr>
 
   <% @product.images.each do |image| %>
-    <tr id="<%= dom_id(image) %>" data-hook="images_row">
+    <tr id="spree_image_<%= image.id %>" data-hook="images_row">
       <td>
         <span class="handle"></span>
         <%= link_to image_tag(image.attachment.url(:mini)), image.attachment.url(:product) %>
@@ -32,7 +32,7 @@
 
   <% @product.variants.each do |variant| %>
     <% variant.images.each do |image| %>
-      <tr id="<%= dom_id(image) %>" data-hook="images_row">
+      <tr id="spree_image_<%= image.id %>" data-hook="images_row">
         <td><span class="handle"></span><%= link_to image_tag(image.attachment.url(:mini)), image.attachment.url(:product) %></td>
         <% if @product.has_variants? %>
           <td><%= variant.options_text %></td>
@@ -52,4 +52,4 @@
 <br />
 <p data-hook="links">
     <%= link_to icon('add') + ' ' + t(:new_image), new_admin_product_image_url(@product), :id => 'new_image_link' %>
-</p>
+</p>

data/app/views/spree/admin/option_types/index.html.erb

@@ -13,14 +13,14 @@
 
 <div id="new_option_type"></div>
 
-<table class="index sortable" id="listing_option_types" data-hook>
+<table class="index sortable" id="listing_option_types" data-hook data-sortable-link="<%= update_positions_admin_option_types_url %>">
   <tr data-hook="option_header">
     <th><%= t(:name) %></th>
     <th><%= t(:presentation) %></th>
     <th></th>
   </tr>
   <% @option_types.each do |option_type| %>
-    <tr class="spree_option_type" id="<%= dom_id option_type %>" data-hook="option_row">
+    <tr class="spree_option_type" id="spree_option_type_<%= option_type.id %>" data-hook="option_row">
       <td><span class="handle"></span> <%= option_type.name %></td>
       <td class="presentation"><%= option_type.presentation %></td>
       <td class="actions">

data/app/views/spree/admin/payment_methods/index.html.erb

@@ -37,3 +37,5 @@
     <% end %>
   </tbody>
 </table>
+
+<%= render :partial => 'spree/admin/banners/gateway' %>

data/app/views/spree/admin/variants/index.html.erb

@@ -2,7 +2,7 @@
 
 <%= render :partial => 'spree/admin/shared/product_tabs', :locals => {:current => 'Variants'} %>
 
-<table class="index sortable">
+<table class="index sortable" data-sortable-link="<%= update_positions_admin_product_variants_path(@product) %>">
   <tr data-hook="variants_header">
     <th><%= t(:options) %></th>
     <th><%= t(:price) %></th>
@@ -16,7 +16,7 @@
   <% @variants.each do |variant| %>
     <!-- you can skip variant with no options: that's just the default variant that all products have -->
     <% next if variant.option_values.empty? %>
-    <tr id="<%= dom_id(variant) %>" <%= 'style="color:red;"' if variant.deleted? %> data-hook="variants_row">
+    <tr id="spree_variant_<%= variant.id %>" <%= 'style="color:red;"' if variant.deleted? %> data-hook="variants_row">
       <td><span class="handle"></span> <%= variant.options_text %></td>
       <td><%= variant.price %></td>
       <td><%= variant.sku %></td>

data/app/views/spree/orders/_line_item.html.erb

@@ -1,9 +1,9 @@
 <tr class="<%= cycle('', 'alt') %>">
   <td data-hook="cart_item_image">
     <% if variant.images.length == 0 %>
-      <%= small_image(variant.product) %>
+      <%= link_to small_image(variant.product), variant.product %>
     <% else %>
-      <%= image_tag variant.images.first.attachment.url(:small) %>
+      <%= link_to image_tag(variant.images.first.attachment.url(:small)), variant.product %>
     <% end %>
   </td>
   <td data-hook="cart_item_description">
@@ -17,13 +17,13 @@
     <%= truncate(variant.product.description, :length => 100, :omission => "...") %>
   </td>
   <td data-hook="cart_item_price">
-    <%= number_to_currency line_item.variant.price %>
+    <%= number_to_currency line_item.price %>
   </td>
   <td data-hook="cart_item_quantity">
     <%= item_form.number_field :quantity, :min => 0, :class => "line_item_quantity", :size => 5 %>
   </td>
   <td data-hook="cart_item_total">
-    <%= number_to_currency(line_item.variant.price * line_item.quantity) unless line_item.quantity.nil? %>
+    <%= number_to_currency(line_item.price * line_item.quantity) unless line_item.quantity.nil? %>
   </td>
   <td data-hook="cart_item_delete">
     <%= link_to image_tag('icons/delete.png'), '#', :class => 'delete', :id => "delete_#{dom_id(line_item)}" %>

data/app/views/spree/shared/_order_details.html.erb

@@ -46,8 +46,7 @@
   
   <thead id="line-items" data-hook>
     <tr data-hook="order_details_line_items_headers">
-      <th> </th>
-      <th><%= t(:item_description) %></th>
+      <th colspan="2"><%= t(:item) %></th>
       <th class="price"><%= t(:price) %></th>
       <th class="qty"><%= t(:qty) %></th>
       <th class="total"><span><%= t(:total) %></span></th>
@@ -59,19 +58,19 @@
       <tr data-hook="order_details_line_item_row">
         <td data-hook="order_item_image" width="20%">
           <% if item.variant.images.length == 0 %>
-            <%= small_image(item.variant.product) %>
+            <%= link_to small_image(item.variant.product), item.variant.product %>
           <% else %>
-            <%= image_tag item.variant.images.first.attachment.url(:small) %>
+            <%= link_to image_tag(item.variant.images.first.attachment.url(:small)), item.variant.product %>
           <% end %>
         </td>
-        <td width="80%">
-          <h6><%= item.variant.product.name %></h6>
+        <td data-hook="order_item_description">
+          <h4><%= item.variant.product.name %></h4>
           <%= truncate(item.variant.product.description, :length => 100, :omission => "...") %>
           <%= "(" + variant_options(item.variant) + ")" unless item.variant .option_values.empty? %>
         </td>
-        <td class="price"><span><%= number_to_currency item.price %></span></td>
-        <td class="qty"><%= item.quantity %></td>
-        <td class="total"><span><%= number_to_currency (item.price * item.quantity) %></span></td>
+        <td data-hook="order_item_price" class="price"><span><%= number_to_currency item.price %></span></td>
+        <td data-hook="order_item_qty"><%= item.quantity %></td>
+        <td data-hook="order_item_total" class="total"><span><%= number_to_currency (item.price * item.quantity) %></span></td>
       </tr>
     <% end %>
   </tbody>

data/config/locales/en.yml

@@ -358,6 +358,7 @@ en:
   didnt_receive_unlock_instructions: "Didn't receive unlock instructions?"
   discount_amount: "Discount Amount"
   display: Display
+  dismiss_banner: "No. Thanks! I'm not interested, do not display this message again"
   edit: Edit
   editing_billing_integration: Editing Billing Integration
   editing_category: "Editing Category"
@@ -399,6 +400,7 @@ en:
   errors_prohibited_this_record_from_being_saved:
     one: "1 error prohibited this record from being saved"
     other: "%{count} errors prohibited this record from being saved"
+  error_user_destroy_with_orders: "Users with completed orders may not be deleted"
   event: Event
   events:
     spree:
@@ -645,6 +647,8 @@ en:
   payment_methods: Payment Methods
   payment_methods_setting_description: Configure methods customers can use to pay.
   payment_processing_failed: "Payment could not be processed, please check the details you entered"
+  payment_processor_choose_banner_text: "If you need help choosing a payment processor, please visit"
+  payment_processor_choose_link: "our payments page"
   payment_state: Payment State
   payment_states:
     balance_due: balance due

data/config/routes.rb

@@ -54,12 +54,14 @@ Spree::Core::Engine.routes.draw do
   #   map.resources :taxons
   #
 
-
-
   namespace :admin do
     resources :adjustments
     resources :zones
-    resources :users
+    resources :users do
+      member do
+        post :dismiss_banner
+      end
+    end
     resources :countries do
       resources :states
     end
@@ -104,6 +106,7 @@ Spree::Core::Engine.routes.draw do
         end
       end
     end
+
     resources :option_types do
       collection do
         post :update_positions

data/db/migrate/20120203153759_add_deleted_at_to_tax_category.rb

@@ -0,0 +1,5 @@
+class AddDeletedAtToTaxCategory < ActiveRecord::Migration
+  def change
+    add_column :spree_tax_categories, :deleted_at, :datetime
+  end
+end

data/lib/spree/core/middleware/seo_assist.rb

@@ -17,7 +17,7 @@ module Spree
           if !taxon_id.blank? && !taxon_id.is_a?(Hash) && taxon = Taxon.find(taxon_id)
             params.delete('taxon')
 
-            return build_response(params, "#{request.script_name}/t/#{taxon.permalink}" )
+            return build_response(params, "#{request.script_name}t/#{taxon.permalink}" )
           elsif env["PATH_INFO"] =~ /^\/(t|products)(\/\S+)?\/$/
             #ensures no trailing / for taxon and product urls
 

data/lib/spree/core/user_banners.rb

@@ -0,0 +1,25 @@
+# Utility methods for dealing with user banners and saving
+# an array of dismissed banners per user
+# use symbols as banner id
+module Spree
+  module Core
+    module UserBanners
+      def self.included(base)
+        base.preference :dismissed_banners, :text, :default => ''
+      end
+
+      def dismissed_banner_ids
+        dismissed = self.preferred_dismissed_banners
+        dismissed.split(',').map(&:to_sym)
+      end
+
+      def dismiss_banner(banner_id)
+        self.preferred_dismissed_banners = dismissed_banner_ids.push(banner_id.to_sym).uniq.join(',')
+      end
+
+      def dismissed_banner?(banner_id)
+        dismissed_banner_ids.include? banner_id.to_sym
+      end
+    end
+  end
+end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.0.0.rc3"
+    "1.0.0.rc4"
   end
 end

data/vendor/assets/stylesheets/html5reset.css

@@ -0,0 +1,177 @@
+/*
+	HTML5 Reset :: style.css
+	----------------------------------------------------------
+	We have learned much from/been inspired by/taken code where offered from:
+	
+	Eric Meyer					:: http://ericmeyer.com
+	HTML5 Doctor				:: http://html5doctor.com
+	and the HTML5 Boilerplate	:: http://html5boilerplate.com
+	
+-------------------------------------------------------------------------------*/
+
+/* Let's default this puppy out
+-------------------------------------------------------------------------------*/
+
+html, body, body div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, small, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, figure, footer, header, hgroup, menu, nav, section, time, mark, audio, video {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	font-size: 100%;
+	vertical-align: baseline;
+	background: transparent;
+}									
+
+article, aside, figure, footer, header, hgroup, nav, section {display: block;}
+
+/* Responsive images and other embedded objects
+   Note: keeping IMG here will cause problems if you're using foreground images as sprites.
+   If this default setting for images is causing issues, you might want to replace it with a .responsive class instead. */
+img,
+object,
+embed {max-width: 100%;}
+
+/* force a vertical scrollbar to prevent a jumpy page */
+html {overflow-y: scroll;}
+
+/* we use a lot of ULs that aren't bulleted. 
+	don't forget to restore the bullets within content. */
+ul {list-style: none;}
+
+blockquote, q {quotes: none;}
+
+blockquote:before, 
+blockquote:after, 
+q:before, 
+q:after {content: ''; content: none;}
+
+a {margin: 0; padding: 0; font-size: 100%; vertical-align: baseline; background: transparent;}
+
+del {text-decoration: line-through;}
+
+abbr[title], dfn[title] {border-bottom: 1px dotted #000; cursor: help;}
+
+/* tables still need cellspacing="0" in the markup */
+table {border-collapse: collapse; border-spacing: 0;}
+th {font-weight: bold; vertical-align: bottom;}
+td {font-weight: normal; vertical-align: top;}
+
+hr {display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin: 1em 0; padding: 0;}
+
+input, select {vertical-align: middle;}
+
+pre {
+	white-space: pre; /* CSS2 */
+	white-space: pre-wrap; /* CSS 2.1 */
+	white-space: pre-line; /* CSS 3 (and 2.1 as well, actually) */
+	word-wrap: break-word; /* IE */
+}
+
+input[type="radio"] {vertical-align: text-bottom;}
+input[type="checkbox"] {vertical-align: bottom; *vertical-align: baseline;}
+.ie6 input {vertical-align: text-bottom;}
+
+select, input, textarea {font: 99% sans-serif;}
+
+table {font-size: inherit; font: 100%;}
+ 
+/* Accessible focus treatment
+	people.opera.com/patrickl/experiments/keyboard/test */
+a:hover, a:active {outline: none;}
+
+small {font-size: 85%;}
+
+strong, th {font-weight: bold;}
+
+td, td img {vertical-align: top;} 
+
+/* Make sure sup and sub don't screw with your line-heights
+	gist.github.com/413930 */
+sub, sup {font-size: 75%; line-height: 0; position: relative;}
+sup {top: -0.5em;}
+sub {bottom: -0.25em;}
+
+/* standardize any monospaced elements */
+pre, code, kbd, samp {font-family: monospace, sans-serif;}
+
+/* hand cursor on clickable elements */
+.clickable,
+label, 
+input[type=button], 
+input[type=submit], 
+button {cursor: pointer;}
+
+/* Webkit browsers add a 2px margin outside the chrome of form elements */
+button, input, select, textarea {margin: 0;}
+
+/* make buttons play nice in IE */
+button {width: auto; overflow: visible;}
+ 
+/* scale images in IE7 more attractively */
+.ie7 img {-ms-interpolation-mode: bicubic;}
+
+/* prevent BG image flicker upon hover */
+.ie6 html {filter: expression(document.execCommand("BackgroundImageCache", false, true));}
+
+/* let's clear some floats */
+.clearfix:before, .clearfix:after { content: "\0020"; display: block; height: 0; overflow: hidden; }  
+.clearfix:after { clear: both; }  
+.clearfix { zoom: 1; }  
+
+
+
+/* Ok, this is where the fun starts.
+-------------------------------------------------------------------------------*/
+
+/* new Linux- and Windows-friendly sans-serif font stack: http://mky.be/fontstack */
+body {font: 13px Helmet, Freesans, sans-serif;}
+
+/* using local fonts? make sure to read up on Paul Irish's 
+	Bulletproof @font-face syntax: http://mky.be/font-face/bulletproof/ */
+
+/* we like off-black for text */
+body, select, input, textarea {color: #333;}
+
+a {color: #03f;}
+a:hover {color: #69f;}
+
+/* Custom text-selection colors (remove any text shadows: twitter.com/miketaylr/status/12228805301) */
+::-moz-selection{background: #fcd700; color: #fff; text-shadow: none;}
+::selection {background: #fcd700; color: #fff; text-shadow: none;} 
+
+/*	j.mp/webkit-tap-highlight-color */
+a:link {-webkit-tap-highlight-color: #fcd700;} 
+
+ins {background-color: #fcd700; color: #000; text-decoration: none;}
+mark {background-color: #fcd700; color: #000; font-style: italic; font-weight: bold;}
+
+
+
+
+
+/* Print styles!
+-------------------------------------------------------------------------------*/
+@media print {
+
+
+
+}
+
+
+/* Media queries!
+-------------------------------------------------------------------------------*/
+
+/* Consider this: www.cloudfour.com/css-media-query-for-mobile-is-fools-gold/ */
+@media screen and (max-device-width: 480px) {
+	
+		
+}
+
+@media all and (orientation: portrait) {
+	
+}
+
+@media all and (orientation: landscape) {
+	
+}
+

data/vendor/assets/stylesheets/{jquery.formalize.css → jquery.formalize.css.erb}

@@ -72,7 +72,7 @@ a.button {
   -ms-background-clip: padding-box;
   -o-background-clip: padding-box;
   background-clip: padding-box;
-  background: #dddddd url('../images/button.png?1298351022') repeat-x;
+  background: #dddddd url(<%= asset_path("jquery.formalize/button.png") %>) repeat-x;
   background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #dddddd));
   background-image: -webkit-linear-gradient(#ffffff, #dddddd);
   background-image: -moz-linear-gradient(#ffffff, #dddddd);
@@ -257,7 +257,7 @@ select[size="1"] {
   select,
   select[size="0"],
   select[size="1"] {
-    background-image: url('../images/select_arrow.gif?1298351050');
+    background-image: url(<%= asset_path("jquery.formalize/select_arrow.gif") %>);
     background-repeat: no-repeat;
     background-position: right center;
     padding-right: 20px;
@@ -320,7 +320,7 @@ textarea::-moz-focus-inner {
 
 .ie6_button,
 * html button {
-  background: #dddddd url('../images/button.png?1298351022') repeat-x;
+  background: #dddddd url(<%= asset_path("jquery.formalize/button.png") %>) repeat-x;
   border: 1px solid;
   border-color: #dddddd #bbbbbb #999999;
   cursor: pointer;

data/{app/assets/stylesheets/store/base.css → vendor/assets/stylesheets/skeleton.css}

@@ -1,156 +1,3 @@
-/* Fonts from Google */
-@import url(http://fonts.googleapis.com/css?family=Ubuntu:400,700,400italic,700italic|&subset=latin,cyrillic,greek,greek-ext,latin-ext,cyrillic-ext);
-
-/*
-  HTML5 Reset :: style.css
-  ----------------------------------------------------------
-  We have learned much from/been inspired by/taken code where offered from:
-  
-  Eric Meyer          :: http://ericmeyer.com
-  HTML5 Doctor        :: http://html5doctor.com
-  and the HTML5 Boilerplate :: http://html5boilerplate.com
-  
--------------------------------------------------------------------------------*/
-
-/* Let's default this puppy out
--------------------------------------------------------------------------------*/
-
-html, body, body div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, small, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, figure, footer, header, hgroup, menu, nav, section, time, mark, audio, video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  outline: 0;
-  font-size: 100%;
-  vertical-align: baseline;
-  background: transparent;  
-}                 
-
-article, aside, figure, footer, header, hgroup, nav, section {display: block;}
-
-/* Responsive images and other embedded objects
-   Note: keeping IMG here will cause problems if you're using foreground images as sprites.
-   If this default setting for images is causing issues, you might want to replace it with a .responsive class instead. */
-img,
-object,
-embed {max-width: 100%;}
-
-/* force a vertical scrollbar to prevent a jumpy page */
-html {overflow-y: scroll;}
-
-/* we use a lot of ULs that aren't bulleted. 
-  don't forget to restore the bullets within content. */
-ul {list-style: none;}
-
-blockquote, q {quotes: none;}
-
-blockquote:before, 
-blockquote:after, 
-q:before, 
-q:after {content: ''; content: none;}
-
-a {margin: 0; padding: 0; font-size: 100%; vertical-align: baseline; background: transparent;}
-
-del {text-decoration: line-through;}
-
-abbr[title], dfn[title] {border-bottom: 1px dotted #000; cursor: help;}
-
-/* tables still need cellspacing="0" in the markup */
-table {border-collapse: collapse; border-spacing: 0;}
-th {font-weight: bold; vertical-align: bottom;}
-td {font-weight: normal; vertical-align: top;}
-
-hr {display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin: 1em 0; padding: 0;}
-
-input, select {vertical-align: middle;}
-
-pre {
-  white-space: pre; /* CSS2 */
-  white-space: pre-wrap; /* CSS 2.1 */
-  white-space: pre-line; /* CSS 3 (and 2.1 as well, actually) */
-  word-wrap: break-word; /* IE */
-}
-
-input[type="radio"] {vertical-align: text-bottom;}
-input[type="checkbox"] {vertical-align: bottom; *vertical-align: baseline;}
-.ie6 input {vertical-align: text-bottom;}
-
-select, input, textarea {font: 99% sans-serif;}
-
-table {font-size: inherit; font: 100%;}
- 
-/* Accessible focus treatment
-  people.opera.com/patrickl/experiments/keyboard/test */
-a:hover, a:active {outline: none;}
-
-small {font-size: 85%;}
-
-strong, th {font-weight: bold;}
-
-td, td img {vertical-align: top;} 
-
-/* Make sure sup and sub don't screw with your line-heights
-  gist.github.com/413930 */
-sub, sup {font-size: 75%; line-height: 0; position: relative;}
-sup {top: -0.5em;}
-sub {bottom: -0.25em;}
-
-/* standardize any monospaced elements */
-pre, code, kbd, samp {font-family: monospace, sans-serif;}
-
-/* hand cursor on clickable elements */
-.clickable,
-label, 
-input[type=button], 
-input[type=submit], 
-button {cursor: pointer;}
-
-/* Webkit browsers add a 2px margin outside the chrome of form elements */
-button, input, select, textarea {margin: 0;}
-
-/* make buttons play nice in IE */
-button {width: auto; overflow: visible;}
- 
-/* scale images in IE7 more attractively */
-.ie7 img {-ms-interpolation-mode: bicubic;}
-
-/* prevent BG image flicker upon hover */
-.ie6 html {filter: expression(document.execCommand("BackgroundImageCache", false, true));}
-
-/* let's clear some floats */
-.clearfix:before, .clearfix:after { content: "\0020"; display: block; height: 0; overflow: hidden; }  
-.clearfix:after { clear: both; }  
-.clearfix { zoom: 1; }  
-
-/* reset webkit searchfield */
-input[type=search]::-webkit-search-decoration,
-input[type=search]::-webkit-search-cancel-button,
-input[type=search]::-webkit-search-results-button,
-input[type=search]::-webkit-search-results-decoration {
-  display: none;
-}
-
-input[type=search] {
-  /* the webkit overrides need to stay at the top */
-  -webkit-appearance: textfield;
-  -webkit-box-sizing: content-box;
-  /* your styles here */
-}
-
-/* Ok, this is where the fun starts.
--------------------------------------------------------------------------------*/
-
-/* new Linux- and Windows-friendly sans-serif font stack: http://mky.be/fontstack */
-body {font: 13px Helmet, Freesans, sans-serif;}
-
-/* using local fonts? make sure to read up on Paul Irish's 
-  Bulletproof @font-face syntax: http://mky.be/font-face/bulletproof/ */
-
-/* we like off-black for text */
-body, select, input, textarea {color: #333;}
-
-a {color: #03f;}
-a:hover {color: #69f;}
-
 /*
 * Skeleton V1.1
 * Copyright 2011, Dave Gamache
@@ -175,7 +22,8 @@ a:hover {color: #69f;}
 ================================================== */
 
     .container                                  { position: relative; width: 960px; margin: 0 auto; padding: 0; }
-    .column, .columns                           { float: left; display: inline; margin-left: 10px; margin-right: 10px; }
+    .container .column,
+    .container .columns                         { float: left; display: inline; margin-left: 10px; margin-right: 10px; }
     .row                                        { margin-bottom: 20px; }
 
     /* Nested Column Classes */
@@ -183,7 +31,8 @@ a:hover {color: #69f;}
     .column.omega, .columns.omega               { margin-right: 0; }
 
     /* Base Grid */
-    .container .one.column                      { width: 40px;  }
+    .container .one.column,
+    .container .one.columns                     { width: 40px;  }
     .container .two.columns                     { width: 100px; }
     .container .three.columns                   { width: 160px; }
     .container .four.columns                    { width: 220px; }
@@ -233,8 +82,10 @@ a:hover {color: #69f;}
         .container .columns                         { margin-left: 10px; margin-right: 10px;  }
         .column.alpha, .columns.alpha               { margin-left: 0; margin-right: 10px; }
         .column.omega, .columns.omega               { margin-right: 0; margin-left: 10px; }
+        .alpha.omega                                { margin-left: 0; margin-right: 0; }
 
-        .container .one.column                      { width: 28px; }
+        .container .one.column,
+        .container .one.columns                     { width: 28px; }
         .container .two.columns                     { width: 76px; }
         .container .three.columns                   { width: 124px; }
         .container .four.columns                    { width: 172px; }
@@ -280,9 +131,11 @@ a:hover {color: #69f;}
 
     @media only screen and (max-width: 767px) {
         .container { width: 300px; }
-        .columns, .column { margin: 0; }
+        .container .columns,
+        .container .column { margin: 0; }
 
         .container .one.column,
+        .container .one.columns,
         .container .two.columns,
         .container .three.columns,
         .container .four.columns,
@@ -328,9 +181,11 @@ a:hover {color: #69f;}
 
     @media only screen and (min-width: 480px) and (max-width: 767px) {
         .container { width: 420px; }
-        .columns, .column { margin: 0; }
+        .container .columns,
+        .container .column { margin: 0; }
 
         .container .one.column,
+        .container .one.columns,
         .container .two.columns,
         .container .three.columns,
         .container .four.columns,
@@ -384,4 +239,4 @@ a:hover {color: #69f;}
       visibility: hidden;
       width: 0;
       height: 0;
-    }
+    }