solidus_backend 2.0.3 → 2.1.0.beta1

data/app/views/spree/admin/promotions/_promotion_rule.html.erb

@@ -1,4 +1,4 @@
-<div class="promotion_rule promotion-block alpha omega eight columns" id="<%= dom_id promotion_rule %>">
+<div class="promotion_rule promotion-block col-xs-12" id="<%= dom_id promotion_rule %>">
   <% type_name = promotion_rule.class.name.demodulize.underscore %>
   <h6 class='promotion-title <%= 'no-text' if type_name == 'user_logged_in' || type_name == 'first_order'%>'><%= Spree.t("promotion_rule_types.#{type_name}.description") %></h6>
   <% if can?(:destroy, promotion_rule) %>

data/app/views/spree/admin/promotions/_rules.html.erb

@@ -1,4 +1,4 @@
-<fieldset id="rule_fields" class ="alpha eight columns no-border-bottom no-border-top">
+<fieldset id="rule_fields" class ="no-border-bottom no-border-top">
 
   <%= form_tag spree.admin_promotion_promotion_rules_path(@promotion), :remote => true, :id => 'new_product_rule_form' do %>
     <fieldset>
@@ -21,15 +21,19 @@
       <fieldset class="no-border-top">
         <div id="promotion-pilicy-select" class="align-center row">
           <% Spree::Promotion::MATCH_POLICIES.each do |policy| %>
-            <div class="alpha four columns">
+            <div class="col-xs-6">
               <label><%= f.radio_button :match_policy, policy %> <%= Spree.t "promotion_form.match_policies.#{policy}" %></label>
             </div>
           <% end %>
         </div>
 
-        <div id="rules" class="filter_list row">
+        <div id="rules" class="filter_list">
           <% if @promotion.rules.any? %>
-            <%= render :partial => 'promotion_rule', :collection => @promotion.rules, :locals => {} %>
+            <div class="col-xs-12">
+              <div class="row">
+                <%= render :partial => 'promotion_rule', :collection => @promotion.rules, :locals => {} %>
+              </div>
+            </div>
           <% else %>
             <div class="no-objects-found">
               <%= Spree.t(:no_rules_added) %>

data/app/views/spree/admin/promotions/actions/_create_quantity_adjustments.html.erb

@@ -1,8 +1,12 @@
-<div class="row">
-  <div class="field eight columns alpha omega">
-    <% field_name = "#{param_prefix}[preferred_group_size]" %>
-    <%= label_tag field_name, Spree.t(:group_size) %>
-    <%= number_field_tag field_name, promotion_action.preferred_group_size, class: "fullwidth", min: 1 %>
+<div class="col-xs-12">
+  <div class="row">
+    <div class="col-xs-12">
+      <div class="field">
+        <% field_name = "#{param_prefix}[preferred_group_size]" %>
+        <%= label_tag field_name, Spree.t(:group_size) %>
+        <%= number_field_tag field_name, promotion_action.preferred_group_size, class: "fullwidth", min: 1 %>
+      </div>
+    </div>
   </div>
 </div>
 

data/app/views/spree/admin/promotions/actions/_promotion_calculators_with_custom_fields.html.erb

@@ -1,28 +1,34 @@
-<div class="calculator-fields row">
+<div class="col-xs-12">
+  <div class="calculator-fields row">
 
