Merge pull request #509 from owncloud/new-loading-classes

Adapt loader to owncloud/core#24491
owncloud · May 10, 2016 · b8cc80e · b8cc80e
2 parents 352b394 + f6591e1
commit b8cc80e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 21 deletions.
diff --git a/css/calendar.css b/css/calendar.css
@@ -22,10 +22,6 @@
  */
 
 
-#app-content.loading {
-	background-size: 25px;
-}
-
 .app {
 	height: 100%;
 	width: 100%;

diff --git a/css/calendarlist.css b/css/calendarlist.css
@@ -45,12 +45,6 @@
 	width: 100%;
 	padding: 8px;
 }
-#app-navigation .loading {
-	margin-left: 5px;
-	height: 30px;
-	width: 92%;
-	background-size: 20px;
-}
 #app-navigation .new-entity,
 #app-navigation .subscription-title {
 	display: block;
@@ -109,13 +103,10 @@
 #app-navigation .app-navigation-list-item .calendarCheckbox.unchecked {
 	background: transparent !important;
 }
-#app-navigation .app-navigation-list-item .loading {
+#app-navigation .app-navigation-list-item .icon-loading-small {
 	position: absolute;
-	margin-left: 17px;
-	margin-top: 16px;
-	width: 12px;
-	height: 12px;
-	background-size: 12px;
+	margin-left: 15px;
+	margin-top: 14px;
 }
 #app-navigation .app-navigation-list-item .utils {
 	height: 44px;

diff --git a/templates/part.calendarlist.item.php b/templates/part.calendarlist.item.php
@@ -23,9 +23,7 @@
  */
 ?>
 <span class="calendarCheckbox" ng-show="!calendar.list.loading && !calendar.list.edit" ng-style="{ background : calendar.enabled == true ? calendar.color : 'transparent' }" ng-click="triggerEnable(calendar)"></span>
-<span class="loading pull-left" ng-show="calendar.list.loading && !calendar.list.edit">
-	<i class="fa fa-spinner fa-spin"></i>
-</span>
+<span class="icon-loading-small pull-left" ng-show="calendar.list.loading && !calendar.list.edit"></span>
 <a href="#/" ng-click="triggerEnable(calendar)" ng-show="!calendar.list.edit" title="{{ calendar.displayname }}">
 	{{ calendar.displayname }}
 </a>

diff --git a/templates/part.calendarlist.php b/templates/part.calendarlist.php
@@ -23,7 +23,7 @@
  */
 ?>
 <ul class="app-navigation-list calendar-list">
-	<div ng-class="{loading: is.loading}"></div>
+	<div ng-class="{'icon-loading-small': is.loading}"></div>
 	<li ng-repeat="calendar in calendars | orderBy:['order'] | calendarFilter" class="app-navigation-list-item" ng-class="{active: calendar.enabled}">
 		<?php print_unescaped($this->inc('part.calendarlist.item')); ?>
 	</li>

diff --git a/templates/part.subscriptionlist.php b/templates/part.subscriptionlist.php
@@ -23,7 +23,7 @@
  */
 ?>
 <ul class="app-navigation-list subscription-list">
-	<div ng-class="{loading: is.loading}"></div>
+	<div ng-class="{'icon-loading-small': is.loading}"></div>
 	<li ng-repeat="calendar in calendars | orderBy:['order'] | subscriptionFilter" class="app-navigation-list-item" ng-class="{active: calendar.enabled}">
 		<?php print_unescaped($this->inc('part.calendarlist.item')); ?>
 	</li>