Merge branch 'shopfront-filters' into shop-url

akatie · Jan 27, 2015 · fd9f65f · fd9f65f
2 parents 713999c + 1753432
commit fd9f65f
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 6 deletions.
diff --git a/app/assets/images/loading.gif b/app/assets/images/loading.gif
diff --git a/app/assets/images/spinning-circles.svg b/app/assets/images/spinning-circles.svg
diff --git a/app/assets/javascripts/templates/registration/images/logo.html.haml b/app/assets/javascripts/templates/registration/images/logo.html.haml
@@ -40,6 +40,6 @@
             .message{ ng: { hide: "imageSrc() || imageUploader.isUploading" } }
               Your logo will appear here for review once uploaded
             .loading{ ng: { hide: "!imageUploader.isUploading" } }
-              %img.spinner{ src: "/assets/loading.gif" }
+              %img.spinner{ src: "/assets/spinning-circles.svg" }
               %br/
               Uploading...
diff --git a/app/assets/javascripts/templates/registration/images/promo.html.haml b/app/assets/javascripts/templates/registration/images/promo.html.haml
@@ -38,6 +38,6 @@
             .message{ ng: { hide: "imageSrc() || imageUploader.isUploading" } }
               Your logo will appear here for review once uploaded
             .loading{ ng: { hide: "!imageUploader.isUploading" } }
-              %img.spinner{ src: "/assets/loading.gif" }
+              %img.spinner{ src: "/assets/spinning-circles.svg" }
               %br/
               Uploading...
diff --git a/app/views/shop/products/_form.html.haml b/app/views/shop/products/_form.html.haml
@@ -26,10 +26,10 @@
     %product{"ng-show" => "Products.loading"}
       .row.summary
         .small-12.columns.text-center
-          Loading products
+          Loading products...
       .row
         .small-12.columns.text-center
-          %img.spinner{ src: "/assets/loading.gif" }
+          %img.spinner{ src: "/assets/spinning-circles.svg" }
 
     %div{"ng-show" => "filteredProducts.length == 0 && !Products.loading"}
       .row.summary

diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml
@@ -95,7 +95,7 @@
               %span{ :class => 'one column alpha', :style => 'text-align: center'} {{ column.visible && "&#10003;" || !column.visible && "&nbsp;" }}
               %span{ :class => 'two columns omega' } {{column.name }}
   %div.sixteen.columns.alpha#loading{ 'ng-if' => 'loading' }
-    %img.spinner{ src: "/assets/loading.gif" }
+    %img.spinner{ src: "/assets/spinning-circles.svg" }
     %h1 LOADING ORDERS
   %div{ :class => "sixteen columns alpha", 'ng-show' => '!loading && filteredLineItems.length == 0'}
     %h1#no_results No orders found.

diff --git a/app/views/spree/admin/products/bulk_edit/_indicators.html.haml b/app/views/spree/admin/products/bulk_edit/_indicators.html.haml
@@ -2,7 +2,7 @@
   {{ api_error_msg }}
 
 %div.sixteen.columns.alpha#loading{ 'ng-if' => 'loading' }
-  %img.spinner{ src: "/assets/loading.gif" }
+  %img.spinner{ src: "/assets/spinning-circles.svg" }
   %h1 LOADING PRODUCTS
 
 %div.sixteen.columns.alpha{ 'ng-show' => '!loading && filteredProducts.length == 0 && query.length==0' }