This commit is contained in:
Max Lynch
2013-11-25 14:36:47 -06:00
parent a156e5eba5
commit a8bb330c82
5 changed files with 13 additions and 15 deletions

14
dist/css/ionic.css vendored
View File

@@ -2563,11 +2563,12 @@ a.subdued {
.action-sheet-backdrop.active {
-webkit-animation: fadeInHalf 0.3s;
animation: fadeInHalf 0.3s;
-webkit-animation-fill-mode: forwards; }
-webkit-animation-fill-mode: both; }
.action-sheet-backdrop.active-remove {
background-color: rgba(0, 0, 0, 0.5);
-webkit-animation: fadeOutHalf 0.3s;
animation: fadeOutHalf 0.3s;
-webkit-animation-fill-mode: forwards; }
-webkit-animation-fill-mode: both; }
@-webkit-keyframes actionSheetUp {
0% {
@@ -4127,7 +4128,6 @@ textarea {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
display: block !important;
overflow: hidden;
padding: 4px 8px 3px;
border: none;
@@ -4440,7 +4440,7 @@ input[type="range"] {
background-position: center;
background-size: 96% 4px;
background-repeat: no-repeat;
-webkit-appearance: none !important; }
-webkit-appearance: none; }
input[type="range"]::-webkit-slider-thumb {
position: relative;
width: 20px;
@@ -4449,7 +4449,7 @@ input[type="range"] {
background-color: white;
box-shadow: 0 0 2px rgba(0, 0, 0, 0.5), 1px 3px 5px rgba(0, 0, 0, 0.25);
cursor: pointer;
-webkit-appearance: none !important; }
-webkit-appearance: none; }
input[type="range"]::-webkit-slider-thumb:before {
/* what creates the colorful line on the left side of the slider */
position: absolute;
@@ -5481,10 +5481,10 @@ a.button {
*/
.hidden,
.hide {
display: none !important; }
display: none; }
.show {
display: block !important; }
display: block; }
.inline {
display: inline-block; }

View File

@@ -1,3 +1,4 @@
@charset "UTF-8";
/**
* Nav controllers and header bar animations
*/

View File

@@ -83,10 +83,8 @@ angular.module('ionic.service.actionSheet', ['ionic.service.templateLoad', 'ioni
}
});
$timeout(function() {
$animate.removeClass(element, 'active', function() {
scope.$destroy();
});
$animate.removeClass(element, 'active', function() {
scope.$destroy();
});
};

View File

@@ -31,10 +31,8 @@ angular.module('ionic.service.actionSheet', ['ionic.service.templateLoad', 'ioni
}
});
$timeout(function() {
$animate.removeClass(element, 'active', function() {
scope.$destroy();
});
$animate.removeClass(element, 'active', function() {
scope.$destroy();
});
};

View File

@@ -37,6 +37,7 @@
}
&.active-remove {
background-color: rgba(0,0,0,0.5);
-webkit-animation: fadeOutHalf 0.3s;
animation: fadeOutHalf 0.3s;