Merge pull request #2947 from awesomerobot/master

updated loading spinner

app/assets/javascripts/discourse/helpers/loading-spinner.es6

@@ -1,4 +1,4 @@
-var spinnerHTML = "<div class='spinner-wrap'><div class='spinner'><i></i><i></i><i></i><i></i><i></i><i></i><i></i><i></i><i></i><i></i><i></i><i></i></div></div>";
+var spinnerHTML = "<div class='spinner'><div class='spinner-container container1'><div class='circle1'></div><div class='circle2'></div><div class='circle3'></div><div class='circle4'></div></div><div class='spinner-container container2'><div class='circle1'></div><div class='circle2'></div><div class='circle3'></div><div class='circle4'></div></div><div class='spinner-container container3'><div class='circle1'></div><div class='circle2'></div><div class='circle3'></div><div class='circle4'></div></div></div>";
 
 Handlebars.registerHelper('loading-spinner', function() {
     return new Handlebars.SafeString(spinnerHTML);

app/assets/javascripts/discourse/templates/discovery/topics.hbs

@@ -72,7 +72,7 @@
 
 <footer class='topic-list-bottom'>
   {{#if loadingMore}}
-    <div class='topics-loading'></div>
+    {{loading-spinner}}
   {{/if}}
   {{#if allLoaded}}
     {{#if showDismissRead}}

app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs

@@ -25,7 +25,7 @@
 
 <footer class='topic-list-bottom'>
   {{#if loadingMore}}
-    <div class='topics-loading'></div>
+    {{loading-spinner}}
   {{/if}}
   {{#if allLoaded}}
     {{#if showDismissRead}}

app/assets/javascripts/discourse/templates/search.hbs

@@ -8,7 +8,7 @@
   <a href="#" class="show-help" {{action "showSearchHelp" bubbles=false}}>{{i18n show_help}}</a>
 </div>
 {{#if loading}}
-  <div class='searching'></div>
+  <div class='searching'>{{loading-spinner}}</div>
 {{else}}
   <div class="results">
   {{#unless noResults}}