Skip to content

Commit 791ca14

Browse files
authored
Merge pull request #1059 from crazyserver/MOBILE-2103
MOBILE-2103 course: Animate spinner transition
2 parents 2ae8432 + 5c5e94d commit 791ca14

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

www/core/components/course/templates/module.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<div class="buttons mm-module-buttons" ng-class="{'mm-button-completion': module.completionstatus}" ng-if="module.uservisible !== false && ((buttons && buttons.length > 0) || spinner || module.completionstatus)">
66
<mm-completion ng-if="module.completionstatus" completion="module.completionstatus" module-name="module.name" after-change="completionChanged"></mm-completion>
77

8-
<button ng-repeat="button in buttons" ng-hide="button.hidden" ng-click="button.action($event)" class="button button-icon" aria-label="{{ button.label | translate }}">
8+
<button ng-repeat="button in buttons" ng-hide="button.hidden" ng-click="button.action($event)" class="button button-icon mm-animate-show-hide" aria-label="{{ button.label | translate }}">
99
<i class="icon positive" ng-class="{'{{button.icon}}': button.icon}"></i>
1010
</button>
1111

12-
<ion-spinner ng-if="spinner"></ion-spinner>
12+
<ion-spinner ng-if="spinner" class="mm-animate-show-hide"></ion-spinner>
1313
</div>
1414

1515
<mm-format-text watch="true">{{ title }}</mm-format-text>

www/core/components/courses/templates/courselistprogress.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</div>
1919
<h2><mm-format-text watch="true">{{course.fullname}}</mm-format-text></h2>
2020
<mm-progress-bar ng-if="!roundProgress && course.progress !== false" progress="course.progress"></mm-progress-bar>
21-
<i ng-if="showActions && loaded" class="icon ion-android-more-vertical" ng-click="showCourseActions($event)"></i>
22-
<ion-spinner ng-if="!loaded"></ion-spinner>
21+
<i ng-if="showActions && loaded" class="icon ion-android-more-vertical mm-animate-show-hide" ng-click="showCourseActions($event)"></i>
22+
<ion-spinner ng-if="!loaded" class="mm-animate-show-hide"></ion-spinner>
2323
</a>
2424
<div class="item item-text-wrap item-borderless" ng-show="course.summary" ng-if="showSummary">
2525
<p>

0 commit comments

Comments
 (0)