-  <div class="field alpha four columns">
-    <% field_name = "#{param_prefix}[calculator_type]" %>
-    <%= label_tag field_name, Spree::Calculator.model_name.human %>
-    <%= select_tag field_name,
-                   options_from_collection_for_select(calculators, :to_s, :description, promotion_action.calculator.type),
-                   :class => 'type-select select2 fullwidth' %>
-    <% if promotion_action.calculator.respond_to?(:preferences) %>
-      <span class="warning info"><%= Spree.t(:calculator_settings_warning) %></span>
+    <div class="col-xs-6">
+      <div class="field">
+        <% field_name = "#{param_prefix}[calculator_type]" %>
+        <%= label_tag field_name, Spree::Calculator.model_name.human %>
+        <%= select_tag field_name,
+                      options_from_collection_for_select(calculators, :to_s, :description, promotion_action.calculator.type),
+                      :class => 'type-select select2 fullwidth' %>
+        <% if promotion_action.calculator.respond_to?(:preferences) %>
+          <span class="warning info"><%= Spree.t(:calculator_settings_warning) %></span>
+        <% end %>
+      </div>
+    </div>
+
+    <% unless promotion_action.new_record? %>
+      <div class="col-xs-6">
+        <div class="settings field">
+          <% type_name = promotion_action.calculator.type.demodulize.underscore %>
+          <% if lookup_context.exists?("fields",
+              ["spree/admin/promotions/calculators/#{type_name}"], true) %>
+            <%= render "spree/admin/promotions/calculators/#{type_name}/fields",
+              calculator: promotion_action.calculator, prefix: param_prefix %>
+          <% else %>
+            <%= render "spree/admin/promotions/calculators/default_fields",
+              calculator: promotion_action.calculator, prefix: param_prefix %>
+          <% end %>
+          <%= hidden_field_tag "#{param_prefix}[calculator_attributes][id]", promotion_action.calculator.id %>
+        </div>
+      </div>
     <% end %>
   </div>
-
-  <% unless promotion_action.new_record? %>
-    <div class="settings field omega four columns">
-      <% type_name = promotion_action.calculator.type.demodulize.underscore %>
-      <% if lookup_context.exists?("fields",
-          ["spree/admin/promotions/calculators/#{type_name}"], true) %>
-        <%= render "spree/admin/promotions/calculators/#{type_name}/fields",
-          calculator: promotion_action.calculator, prefix: param_prefix %>
-      <% else %>
-        <%= render "spree/admin/promotions/calculators/default_fields",
-          calculator: promotion_action.calculator, prefix: param_prefix %>
-      <% end %>
-      <%= hidden_field_tag "#{param_prefix}[calculator_attributes][id]", promotion_action.calculator.id %>
-    </div>
-  <% end %>
 </div>

data/app/views/spree/admin/promotions/edit.html.erb

@@ -20,11 +20,11 @@
 <% end %>
 
 <div id="promotion-filters" class="row">
-  <div id="rules_container" class="alpha eight columns">
+  <div id="rules_container" class="col-xs-6">
     <%= render :partial => 'rules' %>
   </div>
 
-  <div id="actions_container" class="omega eight columns">
+  <div id="actions_container" class="col-xs-6">
     <%= render :partial => 'actions' %>
   </div>
 </div>

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

@@ -15,31 +15,33 @@
 <% content_for :table_filter do %>
   <div data-hook="admin_promotions_index_search">
     <%= search_form_for [:admin, @search] do |f| %>
-      <div class="four columns alpha">
-        <div class="field">
-          <%= label_tag :q_name_cont, Spree::Promotion.human_attribute_name(:name) %>
-          <%= f.text_field :name_cont, tabindex: 1 %>
+      <div class="row">
+        <div class="col-xs-3">
+          <div class="field">
+            <%= label_tag :q_name_cont, Spree::Promotion.human_attribute_name(:name) %>
+            <%= f.text_field :name_cont, tabindex: 1 %>
+          </div>
         </div>
-      </div>
 
-      <div class="four columns">
-        <div class="field">
-          <%= label_tag :q_codes_value_cont, Spree::Promotion.human_attribute_name(:code) %>
-          <%= f.text_field :codes_value_cont, tabindex: 1 %>
+        <div class="col-xs-3">
+          <div class="field">
+            <%= label_tag :q_codes_value_cont, Spree::Promotion.human_attribute_name(:code) %>
+            <%= f.text_field :codes_value_cont, tabindex: 1 %>
+          </div>
         </div>
-      </div>
 
-      <div class="four columns">
-        <div class="field">
-          <%= label_tag :q_path_cont, Spree::Promotion.human_attribute_name(:path) %>
-          <%= f.text_field :path_cont, tabindex: 1 %>
+        <div class="col-xs-3">
+          <div class="field">
+            <%= label_tag :q_path_cont, Spree::Promotion.human_attribute_name(:path) %>
+            <%= f.text_field :path_cont, tabindex: 1 %>
+          </div>
         </div>
-      </div>
 
