From 57d71ed6c321921a0b1adf501a2ce0bf432f3f61 Mon Sep 17 00:00:00 2001 From: Andy Joslin Date: Fri, 21 Mar 2014 15:59:54 -0500 Subject: [PATCH] feat($ionicLoading): implement backdrop class Closes #837. --- js/ext/angular/src/directive/ionicLoading.js | 2 +- scss/_popup.scss | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/js/ext/angular/src/directive/ionicLoading.js b/js/ext/angular/src/directive/ionicLoading.js index 145d696c016..5b852c68660 100644 --- a/js/ext/angular/src/directive/ionicLoading.js +++ b/js/ext/angular/src/directive/ionicLoading.js @@ -15,7 +15,7 @@ angular.module('ionic.ui.loading', []) link: function($scope, $element){ $element.addClass($scope.animation || ''); }, - template: '
' + + template: '
' + '
' + '
' + '
' diff --git a/scss/_popup.scss b/scss/_popup.scss index c0f5e405bd6..a2c06248b33 100644 --- a/scss/_popup.scss +++ b/scss/_popup.scss @@ -107,6 +107,7 @@ } .loading-backdrop { + @include transition(visibility 0s linear 0.3s); position: fixed; top: 0; left: 0; @@ -119,13 +120,9 @@ &.active { @include transition-delay(0s); visibility: visible; - } -} - -.loading-backdrop { - @include transition(visibility 0s linear 0.3s); - &.active { - background-color: rgba(0,0,0,0.7); + &.show-backdrop { + background-color: rgba(0,0,0,0.7); + } } }