solidus_backend 2.0.3 → 2.1.0.beta1

data/app/views/spree/admin/shared/named_types/_form.html.erb

@@ -1,6 +1,6 @@
 <div data-hook="admin_named_type_form_fields" class="row">
   <div class="row">
-    <div class="alpha four columns">
+    <div class="col-xs-3">
       <%= f.field_container :name do %>
         <%= f.label :name, class: 'required' %><br />
         <%= f.text_field :name, :class => 'fullwidth' %>

data/app/views/spree/admin/shared/named_types/_index.html.erb

@@ -48,7 +48,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
+  <div class="col-xs-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: resource,
                  new_resource_url: new_object_url %>

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

@@ -43,7 +43,7 @@
   </tbody>
 </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
+  <div class="col-xs-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::ShippingCategory,
                  new_resource_url: new_object_url %>

data/app/views/spree/admin/shipping_methods/_form.html.erb

@@ -1,5 +1,5 @@
-<div data-hook="admin_shipping_method_form_fields" class="alpha twelve columns">
-  <div data-hook="admin_shipping_method_form_name_field" class="alpha six columns">
+<div data-hook="admin_shipping_method_form_fields" class="row">
+  <div data-hook="admin_shipping_method_form_name_field" class="col-xs-5">
     <%= f.field_container :name do %>
       <%= f.label :name %><br />
       <%= f.text_field :name, :class => 'fullwidth' %>
@@ -7,51 +7,39 @@
     <% end %>
   </div>
 
-  <div data-hook="admin_shipping_method_form_display_field" class="omega six columns">
-    <%= f.field_container :display_on do %>
-      <%= f.label :display_on %><br />
-      <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, {:class => 'select2 fullwidth'}) %>
-      <%= error_message_on :shipping_method, :display_on %>
+  <div data-hook="admin_shipping_method_form_internal_name_field" class="col-xs-5">
+    <%= f.field_container :admin_name do %>
+      <%= f.label :admin_name %><br />
+      <%= f.text_field :admin_name, :class => 'fullwidth', :label => false  %>
+      <%= error_message_on :shipping_method, :admin_name %>
     <% end %>
   </div>
 
-  <div class="alpha omega twelve columns">
-    <div data-hook="admin_shipping_method_form_internal_name_field" class="alpha six columns">
-      <%= f.field_container :admin_name do %>
-        <%= f.label :admin_name %><br />
-        <%= f.text_field :admin_name, :class => 'fullwidth', :label => false  %>
-        <%= error_message_on :shipping_method, :admin_name %>
-      <% end %>
-    </div>
-
-    <div data-hook="admin_shipping_method_form_code" class="omega six columns">
-      <%= f.field_container :code do %>
-        <%= f.label :code %><br />
-        <%= f.text_field :code, :class => 'fullwidth', :label => false  %>
-        <%= error_message_on :shipping_method, :code %>
-      <% end %>
-    </div>
+  <div data-hook="admin_shipping_method_form_code" class="col-xs-5">
+    <%= f.field_container :code do %>
+      <%= f.label :code %><br />
+      <%= f.text_field :code, :class => 'fullwidth', :label => false  %>
+      <%= error_message_on :shipping_method, :code %>
+    <% end %>
   </div>
 
-  <div class="alpha omega twelve columns">
-    <div class="alpha six columns">
-      <%= f.field_container :carrier do %>
-        <%= f.label :carrier %><br />
-        <%= f.text_field :carrier, :class => 'fullwidth', :label => false  %>
-        <%= error_message_on :shipping_method, :carrier %>
-      <% end %>
-    </div>
+  <div class="col-xs-5">
+    <%= f.field_container :carrier do %>
+      <%= f.label :carrier %><br />
+      <%= f.text_field :carrier, :class => 'fullwidth', :label => false  %>
+      <%= error_message_on :shipping_method, :carrier %>
+    <% end %>
+  </div>
 
-    <div class="omega six columns">
-      <%= f.field_container :service_level do %>
-        <%= f.label :service_level %><br />
-        <%= f.text_field :service_level, :class => 'fullwidth', :label => false  %>
-        <%= error_message_on :shipping_method, :service_level %>
-      <% end %>
-    </div>
+  <div class="col-xs-5">
+    <%= f.field_container :service_level do %>
+      <%= f.label :service_level %><br />
+      <%= f.text_field :service_level, :class => 'fullwidth', :label => false  %>
+      <%= error_message_on :shipping_method, :service_level %>
+    <% end %>
   </div>
 