-      <div class="four columns omega">
-        <div class="field">
-          <%= label_tag :q_promotion_category_id_eq, Spree::PromotionCategory.model_name.human %><br>
-          <%= f.collection_select(:promotion_category_id_eq, @promotion_categories, :id, :name, { :include_blank => Spree.t('match_choices.all') }, { :class => 'select2 fullwidth' }) %>
+        <div class="col-xs-3">
+          <div class="field">
+            <%= label_tag :q_promotion_category_id_eq, Spree::PromotionCategory.model_name.human %><br>
+            <%= f.collection_select(:promotion_category_id_eq, @promotion_categories, :id, :name, { :include_blank => Spree.t('match_choices.all') }, { :class => 'select2 fullwidth' }) %>
+          </div>
         </div>
       </div>
 
@@ -101,7 +103,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::Promotion,
                  new_resource_url: new_object_url %>

data/app/views/spree/admin/promotions/new.html.erb

@@ -2,7 +2,7 @@
 <% admin_breadcrumb(Spree.t(:new_promotion)) %>
 
 
-<%= form_for :promotion, :url => collection_url do |f| %>
+<%= form_for @promotion, :url => collection_url do |f| %>
   <fieldset class="no-border-top">
     <%= render :partial => 'form', :locals => { :f => f } %>
     <%= render :partial => 'spree/admin/shared/new_resource_links' %>

data/app/views/spree/admin/promotions/rules/_first_repeat_purchase_since.html.erb

@@ -1,7 +1,13 @@
-<div class="field alpha four columns">
-  <%= Spree.t(:form_text, scope: "promotion_rule_types.first_repeat_purchase_since")  %>
-</div>
+<div class="row">
+  <div class="col-xs-6">
+    <div class="field">
+      <%= Spree.t(:form_text, scope: "promotion_rule_types.first_repeat_purchase_since")  %>
+    </div>
+  </div>
 
-<div class="field omega four columns">
-  <%= number_field_tag "#{param_prefix}[preferred_days_ago]", promotion_rule.preferred_days_ago, :class => 'fullwidth' %>
+  <div class="col-xs-6">
+    <div class="field">
+      <%= number_field_tag "#{param_prefix}[preferred_days_ago]", promotion_rule.preferred_days_ago, :class => 'fullwidth' %>
+    </div>
+  </div>
 </div>

data/app/views/spree/admin/promotions/rules/_item_total.html.erb

@@ -1,9 +1,19 @@
-<div class="field alpha three columns">
-  <%= select_tag "#{param_prefix}[preferred_operator]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator), {:class => 'select2 select_item_total fullwidth'} %>
-</div>
-<div class="field three columns">
-  <%= text_field_tag "#{param_prefix}[preferred_amount]", promotion_rule.preferred_amount, :class => 'fullwidth' %>
-</div>
-<div class="field omega two columns">
-  <%= text_field_tag "#{param_prefix}[preferred_currency]", promotion_rule.preferred_currency, :class => 'fullwidth' %>
+<div class="col-xs-12">
+  <div class="row">
+    <div class="col-xs-4">
+      <div class="field">
+        <%= select_tag "#{param_prefix}[preferred_operator]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator), {:class => 'select2 select_item_total fullwidth'} %>
+      </div>
+    </div>
+    <div class="col-xs-4">
+      <div class="field">
+        <%= text_field_tag "#{param_prefix}[preferred_amount]", promotion_rule.preferred_amount, :class => 'fullwidth' %>
+      </div>
+    </div>
+    <div class="col-xs-4">
+      <div class="field">
+        <%= text_field_tag "#{param_prefix}[preferred_currency]", promotion_rule.preferred_currency, :class => 'fullwidth' %>
+      </div>
+    </div>
+  </div>
 </div>

data/app/views/spree/admin/promotions/rules/_landing_page.html.erb

@@ -1,5 +1,7 @@
-<div class="field alpha omega eight columns">
-  <label for="<%= "#{param_prefix}_preferred_path" %>"><%= Spree.t('promotion_rule_types.landing_page.description') %>:</label>  
-  <%= text_field_tag "#{param_prefix}[preferred_path]", promotion_rule.preferred_path, :class => 'fullwidth' %>  
-  <span class="info"><%= Spree.t('landing_page_rule.must_have_visited_path') %></span>
-</div>
+<div class="col-xs-12">
+  <div class="field">
+    <label for="<%= "#{param_prefix}_preferred_path" %>"><%= Spree.t('promotion_rule_types.landing_page.description') %>:</label>  
+    <%= text_field_tag "#{param_prefix}[preferred_path]", promotion_rule.preferred_path, :class => 'fullwidth' %>  
+    <span class="info"><%= Spree.t('landing_page_rule.must_have_visited_path') %></span>
+  </div>
+</div>

