diff --git a/dist/ionic-angular.js b/dist/ionic-angular.js index 281308452e..57daab4207 100644 --- a/dist/ionic-angular.js +++ b/dist/ionic-angular.js @@ -21,7 +21,9 @@ angular.module('ionic.service.modal', ['ionic.service']) var element = $compile(templateString)(scope); $document[0].body.appendChild(element[0]); - return new ionic.views.Modal({el: element[0] }); + var modal = ionic.views.Modal({el: element[0] }); + scope.modal = modal; + return modal; }, fromTemplateUrl: function(url, cb) { TemplateLoader.load(url).then(function(templateString) { @@ -33,6 +35,7 @@ angular.module('ionic.service.modal', ['ionic.service']) $document[0].body.appendChild(element[0]); var modal = new ionic.views.Modal({ el: element[0] }); + scope.modal = modal; cb(modal); }); diff --git a/dist/ionic-ios7.css b/dist/ionic-ios7.css index 1b6ee1182b..d6f1b7dce2 100644 --- a/dist/ionic-ios7.css +++ b/dist/ionic-ios7.css @@ -1,4 +1,3 @@ -@charset "UTF-8"; /** * Adapted from normalize.css and some reset.css. We don't care even one * bit about old IE, so we don't need any hacks for that in here. @@ -182,7 +181,7 @@ sub { fieldset { margin: 0 2px; padding: 0.35em 0.625em 0.75em; - border: 1px solid silver; } + border: 1px solid #c0c0c0; } /** * 1. Correct `color` not being inherited in IE 8/9. @@ -1502,12 +1501,16 @@ address { background-color: white; opacity: 0; -webkit-transform: translate3d(0, 100%, 0); - transform: translate3d(0, 100%, 0); } + transform: translate3d(0, 100%, 0); + -webkit-transition: -webkit-transform 0.25s, opacity 0.25s; + transition: -webkit-transform 0.25s, opacity 0.25s; + -webkit-transition-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1); + transition-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1); } .modal.active { - -webkit-transform: translate3d(0, 0%, 0); - transform: translate3d(0, 0%, 0); opacity: 1; - height: 100%; } + height: 100%; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); } .list { margin-bottom: 20px; @@ -1774,7 +1777,7 @@ select:focus, input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { - outline: thin dotted #333333; + outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -1861,7 +1864,7 @@ input[type="checkbox"][readonly] { right: 20px; transition: 0.2s ease; transition-property: left, right; - transition-delay: 0s, 0.05s; } + transition-delay: 0s, .05s; } .toggle :checked + .track { /* When the toggle is "on" */ @@ -1876,7 +1879,7 @@ input[type="checkbox"][readonly] { right: 0; left: 20px; -webkit-transform: none; - transition-delay: 0.05s, 0s; } + transition-delay: .05s, 0s; } /* hide a radio button's icon by default */ .radio-item [class^="icon-"], @@ -2053,7 +2056,7 @@ input[type="checkbox"][readonly] { border: none; background: none; } .button.button-icon:active, .button.button-icon.active { - text-shadow: 0px 0px 10px white; + text-shadow: 0px 0px 10px #fff; box-shadow: none; background: none; } @@ -2236,7 +2239,7 @@ a.button { width: 100%; background-color: white; border-radius: 2px; - border: 1px solid #dddddd; } + border: 1px solid #ddd; } .card-header { padding: 10px; @@ -2277,15 +2280,48 @@ a.button { -webkit-transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0); } + 5% { + opacity: 1; } + 100% { opacity: 1; -webkit-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); } } +@-webkit-keyframes slide-in-down { + 0% { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); } + + 95% { + opacity: 0; } + + 100% { + opacity: 0; + -webkit-transform: translate3d(0, 100%, 0); + transform: translate3d(0, 100%, 0); } } + +.slide-in-up { + /* + opacity: 0; + -webkit-transform: translate3d(0, 100%, 0); + transform: translate3d(0, 100%, 0); + animation: slide-in-down 0.5s; + -webkit-animation: slide-in-down 0.5s; + -webkit-animation-timing-function: $bezier-function; + */ } + +/* + -webkit-animation: slide-in-up 0.5s; + -webkit-animation-direction: reverse; +} +*/ .slide-in-up.active { + /* animation: slide-in-up 0.5s; -webkit-animation: slide-in-up 0.5s; - -webkit-animation-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1); } + -webkit-animation-fill-mode: forwards; + */ } @keyframes fadein { from { diff --git a/dist/ionic.css b/dist/ionic.css index 5d6d7f9233..071d0c4157 100644 --- a/dist/ionic.css +++ b/dist/ionic.css @@ -1,4 +1,3 @@ -@charset "UTF-8"; @font-face { font-family: 'ionicon-test'; src: url("fonts/ionicon-test.eot"); @@ -247,7 +246,7 @@ sub { fieldset { margin: 0 2px; padding: 0.35em 0.625em 0.75em; - border: 1px solid silver; } + border: 1px solid #c0c0c0; } /** * 1. Correct `color` not being inherited in IE 8/9. @@ -1560,12 +1559,16 @@ address { background-color: white; opacity: 0; -webkit-transform: translate3d(0, 100%, 0); - transform: translate3d(0, 100%, 0); } + transform: translate3d(0, 100%, 0); + -webkit-transition: -webkit-transform 0.25s, opacity 0.25s; + transition: -webkit-transform 0.25s, opacity 0.25s; + -webkit-transition-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1); + transition-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1); } .modal.active { - -webkit-transform: translate3d(0, 0%, 0); - transform: translate3d(0, 0%, 0); opacity: 1; - height: 100%; } + height: 100%; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); } .list { margin-bottom: 20px; @@ -1832,7 +1835,7 @@ select:focus, input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { - outline: thin dotted #333333; + outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -2105,7 +2108,7 @@ input[type="checkbox"][readonly] { border: none; background: none; } .button.button-icon:active, .button.button-icon.active { - text-shadow: 0px 0px 10px white; + text-shadow: 0px 0px 10px #fff; box-shadow: none; background: none; } @@ -2288,7 +2291,7 @@ a.button { width: 100%; background-color: white; border-radius: 2px; - border: 1px solid #dddddd; } + border: 1px solid #ddd; } .card-header { padding: 10px; @@ -2329,15 +2332,48 @@ a.button { -webkit-transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0); } + 5% { + opacity: 1; } + 100% { opacity: 1; -webkit-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); } } +@-webkit-keyframes slide-in-down { + 0% { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); } + + 95% { + opacity: 0; } + + 100% { + opacity: 0; + -webkit-transform: translate3d(0, 100%, 0); + transform: translate3d(0, 100%, 0); } } + +.slide-in-up { + /* + opacity: 0; + -webkit-transform: translate3d(0, 100%, 0); + transform: translate3d(0, 100%, 0); + animation: slide-in-down 0.5s; + -webkit-animation: slide-in-down 0.5s; + -webkit-animation-timing-function: $bezier-function; + */ } + +/* + -webkit-animation: slide-in-up 0.5s; + -webkit-animation-direction: reverse; +} +*/ .slide-in-up.active { + /* animation: slide-in-up 0.5s; -webkit-animation: slide-in-up 0.5s; - -webkit-animation-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1); } + -webkit-animation-fill-mode: forwards; + */ } @keyframes fadein { from { diff --git a/example/toderp2/index.html b/example/toderp2/index.html index 9653be8cfc..db8a771215 100644 --- a/example/toderp2/index.html +++ b/example/toderp2/index.html @@ -81,7 +81,7 @@
-