-  <div data-hook="admin_shipping_method_form_tracking_url_field" class="alpha twelve columns">
+  <div data-hook="admin_shipping_method_form_tracking_url_field" class="col-xs-10">
     <%= f.field_container :tracking_url do %>
       <%= f.label :tracking_url %><br />
       <%= f.text_field :tracking_url, :class => 'fullwidth', :placeholder => Spree.t(:tracking_url_placeholder) %>
@@ -60,53 +48,58 @@
   </div>
 </div>
 
-<div class="alpha six columns">
-  <div data-hook="admin_shipping_method_form_availability_fields" class="alpha six columns">
-    <fieldset class="categories no-border-bottom">
-      <legend align="center"><%= plural_resource_name(Spree::ShippingCategory) %></legend>
-      <%= f.field_container :categories do %>
-        <% Spree::ShippingCategory.all.each do |category| %>
-          <%= label_tag do %>
-            <%= check_box_tag('shipping_method[shipping_categories][]', category.id, @shipping_method.shipping_categories.include?(category)) %>
-            <%= category.name %><br>
+<%= f.field_container :available_to_users do %>
+  <%= f.check_box(:available_to_users) %>
+  <%= f.label :available_to_users %>
+  <%= error_message_on :shipping_method, :available_to_users %>
+<% end %>
+
+<div class="row">
+  <div class="col-xs-5">
+    <div data-hook="admin_shipping_method_form_availability_fields">
+      <fieldset class="categories no-border-bottom">
+        <legend align="center"><%= plural_resource_name(Spree::ShippingCategory) %></legend>
+        <%= f.field_container :categories do %>
+          <% Spree::ShippingCategory.all.each do |category| %>
+            <%= label_tag do %>
+              <%= check_box_tag('shipping_method[shipping_categories][]', category.id, @shipping_method.shipping_categories.include?(category)) %>
+              <%= category.name %><br>
+            <% end %>
           <% end %>
+          <%= error_message_on :shipping_method, :shipping_category_id %>
         <% end %>
-        <%= error_message_on :shipping_method, :shipping_category_id %>
-      <% end %>
-    </fieldset>
-  </div>
+      </fieldset>
+    </div>
 
-  <div class="alpha six columns">
-    <fieldset class="no-border-bottom">
-      <legend align="center"><%= plural_resource_name(Spree::Zone) %></legend>
-      <%= f.field_container :zones do %>
-        <% shipping_method_zones = @shipping_method.zones.to_a %>
-        <% Spree::Zone.all.each do |zone| %>
-          <%= label_tag do %>
-            <%= check_box_tag('shipping_method[zones][]', zone.id, shipping_method_zones.include?(zone)) %>
-            <%= zone.name %>
+    <div>
+      <fieldset class="no-border-bottom">
+        <legend align="center"><%= plural_resource_name(Spree::Zone) %></legend>
+        <%= f.field_container :zones do %>
+          <% shipping_method_zones = @shipping_method.zones.to_a %>
+          <% Spree::Zone.all.each do |zone| %>
+            <%= label_tag do %>
+              <%= check_box_tag('shipping_method[zones][]', zone.id, shipping_method_zones.include?(zone)) %>
+              <%= zone.name %>
+            <% end %>
+            <br>
           <% end %>
-          <br>
+          <%= error_message_on :shipping_method, :zone_id %>
         <% end %>
-        <%= error_message_on :shipping_method, :zone_id %>
-      <% end %>
-    </fieldset>
+      </fieldset>
+    </div>
   </div>
-</div>
-
-<div data-hook="admin_shipping_method_form_calculator_fields" class="omega six columns">
-  <%= render :partial => 'spree/admin/shared/calculator_fields', :locals => { :f => f } %>
-</div>
-
-<div class="alpha six columns">
-  <div class="alpha six columns">
-    <fieldset class="tax_categories no-border-bottom">
-      <legend align="center"><%= Spree::TaxCategory.model_name.human %></legend>
-        <%= f.field_container :tax_categories do %>
-          <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, {include_blank: true}, class: "select2 fullwidth" %>
-          <%= error_message_on :shipping_method, :tax_category_id %>
-        <% end %>
-    </fieldset>
+  <div class="col-xs-5">
+    <div data-hook="admin_shipping_method_form_calculator_fields">
+      <%= render :partial => 'spree/admin/shared/calculator_fields', :locals => { :f => f } %>
+    </div>
+    <div>
+      <fieldset class="tax_categories no-border-bottom">
+        <legend align="center"><%= Spree::TaxCategory.model_name.human %></legend>
+          <%= f.field_container :tax_categories do %>
+            <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, {include_blank: true}, class: "select2 fullwidth" %>
+            <%= error_message_on :shipping_method, :tax_category_id %>
+          <% end %>
+      </fieldset>
+    </div>
   </div>
 </div>