data/app/views/spree/admin/promotions/rules/_nth_order.html.erb

@@ -1,7 +1,14 @@
-<div class="field alpha four columns">
-  <%= Spree.t(:form_text, scope: "promotion_rule_types.nth_order")  %>
-</div>
-
-<div class="field omega four columns">
-  <%= number_field_tag "#{param_prefix}[preferred_nth_order]", promotion_rule.preferred_nth_order, :class => 'fullwidth' %>
+<div class="col-xs-12">
+  <div class="row">
+    <div class="col-xs-6">
+      <div class="field">
+        <%= Spree.t(:form_text, scope: "promotion_rule_types.nth_order")  %>
+      </div>
+    </div>
+    <div class="col-xs-6">
+      <div class="field">
+        <%= number_field_tag "#{param_prefix}[preferred_nth_order]", promotion_rule.preferred_nth_order, :class => 'fullwidth' %>
+      </div>
+    </div>
+  </div>
 </div>

data/app/views/spree/admin/promotions/rules/_option_value.html.erb

@@ -1,12 +1,16 @@
-<div class="field alpha omega eight columns promo-rule-option-values">
-  <div class="param-prefix hidden" data-param-prefix="<%= param_prefix %>"></div>
-  <div class="four columns alpha"><%= label_tag nil, Spree::Product.model_name.human %></div>
-  <div class="three columns omega"><%= label_tag nil, plural_resource_name(Spree::OptionValue) %></div>
-  <div class="clear"></div>
+<div class="col-xs-12">
+  <div class="field promo-rule-option-values">
+    <div class="param-prefix hidden" data-param-prefix="<%= param_prefix %>"></div>
+    <div class="row">
+      <div class="col-xs-6"><%= label_tag nil, Spree::Product.model_name.human %></div>
+      <div class="col-xs-6"><%= label_tag nil, plural_resource_name(Spree::OptionValue) %></div>
+    </div>
+    <div class="clear"></div>
 
-  <div class="js-promo-rule-option-values"></div>
+    <div class="js-promo-rule-option-values"></div>
 
-  <button class="button js-add-promo-rule-option-value"><%= Spree.t('actions.add') %></button>
+    <button class="button js-add-promo-rule-option-value"><%= Spree.t('actions.add') %></button>
+  </div>
 </div>
 
 <%= content_tag :div, nil, class: "hidden js-original-promo-rule-option-values",

data/app/views/spree/admin/promotions/rules/_product.html.erb

@@ -1,9 +1,13 @@
-<div class="field alpha omega eight columns products_rule_products">
-  <%= label_tag "#{param_prefix}_product_ids_string", Spree.t('product_rule.choose_products') %>
-  <%= hidden_field_tag "#{param_prefix}[product_ids_string]", promotion_rule.product_ids.join(","), :class => "product_picker fullwidth" %>
+<div class="col-xs-12">
+  <div class="field products_rule_products">
+    <%= label_tag "#{param_prefix}_product_ids_string", Spree.t('product_rule.choose_products') %>
+    <%= hidden_field_tag "#{param_prefix}[product_ids_string]", promotion_rule.product_ids.join(","), :class => "product_picker fullwidth" %>
+  </div>
 </div>
