Skip to content

Commit 3e18764

Browse files
committed
MOBILE-1035 styles: Animate show/hide mm-loading
1 parent e4ae29c commit 3e18764

File tree

3 files changed

+27
-3
lines changed

3 files changed

+27
-3
lines changed

www/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// Dependencies will be automatically added here, the following line must declare ionic as first dependency
1616
// and should not be split into multiple lines, see gulpfile.js.
1717
angular.module('mm', ['ionic', 'ngCordova', 'angular-md5', 'pascalprecht.translate', 'ngAria', 'oc.lazyLoad', 'ckeditor',
18-
'ngMessages'])
18+
'ngMessages', 'ngAnimate'])
1919

2020
.run(function($ionicPlatform) {
2121
$ionicPlatform.ready(function() {

www/core/scss/styles.scss

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1609,3 +1609,27 @@ h2.invert {
16091609
}
16101610
}
16111611
}
1612+
1613+
/* Animations */
1614+
.mm-animate-show,
1615+
.mm-animate-show-hide {
1616+
&.ng-enter {
1617+
transition: 0.5s ease all;
1618+
opacity: 0;
1619+
}
1620+
1621+
&.ng-enter.ng-enter-active {
1622+
opacity: 1;
1623+
}
1624+
}
1625+
1626+
.mm-animate-hide,
1627+
.mm-animate-show-hide {
1628+
&.ng-leave {
1629+
transition: 0.5s ease all;
1630+
opacity: 1;
1631+
}
1632+
&.ng-leave.ng-leave-active {
1633+
opacity: 0;
1634+
}
1635+
}

www/core/templates/loading.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<div class="mm-loading-container" ng-if="!hideUntil">
1+
<div class="mm-loading-container mm-animate-show-hide" ng-if="!hideUntil">
22
<span class="mm-loading-spinner">
33
<ion-spinner></ion-spinner>
44
<p class="mm-loading-message" ng-if="dynMessage">{{dynMessage}}</p>
55
<p class="mm-loading-message" ng-if="message && !dynMessage">{{message}}</p>
66
</span>
77
</div>
8-
<div class="mm-loading-content" ng-if="hideUntil" ng-transclude>
8+
<div class="mm-loading-content mm-animate-show-hide" ng-if="hideUntil" ng-transclude>
99
</div>

0 commit comments

Comments
 (0)