-

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

@@ -27,7 +27,7 @@
         <th><%= Spree::ShippingMethod.human_attribute_name(:name) %></th>
         <th><%= Spree::Zone.model_name.human %></th>
         <th><%= Spree::Calculator.model_name.human %></th>
-        <th><%= Spree::ShippingMethod.human_attribute_name(:display_on) %></th>
+        <th><%= Spree::ShippingMethod.human_attribute_name(:available_to_users) %></th>
         <th data-hook="admin_shipping_methods_index_header_actions" class="actions"></th>
       </tr>
     </thead>
@@ -37,7 +37,7 @@
           <td class="align-center"><%= shipping_method.admin_name + ' / ' if shipping_method.admin_name.present? %><%= shipping_method.name %></td>
           <td class="align-center"><%= shipping_method.zones.collect(&:name).join(", ") if shipping_method.zones %></td>
           <td class="align-center"><%= shipping_method.calculator.description %></td>
-          <td class="align-center"><%= shipping_method.display_on.blank? ? Spree.t(:both) : Spree.t(shipping_method.display_on.downcase.tr(" ", "_")) %></td>
+          <td class="align-center"><%= shipping_method.available_to_users? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td data-hook="admin_shipping_methods_index_row_actions" class="actions">
             <% if can?(:update, shipping_method) %>
               <%= link_to_edit shipping_method, :no_text => true %>
@@ -52,7 +52,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
+  <div class="col-xs-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::ShippingMethod,
                  new_resource_url: new_object_url %>

data/app/views/spree/admin/states/_form.html.erb

@@ -1,11 +1,11 @@
 <div data-hook="admin_state_form_fields" class="row">
-  <div class="alpha six columns">
+  <div class="col-xs-6">
     <%= f.field_container :name do %>
       <%= f.label :name %>
       <%= f.text_field :name, :class => 'fullwidth' %>
     <% end %>
   </div>
-  <div class="omega six columns">
+  <div class="col-xs-6">
     <%= f.field_container :abbr do %>
       <%= f.label :abbr %>
       <%= f.text_field :abbr, :class => 'fullwidth' %>

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

@@ -13,11 +13,15 @@
   <% end %>
 <% end %>
 
-<div data-hook="country" class="field row">
-  <%= label_tag :country, Spree::Country.model_name.human %>
-  <select id="country" class='observe_field select2 fullwidth' data-base-url="<%=admin_states_path(:format => :js) %>?country_id=" data-update="#state-list">
-  <%= options_from_collection_for_select(@countries, :id, :name, @country.id) %>
-  </select>
+<div class="row">
+  <div class="col-xs-12">
+    <div data-hook="country" class="field">
+      <%= label_tag :country, Spree::Country.model_name.human %>
+      <select id="country" class='observe_field select2 fullwidth' data-base-url="<%=admin_states_path(:format => :js) %>?country_id=" data-update="#state-list">
+      <%= options_from_collection_for_select(@countries, :id, :name, @country.id) %>
+      </select>
+    </div>
+  </div>
 </div>
 
 <div id="new_state" data-hook>

data/app/views/spree/admin/stock_locations/_form.html.erb

@@ -1,5 +1,5 @@
 <div data-hook="admin_stock_locations_form_fields" class="row">
-  <div class="alpha nine columns" data-hook="stock_location_names">
+  <div class="col-xs-7" data-hook="stock_location_names">
     <div data-hook="stock_location_name">
       <%= f.field_container :name do %>
         <%= f.label :name, class: 'required' %><br />
@@ -20,7 +20,7 @@
     </div>
   </div>
 
-  <div class="omega three columns" data-hook="stock_location_status">
+  <div class="col-xs-3" data-hook="stock_location_status">
     <%= f.field_container :active do %>
       <label for="active"><%= Spree.t(:status) %></label>
       <ul>
@@ -56,44 +56,58 @@
     <% end %>
   </div>
 
-  <div class="alpha six columns field" data-hook="stock_location_address1">
-    <%= f.label :address1 %>
-    <%= f.text_field :address1, class: 'fullwidth' %>
+  <div class="col-xs-5" data-hook="stock_location_address1">
+    <div class="field">
+      <%= f.label :address1 %>
+      <%= f.text_field :address1, class: 'fullwidth' %>
+    </div>
   </div>
 