-<div class="field alpha omega eight columns">
-  <label>
-    <%= Spree.t('product_rule.label', :select => select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Product::MATCH_POLICIES.map{|s| [Spree.t("product_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {:class => 'select_product select2'})).html_safe %>
-  </label>
+<div class="col-xs-12">
+  <div class="field">
+    <label>
+      <%= Spree.t('product_rule.label', :select => select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Product::MATCH_POLICIES.map{|s| [Spree.t("product_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {:class => 'select_product select2'})).html_safe %>
+    </label>
+  </div>
 </div>

data/app/views/spree/admin/promotions/rules/_taxon.html.erb

@@ -1,9 +1,15 @@
-<div class="field alpha omega eight columns taxons_rule_taxons">
-  <%= label_tag "#{param_prefix}_taxon_ids_string", Spree.t('taxon_rule.choose_taxons') %>
-  <%= hidden_field_tag "#{param_prefix}[taxon_ids_string]", promotion_rule.taxon_ids.join(","), :class => "taxon_picker fullwidth", id: 'product_taxon_ids' %>
-</div>
-<div class="field alpha omega eight columns">
-  <label>
-    <%= Spree.t('taxon_rule.label', :select => select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Taxon::MATCH_POLICIES.map{|s| [Spree.t("taxon_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {:class => 'select_taxon select2'})).html_safe %>
-  </label>
-</div>
+  <div class="row">
+    <div class="col-xs-11">
+      <div class="field taxons_rule_taxons">
+        <%= label_tag "#{param_prefix}_taxon_ids_string", Spree.t('taxon_rule.choose_taxons') %>
+        <%= hidden_field_tag "#{param_prefix}[taxon_ids_string]", promotion_rule.taxon_ids.join(","), :class => "taxon_picker fullwidth", id: 'product_taxon_ids' %>
+      </div>
+    </div>
+    <div class="col-xs-12">
+      <div class="field">
+        <label>
+          <%= Spree.t('taxon_rule.label', :select => select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Taxon::MATCH_POLICIES.map{|s| [Spree.t("taxon_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {:class => 'select_taxon select2'})).html_safe %>
+        </label>
+      </div>
+    </div>
+  </div>

data/app/views/spree/admin/promotions/rules/_user.html.erb

@@ -1,4 +1,6 @@
-<div class="field alpha omega eight columns">
-  <label><%= Spree.t('user_rule.choose_users') %></label><br>
-  <input type='hidden' name='<%= param_prefix %>[user_ids_string]' class='user_picker fullwidth' value='<%= promotion_rule.user_ids.join(",") %>'>
+<div class="col-xs-12">
+  <div class="field">
+    <label><%= Spree.t('user_rule.choose_users') %></label><br>
+    <input type='hidden' name='<%= param_prefix %>[user_ids_string]' class='user_picker fullwidth' value='<%= promotion_rule.user_ids.join(",") %>'>
+  </div>
 </div>

data/app/views/spree/admin/promotions/rules/_user_role.html.erb

@@ -0,0 +1,12 @@
+<div class="field alpha omega eight columns">
+  <%= label_tag "#{param_prefix}_preferred_role_ids", Spree.t('user_role_rule.choose_roles') %>
+  <%= select_tag "#{param_prefix}[preferred_role_ids]",
+    options_from_collection_for_select(
+      Spree::Role.all, :id, :name, promotion_rule.preferred_role_ids
+    ), class: 'select2 fullwidth', multiple: true %>
+</div>
+<div class="field alpha omega eight columns">
+  <label>
+    <%= Spree.t('user_role_rule.label', select: select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::UserRole::MATCH_POLICIES.map{ |s| [Spree.t("user_role_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), { class: 'select2'})).html_safe %>
+  </label>
+</div>

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

@@ -1,12 +1,12 @@
 <div data-hook="admin_property_form" class="align-center row">
-  <div class="alpha eight columns">
+  <div class="col-xs-6">
     <%= f.field_container :name do %>
       <%= f.label :name, class: 'required' %><br />
       <%= f.text_field :name, :class => 'fullwidth' %>
       <%= f.error_message_on :name %>
     <% end %>
   </div>
-  <div class="eight columns omega">
+  <div class="col-xs-6">
     <%= f.field_container :presentation do %>
       <%= f.label :presentation, class: 'required' %><br />
       <%= f.text_field :presentation, :class => 'fullwidth' %>

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

@@ -22,10 +22,12 @@
         <%- locals = {:f => f} %>
 
         <div data-hook="admin_property_index_search">
-          <div class="alpha eight columns">
-            <div class="field">
-              <%= f.label :name_cont, Spree.t(:name) %>
-              <%= f.text_field :name_cont, :size => 15 %>
+          <div class="row">
+            <div class="col-xs-6">
+              <div class="field">
+                <%= f.label :name_cont, Spree.t(:name) %>
+                <%= f.text_field :name_cont, :size => 15 %>
+              </div>
             </div>
           </div>
         </div>
@@ -73,7 +75,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::Property,
                  new_resource_url: new_object_url %>

data/app/views/spree/admin/refund_reasons/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: Spree::RefundReason,
                  new_resource_url: new_object_url %>

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

@@ -1,22 +1,20 @@
 <div data-hook="admin_named_type_form_fields" class="row">
-  <div class="row">
-    <div class="alpha four columns">
-      <%= f.field_container :name do %>
-        <%= f.label :name, class: 'required' %><br />
-        <%= f.text_field :name, :class => 'fullwidth' %>
-      <% end %>
+  <div class="col-xs-3">
+    <%= f.field_container :name do %>
+      <%= f.label :name, class: 'required' %><br />
+      <%= f.text_field :name, :class => 'fullwidth' %>
+    <% end %>
 
-      <%= f.field_container :code do %>
-        <%= f.label :code, class: 'required' %><br />
-        <%= f.text_field :code, :class => 'fullwidth' %>
+    <%= f.field_container :code do %>
+      <%= f.label :code, class: 'required' %><br />
+      <%= f.text_field :code, :class => 'fullwidth' %>
 
-      <% end %>
-      <div class="checkbox">
-        <label>
-          <%= f.check_box :active %>
-          <%= Spree.t(:active) %>
-        </label>
-      </div>
+    <% end %>
+    <div class="checkbox">
+      <label>
+        <%= f.check_box :active %>
+        <%= Spree.t(:active) %>
+      </label>
     </div>
   </div>
 </div>

data/app/views/spree/admin/refunds/edit.html.erb

@@ -7,13 +7,13 @@
 <%= form_for [:admin, @refund.payment.order, @refund.payment, @refund] do |f| %>
   <fieldset class="no-border-top">
     <div data-hook="admin_refund_form_fields" class="row">
-      <div class="alpha three columns">
+      <div class="col-xs-3">
         <div class="field">
           <%= f.label :amount %><br/>
           <%= @refund.amount %>
         </div>
       </div>
-      <div class="alpha three columns">
+      <div class="col-xs-3">
         <div class="field">
           <%= f.label :refund_reason_id %><br/>
           <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {}, {class: 'select2 fullwidth'}) %>

data/app/views/spree/admin/refunds/new.html.erb

@@ -8,25 +8,25 @@
 <%= form_for [:admin, @refund.payment.order, @refund.payment, @refund] do |f| %>
   <fieldset class="no-border-top">
     <div data-hook="admin_refund_form_fields" class="row">
-      <div class="alpha three columns">
+      <div class="col-xs-3">
         <div class="field">
           <%= Spree.t(:payment_amount) %><br/>
           <%= @refund.payment.amount %>
         </div>
       </div>
-      <div class="alpha three columns">
+      <div class="col-xs-3">
         <div class="field">
           <%= Spree.t(:credit_allowed) %><br/>
           <%= @refund.payment.credit_allowed %>
         </div>
       </div>
-      <div class="alpha three columns">
+      <div class="col-xs-3">
         <div class="field">
           <%= f.label :amount %><br/>
           <%= f.text_field :amount, class: 'fullwidth' %>
         </div>
       </div>
-      <div class="alpha three columns">
+      <div class="col-xs-3">
         <div class="field">
           <%= f.label :refund_reason_id %><br/>
           <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {include_blank: true}, {class: 'select2 fullwidth'}) %>

data/app/views/spree/admin/shared/_configuration_menu.html.erb

@@ -7,10 +7,6 @@
       <% if can?(:edit, :general_settings) %>
         <%= settings_tab_item Spree.t(:settings), edit_admin_general_settings_path %>
       <% end %>
-
-      <% if can?(:display, Spree::Tracker) %>
-        <%= settings_tab_item plural_resource_name(Spree::Tracker), admin_trackers_path %>
-      <% end %>
     </ul>
   </nav>
 <% end %>

data/app/views/spree/admin/shared/_head.html.erb

@@ -7,7 +7,7 @@
 <!-- Get "Open Sans" font from Google -->
 <link href='//fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600&subset=latin,cyrillic,greek,vietnamese' rel='stylesheet' type='text/css'>
 
-<%= stylesheet_link_tag 'spree/backend/all' %>
+<%= stylesheet_link_tag 'spree/backend/all', media: 'all' %>
 
 <%- if Rails.env.test? %>
   <style>

data/app/views/spree/admin/shared/_product_sub_menu.html.erb

@@ -8,9 +8,6 @@
   <% if can? :admin, Spree::Property %>
     <%= tab :properties %>
   <% end %>
-  <% if can? :admin, Spree::Prototype %>
-    <%= tab :prototypes %>
-  <% end %>
   <% if can? :admin, Spree::Taxonomy %>
     <%= tab :taxonomies %>
   <% end %>

data/app/views/spree/admin/shared/_rebuild_vat_prices_checkbox.html.erb

@@ -1,4 +1,4 @@
-<div data-hook="admin_<%= model_name %>_form_generate_vat_prices" class="<%= wrapper_class %> checkbox">
+<div data-hook="admin_<%= model_name %>_form_generate_vat_prices" class="<%= local_assigns[:wrapper_class] %> checkbox">
   <%= form.label :rebuild_vat_prices do %>
     <%= form.check_box :rebuild_vat_prices, checked: form.object.prices.size <= 1 %>
     <%= Spree::Variant.human_attribute_name(:rebuild_vat_prices) %>

data/app/views/spree/admin/shared/_settings_sub_menu.html.erb

@@ -1,6 +1,6 @@
 <ul class="admin-subnav" data-hook="admin_settings_sub_tabs">
-  <% if can?(:edit, :general_settings) || can?(:display, Spree::Tracker) %>
-    <%= tab :general_settings, label: :general, url: spree.edit_admin_general_settings_path, match_path: /\/general_settings|\/trackers/ %>
+  <% if can?(:edit, :general_settings) %>
+    <%= tab :general_settings, label: :general, url: spree.edit_admin_general_settings_path, match_path: /\/general_settings/ %>
   <% end %>
 
   <% if can?(:display, Spree::PaymentMethod) %>

data/app/views/spree/admin/shared/_sidebar.html.erb

@@ -1,5 +1,5 @@
 <% if content_for?(:sidebar) %>
-  <aside id="sidebar" data-hook class="content-sidebar four columns">
+  <aside id="sidebar" data-hook class="content-sidebar col-xs-3">
 
     <% if content_for?(:sidebar_title) %>
       <h5 class="sidebar-title"><span><%= yield :sidebar_title %></span></h5>

data/app/views/spree/admin/shared/_variant_search.html.erb

@@ -1,14 +1,18 @@
 <div data-hook="admin_orders_index_search">
   <%= form_for :variant_search, url: form_path, method: :get do |f| %>
-    <div class="field-block alpha four columns">
-      <div class="field">
-        <%= label_tag nil, Spree::StockLocation.model_name.human %>
-        <%= select_tag :stock_location_id, options_from_collection_for_select(stock_locations, :id, :name, params[:stock_location_id]), { :include_blank => true, :class => 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location) } %>
+    <div class="row">
+      <div class="field-block col-xs-3">
+        <div class="field">
+          <%= label_tag nil, Spree::StockLocation.model_name.human %>
+          <%= select_tag :stock_location_id, options_from_collection_for_select(stock_locations, :id, :name, params[:stock_location_id]), { :include_blank => true, :class => 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location) } %>
+        </div>
+      </div>
+      <div class="<%= if content_for?(:sidebar) then 'col-xs-6' else 'col-xs-9' end %>">
+        <div data-hook="add_product_name" class="field">
+          <%= label_tag :add_variant_id, Spree::Variant.model_name.human %>
+          <%= text_field_tag :variant_search_term, params[:variant_search_term], :class => "fullwidth", :placeholder => Spree.t(:variant_search_placeholder) %>
+        </div>
       </div>
-    </div>
-    <div data-hook="add_product_name" class="field <%= if content_for?(:sidebar) then 'eight' else 'twelve' end %> columns alpha">
-      <%= label_tag :add_variant_id, Spree::Variant.model_name.human %>
-      <%= text_field_tag :variant_search_term, params[:variant_search_term], :class => "fullwidth", :placeholder => Spree.t(:variant_search_placeholder) %>
     </div>
 
     <div class="clearfix"></div>