Skip to content

Commit a156e5e

Browse files
committed
Partial pull of #186
1 parent b6771ad commit a156e5e

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

dist/css/ionic.css

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@charset "UTF-8";
12
/**
23
* Copyright 2013 Drifty Co.
34
* http://drifty.com/
@@ -2562,11 +2563,11 @@ a.subdued {
25622563
.action-sheet-backdrop.active {
25632564
-webkit-animation: fadeInHalf 0.3s;
25642565
animation: fadeInHalf 0.3s;
2565-
-webkit-animation-fill-mode: both; }
2566+
-webkit-animation-fill-mode: forwards; }
25662567
.action-sheet-backdrop.active-remove {
25672568
-webkit-animation: fadeOutHalf 0.3s;
25682569
animation: fadeOutHalf 0.3s;
2569-
-webkit-animation-fill-mode: both; }
2570+
-webkit-animation-fill-mode: forwards; }
25702571

25712572
@-webkit-keyframes actionSheetUp {
25722573
0% {
@@ -4126,6 +4127,7 @@ textarea {
41264127
-webkit-border-radius: 2px;
41274128
-moz-border-radius: 2px;
41284129
border-radius: 2px;
4130+
display: block !important;
41294131
overflow: hidden;
41304132
padding: 4px 8px 3px;
41314133
border: none;
@@ -4438,7 +4440,7 @@ input[type="range"] {
44384440
background-position: center;
44394441
background-size: 96% 4px;
44404442
background-repeat: no-repeat;
4441-
-webkit-appearance: none; }
4443+
-webkit-appearance: none !important; }
44424444
input[type="range"]::-webkit-slider-thumb {
44434445
position: relative;
44444446
width: 20px;
@@ -4447,7 +4449,7 @@ input[type="range"] {
44474449
background-color: white;
44484450
box-shadow: 0 0 2px rgba(0, 0, 0, 0.5), 1px 3px 5px rgba(0, 0, 0, 0.25);
44494451
cursor: pointer;
4450-
-webkit-appearance: none; }
4452+
-webkit-appearance: none !important; }
44514453
input[type="range"]::-webkit-slider-thumb:before {
44524454
/* what creates the colorful line on the left side of the slider */
44534455
position: absolute;
@@ -5479,10 +5481,10 @@ a.button {
54795481
*/
54805482
.hidden,
54815483
.hide {
5482-
display: none; }
5484+
display: none !important; }
54835485

54845486
.show {
5485-
display: block; }
5487+
display: block !important; }
54865488

54875489
.inline {
54885490
display: inline-block; }

dist/js/ionic-angular.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,6 @@ angular.module('ionic.ui.actionSheet', [])
469469
$scope.$on('$destroy', function() {
470470
$element.remove();
471471
$document.unbind('keyup', keyUp);
472-
$element.unbind('click', backdropClick);
473472
});
474473

475474
$document.bind('keyup', keyUp);

js/ext/angular/src/directive/ionicActionSheet.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ angular.module('ionic.ui.actionSheet', [])
2525
$scope.$on('$destroy', function() {
2626
$element.remove();
2727
$document.unbind('keyup', keyUp);
28-
$element.unbind('click', backdropClick);
2928
});
3029

3130
$document.bind('keyup', keyUp);

0 commit comments

Comments
 (0)