-  <div class="omega six columns field" data-hook="stock_location_city">
-    <%= f.label :city %>
-    <%= f.text_field :city, class: 'fullwidth' %>
+  <div class="col-xs-5" data-hook="stock_location_city">
+    <div class="field">
+      <%= f.label :city %>
+      <%= f.text_field :city, class: 'fullwidth' %>
+    </div>
   </div>
 
-  <div class="alpha six columns field" data-hook="stock_location_address2">
-    <%= f.label :address2 %>
-    <%= f.text_field :address2, class: 'fullwidth' %>
+  <div class="col-xs-5" data-hook="stock_location_address2">
+    <div class="field">
+      <%= f.label :address2 %>
+      <%= f.text_field :address2, class: 'fullwidth' %>
+    </div>
   </div>
 
-  <div class="three columns field" data-hook="stock_location_zipcode">
-    <%= f.label :zipcode %>
-    <%= f.text_field :zipcode, class: 'fullwidth' %>
+  <div class="col-xs-2" data-hook="stock_location_zipcode">
+    <div class="field">
+      <%= f.label :zipcode %>
+      <%= f.text_field :zipcode, class: 'fullwidth' %>
+    </div>
   </div>
 
-  <div class="omega three columns field" data-hook="stock_location_phone">
-    <%= f.label :phone %>
-    <%= f.phone_field :phone, class: 'fullwidth' %>
+  <div class="col-xs-3" data-hook="stock_location_phone">
+    <div class="field">
+      <%= f.label :phone %>
+      <%= f.phone_field :phone, class: 'fullwidth' %>
+    </div>
   </div>
 
-  <div class="alpha six columns field" data-hook="stock_location_country">
-    <%= f.label :country_id %>
-    <span id="country"><%= f.collection_select :country_id, available_countries, :id, :name, {}, { class: 'select2 fullwidth' } %></span>
+  <div class="col-xs-5" data-hook="stock_location_country">
+    <div class="field">
+      <%= f.label :country_id %>
+      <span id="country"><%= f.collection_select :country_id, available_countries, :id, :name, {}, { class: 'select2 fullwidth' } %></span>
+    </div>
   </div>
 
