Skip to content

Commit a8bb330

Browse files
committed
Fixed #214
1 parent a156e5e commit a8bb330

File tree

5 files changed

+13
-15
lines changed

5 files changed

+13
-15
lines changed

dist/css/ionic.css

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2563,11 +2563,12 @@ a.subdued {
25632563
.action-sheet-backdrop.active {
25642564
-webkit-animation: fadeInHalf 0.3s;
25652565
animation: fadeInHalf 0.3s;
2566-
-webkit-animation-fill-mode: forwards; }
2566+
-webkit-animation-fill-mode: both; }
25672567
.action-sheet-backdrop.active-remove {
2568+
background-color: rgba(0, 0, 0, 0.5);
25682569
-webkit-animation: fadeOutHalf 0.3s;
25692570
animation: fadeOutHalf 0.3s;
2570-
-webkit-animation-fill-mode: forwards; }
2571+
-webkit-animation-fill-mode: both; }
25712572

25722573
@-webkit-keyframes actionSheetUp {
25732574
0% {
@@ -4127,7 +4128,6 @@ textarea {
41274128
-webkit-border-radius: 2px;
41284129
-moz-border-radius: 2px;
41294130
border-radius: 2px;
4130-
display: block !important;
41314131
overflow: hidden;
41324132
padding: 4px 8px 3px;
41334133
border: none;
@@ -4440,7 +4440,7 @@ input[type="range"] {
44404440
background-position: center;
44414441
background-size: 96% 4px;
44424442
background-repeat: no-repeat;
4443-
-webkit-appearance: none !important; }
4443+
-webkit-appearance: none; }
44444444
input[type="range"]::-webkit-slider-thumb {
44454445
position: relative;
44464446
width: 20px;
@@ -4449,7 +4449,7 @@ input[type="range"] {
44494449
background-color: white;
44504450
box-shadow: 0 0 2px rgba(0, 0, 0, 0.5), 1px 3px 5px rgba(0, 0, 0, 0.25);
44514451
cursor: pointer;
4452-
-webkit-appearance: none !important; }
4452+
-webkit-appearance: none; }
44534453
input[type="range"]::-webkit-slider-thumb:before {
44544454
/* what creates the colorful line on the left side of the slider */
44554455
position: absolute;
@@ -5481,10 +5481,10 @@ a.button {
54815481
*/
54825482
.hidden,
54835483
.hide {
5484-
display: none !important; }
5484+
display: none; }
54855485

54865486
.show {
5487-
display: block !important; }
5487+
display: block; }
54885488

54895489
.inline {
54905490
display: inline-block; }

dist/css/themes/ionic-ios7.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@charset "UTF-8";
12
/**
23
* Nav controllers and header bar animations
34
*/

dist/js/ionic-angular.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,8 @@ angular.module('ionic.service.actionSheet', ['ionic.service.templateLoad', 'ioni
8383
}
8484
});
8585

86-
$timeout(function() {
87-
$animate.removeClass(element, 'active', function() {
88-
scope.$destroy();
89-
});
86+
$animate.removeClass(element, 'active', function() {
87+
scope.$destroy();
9088
});
9189
};
9290

js/ext/angular/src/service/ionicActionSheet.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@ angular.module('ionic.service.actionSheet', ['ionic.service.templateLoad', 'ioni
3131
}
3232
});
3333

34-
$timeout(function() {
35-
$animate.removeClass(element, 'active', function() {
36-
scope.$destroy();
37-
});
34+
$animate.removeClass(element, 'active', function() {
35+
scope.$destroy();
3836
});
3937
};
4038

scss/_action-sheet.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
}
3838

3939
&.active-remove {
40+
background-color: rgba(0,0,0,0.5);
4041
-webkit-animation: fadeOutHalf 0.3s;
4142
animation: fadeOutHalf 0.3s;
4243

0 commit comments

Comments
 (0)