-  <div class="omega six columns field" data-hook="stock_location_state">
-    <% if f.object.country %>
-      <%= f.label :state_id %>
-      <span id="state" class="region">
-        <%= f.text_field :state_name, style: "display: #{f.object.country.states.empty? ? 'block' : 'none' };", disabled: !f.object.country.states.empty?, class: 'fullwidth state_name' %>
-        <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, {class: 'select2 fullwidth', style: "display: #{f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty?} %>
-      </span>
-    <% end %>
+  <div class="col-xs-5" data-hook="stock_location_state">
+    <div class="field">
+      <% if f.object.country %>
+        <%= f.label :state_id %>
+        <span id="state" class="region">
+          <%= f.text_field :state_name, style: "display: #{f.object.country.states.empty? ? 'block' : 'none' };", disabled: !f.object.country.states.empty?, class: 'fullwidth state_name' %>
+          <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, {class: 'select2 fullwidth', style: "display: #{f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty?} %>
+        </span>
+      <% end %>
+    </div>
   </div>
 </div>
 

data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb

@@ -2,27 +2,27 @@
   <fieldset>
     <legend align="center"><%= Spree.t(:move_stock_between_locations)%></legend>
     <div data-hook="admin_stock_movements_form_fields" class="row">
-      <div class="five columns">
+      <div class="col-xs-3">
         <div class="field" id="stock_movement_transfer_from_field">
           <%= label_tag :stock_location_from_id, Spree.t(:transfer_from_location) %>
           <%= select_tag :stock_location_from_id, options_from_collection_for_select(@stock_locations, :id, :name), class: 'select2 fullwidth' %>
         </div>
       </div>
-      <div class="five columns">
+      <div class="col-xs-3">
         <div class="field" id="stock_movement_transfer_to_field">
           <%= label_tag :stock_location_to_id, Spree.t(:transfer_to_location) %>
           <%= select_tag :stock_location_to_id, options_from_collection_for_select(@stock_locations, :id, :name), class: 'select2 fullwidth' %>
         </div>
       </div>
 
-      <div class="five columns">
+      <div class="col-xs-3">
         <div class="field" id="stock_movement_variant_id_field">
           <%= label_tag 'variant_id', Spree::Variant.model_name.human %>
           <%= select_tag :variant_id, options_from_collection_for_select(@variants, :id, :name_and_sku), class: 'select2 fullwidth' %>
         </div>
       </div>
 
-      <div class="five columns">
+      <div class="col-xs-3">
         <div class="field" id="stock_movement_quantity_field">
           <%= label_tag 'quantity', Spree::StockMovement.human_attribute_name(:quantity) %>
           <%= number_field_tag :quantity, 1, class: 'fullwidth' %>

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

@@ -78,7 +78,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
+  <div class="col-xs-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                         resource: Spree::StockLocation,
                         new_resource_url: new_object_url %>

data/app/views/spree/admin/stock_movements/_form.html.erb

@@ -1,5 +1,5 @@
 <div data-hook="admin_stock_movements_form_fields" class="row">
-  <div class="alpha twelve columns">
+  <div class="col-xs-9">
     <%= f.field_container :quantity do %>
       <%= f.label :quantity %>
       <%= f.text_field :quantity %>

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

@@ -44,7 +44,7 @@
   </tbody>
 </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
+  <div class="col-xs-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::StockMovement,
                  new_resource_url: new_object_url %>

data/app/views/spree/admin/stock_transfers/_stock_movements.html.erb

@@ -1,4 +1,4 @@
-<div id="source-movements-table" class="twelve columns alpha">
+<div id="source-movements-table" class="col-xs-9">
 <table class="index sortable">
   <colgroup>
     <col style="width: 40%" />

data/app/views/spree/admin/stock_transfers/_transfer_item_table.html.erb

@@ -18,15 +18,24 @@
     <tbody>
       <% transfer_items.each do |item| %>
         <%- variant = item.variant %>
-        <tr data-transfer-item-id="<%= item.id %>">
+        <tr data-transfer-item-id="<%= item.id %>" class='<%= "deleted" if variant.deleted? %>'>
           <td class="align-center no-padding">
             <div class='variant-container' data-variant-id="<%= variant.id %>">
               <div class='variant-image'>
                 <%= image_tag(variant.display_image(fallback: false).attachment(:small)) %>
               </div>
               <div class='variant-details'>
+
                 <table class='stock-variant-field-table'>
                   <tbody>
+                    <% if variant.deleted? %>
+                      <tr>
+                        <td colspan="2">
+                          <%= I18n.t(:deleted, scope: [:spree, :hints, "spree/variant"]) %>
+                          <%= deleted_variant_admin_hint(variant) %>
+                        </td>
+                      </tr>
+                    <% end %>
                     <% @variant_display_attributes.each do |display_attribute| %>
                       <tr>
                         <td><%= Spree.t(display_attribute[:translation_key]) %></td>

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

@@ -17,41 +17,43 @@
 <% content_for :table_filter do %>
   <div data-hook="admin_stock_transfers_index_search">
     <%= search_form_for [:admin, @search] do |f| %>
-      <div class="field-block alpha four columns">
-        <div class="field">
-          <%= f.label nil, Spree::StockLocation.model_name.human %>
-          <%= f.select :source_location_id_or_destination_location_id_eq, options_from_collection_for_select(@stock_locations, :id, :name, params[:q][:source_location_id_or_destination_location_id_eq]), {include_blank: true}, {class: 'select2 fullwidth'} %>
+      <div class="row">
+        <div class="field-block col-xs-3">
+          <div class="field">
+            <%= f.label nil, Spree::StockLocation.model_name.human %>
+            <%= f.select :source_location_id_or_destination_location_id_eq, options_from_collection_for_select(@stock_locations, :id, :name, params[:q][:source_location_id_or_destination_location_id_eq]), {include_blank: true}, {class: 'select2 fullwidth'} %>
+          </div>
         </div>
-      </div>
 
-      <div class="field-block alpha four columns">
-        <div class="date-range-filter field">
-          <%= f.label nil, Spree.t(:date_range) %>
-          <div class="date-range-fields">
-            <%= f.text_field :created_at_gt, class: 'datepicker datepicker-from', include_blank: true, value: params[:q][:created_at_gt], placeholder: Spree.t(:start) %>
+        <div class="field-block col-xs-3">
+          <div class="date-range-filter field">
+            <%= f.label nil, Spree.t(:date_range) %>
+            <div class="date-range-fields">
+              <%= f.text_field :created_at_gt, class: 'datepicker datepicker-from', include_blank: true, value: params[:q][:created_at_gt], placeholder: Spree.t(:start) %>
 
-            <span class="range-divider">
-              <i class="fa fa-arrow-right"></i>
-            </span>
+              <span class="range-divider">
+                <i class="fa fa-arrow-right"></i>
+              </span>
 
-            <%= f.text_field :created_at_lt, class: 'datepicker datepicker-to', include_blank: true, value: params[:q][:created_at_lt], placeholder: Spree.t(:stop) %>
+              <%= f.text_field :created_at_lt, class: 'datepicker datepicker-to', include_blank: true, value: params[:q][:created_at_lt], placeholder: Spree.t(:stop) %>
+            </div>
           </div>
         </div>
-      </div>
 
-      <div class="field-block alpha four columns">
-        <div class="field">
-          <%= f.label nil, Spree::StockTransfer.human_attribute_name(:number) %>
-          <%= f.text_field :number_cont, value: params[:q][:number_cont] %>
+        <div class="field-block col-xs-3">
+          <div class="field">
+            <%= f.label nil, Spree::StockTransfer.human_attribute_name(:number) %>
+            <%= f.text_field :number_cont, value: params[:q][:number_cont] %>
+          </div>
         </div>
-      </div>
 
-      <div class="field-block alpha four columns">
-        <div class="field checkbox">
-          <label>
-            <%= f.check_box :closed_at_null, { checked: @show_only_open }, '1', '0' %>
-            <%= Spree.t(:show_only_open_transfers) %>
-          </label>
+        <div class="field-block col-xs-3">
+          <div class="field checkbox">
+            <label>
+              <%= f.check_box :closed_at_null, { checked: @show_only_open }, '1', '0' %>
+              <%= Spree.t(:show_only_open_transfers) %>
+            </label>
+          </div>
         </div>
       </div>
 
@@ -107,7 +109,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha sixteen columns no-objects-found">
+  <div class="col-xs-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                   resource: Spree::StockTransfer,
                   new_resource_url: new_object_url %>

data/app/views/spree/admin/stock_transfers/show.html.erb

@@ -16,30 +16,32 @@
     <p><%= @stock_transfer.description %></p>
   </div>
 
-  <div class='field-block alpha three columns'>
-    <label><%= Spree::StockTransfer.human_attribute_name(:created_by_id) %></label>
-    <p><%= @stock_transfer.created_by.email %></p>
-  </div>
-
-  <div class='field-block alpha three columns'>
-    <label><%= Spree::StockTransfer.human_attribute_name(:created_at) %></label>
-    <p><%= @stock_transfer.created_at.try(:to_date) %></p>
-  </div>
-
-  <div class='field-block alpha three columns'>
-    <label><%= Spree::StockTransfer.human_attribute_name(:finalized_at) %></label>
-    <p><%= @stock_transfer.finalized_at.try(:to_date) %></p>
-  </div>
-
-  <div class='field-block alpha three columns'>
-    <label><%= Spree::StockTransfer.human_attribute_name(:finalized_by_id) %></label>
-    <p><%= @stock_transfer.finalized_by.try(:email) %></p>
-  </div>
-
-  <div class='field-block alpha three columns'>
-    <label><%= Spree::StockTransfer.human_attribute_name(:shipped_at) %></label>
-    <p><%= @stock_transfer.shipped_at.try(:to_date) %></p>
-  </div>
+  <div class="row">
+    <div class='field-block col-xs-3'>
+      <label><%= Spree::StockTransfer.human_attribute_name(:created_by_id) %></label>
+      <p><%= @stock_transfer.created_by.email %></p>
+    </div>
+
+    <div class='field-block col-xs-2'>
+      <label><%= Spree::StockTransfer.human_attribute_name(:created_at) %></label>
+      <p><%= @stock_transfer.created_at.try(:to_date) %></p>
+    </div>
+
+    <div class='field-block col-xs-2'>
+      <label><%= Spree::StockTransfer.human_attribute_name(:finalized_at) %></label>
+      <p><%= @stock_transfer.finalized_at.try(:to_date) %></p>
+    </div>
+
+    <div class='field-block col-xs-3'>
+      <label><%= Spree::StockTransfer.human_attribute_name(:finalized_by_id) %></label>
+      <p><%= @stock_transfer.finalized_by.try(:email) %></p>
+    </div>
+
+    <div class='field-block col-xs-2'>
+      <label><%= Spree::StockTransfer.human_attribute_name(:shipped_at) %></label>
+      <p><%= @stock_transfer.shipped_at.try(:to_date) %></p>
+    </div>
+  </div> 
 </fieldset>
 
 <fieldset>