diff --git a/dist/css/ionic.css b/dist/css/ionic.css index 589f75e613..4ca85e7974 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -1,4 +1,3 @@ -@charset "UTF-8"; /*! * Copyright 2013 Drifty Co. * http://drifty.com/ @@ -5227,15 +5226,16 @@ a.button { */ .slide-left-right-ios7 > .ng-enter, .slide-left-right-ios7.ng-enter, .slide-left-right-ios7 > .ng-leave, .slide-left-right-ios7.ng-leave { - -webkit-transition: all cubic-bezier(0.1, 0.75, 0.3, 0.95) 750ms; - -moz-transition: all cubic-bezier(0.1, 0.75, 0.3, 0.95) 750ms; - transition: all cubic-bezier(0.1, 0.75, 0.3, 0.95) 750ms; + -webkit-transition: all ease-in-out 250ms; + -moz-transition: all ease-in-out 250ms; + transition: all ease-in-out 250ms; position: absolute; top: 0; - right: 0; + right: -1px; bottom: 0; - left: 0; - box-shadow: -1px 0px 2px rgba(0, 0, 0, 0.2), 1px 0px 2px rgba(0, 0, 0, 0.2); } + left: -1px; + border-left: 1px solid #ddd; + border-right: 1px solid #ddd; } .slide-left-right-ios7 > .ng-enter, .slide-left-right-ios7.ng-enter { /* NEW content placed far RIGHT BEFORE it slides IN from the RIGHT */ -webkit-transform: translate3d(100%, 0, 0); @@ -5252,14 +5252,16 @@ a.button { -moz-transform: translate3d(-15%, 0, 0); transform: translate3d(-15%, 0, 0); } .slide-left-right-ios7.reverse > .ng-enter, .slide-left-right-ios7.reverse.ng-enter, .slide-left-right-ios7.reverse > .ng-leave, .slide-left-right-ios7.reverse.ng-leave { - -webkit-transition: all cubic-bezier(0.1, 0.75, 0.3, 0.95) 750ms; - -moz-transition: all cubic-bezier(0.1, 0.75, 0.3, 0.95) 750ms; - transition: all cubic-bezier(0.1, 0.75, 0.3, 0.95) 750ms; + -webkit-transition: all ease-in-out 250ms; + -moz-transition: all ease-in-out 250ms; + transition: all ease-in-out 250ms; position: absolute; top: 0; - right: 0; + right: -1px; bottom: 0; - left: 0; } + left: -1px; + border-left: 1px solid #ddd; + border-right: 1px solid #ddd; } .slide-left-right-ios7.reverse > .ng-enter, .slide-left-right-ios7.reverse.ng-enter { /* NEW content placed far LEFT BEFORE it slides IN from the LEFT */ -webkit-transform: translate3d(-100%, 0, 0); @@ -5571,9 +5573,9 @@ a.button { -webkit-transition: all 350ms; -moz-transition: all 350ms; transition: all 350ms; - -webkit-transition-timing-function: cubic-bezier(0.1, 0.75, 0.3, 0.95); - -moz-transition-timing-function: cubic-bezier(0.1, 0.75, 0.3, 0.95); - transition-timing-function: cubic-bezier(0.1, 0.75, 0.3, 0.95); + -webkit-transition-timing-function: ease-in-out; + -moz-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; opacity: 1; } .nav-title-slide-ios7 > .ng-enter, .nav-title-slide-ios7.ng-enter { -webkit-transform: translate3d(30%, 0, 0); @@ -5596,9 +5598,9 @@ a.button { -webkit-transition: all 350ms; -moz-transition: all 350ms; transition: all 350ms; - -webkit-transition-timing-function: cubic-bezier(0.1, 0.75, 0.3, 0.95); - -moz-transition-timing-function: cubic-bezier(0.1, 0.75, 0.3, 0.95); - transition-timing-function: cubic-bezier(0.1, 0.75, 0.3, 0.95); + -webkit-transition-timing-function: ease-in-out; + -moz-transition-timing-function: ease-in-out; + transition-timing-function: ease-in-out; opacity: 1; } .reverse .nav-title-slide-ios7 > .ng-enter, .reverse .nav-title-slide-ios7.ng-enter { -webkit-transform: translate3d(-30%, 0, 0); diff --git a/dist/css/themes/ionic-ios7.css b/dist/css/themes/ionic-ios7.css index 1e5a055c50..23bcd03921 100644 --- a/dist/css/themes/ionic-ios7.css +++ b/dist/css/themes/ionic-ios7.css @@ -1,4 +1,3 @@ -@charset "UTF-8"; /*! * Copyright 2013 Drifty Co. * http://drifty.com/ diff --git a/scss/_animations.scss b/scss/_animations.scss index b2de862eb0..098258e015 100644 --- a/scss/_animations.scss +++ b/scss/_animations.scss @@ -89,8 +89,8 @@ * iOS7 style slide left to right * -------------------------------------------------- */ -$ios7-timing-function: cubic-bezier(.10, .75, .30, .95); -$ios7-transition-duration: 750ms; +$ios7-timing-function: ease-in-out; +$ios7-transition-duration: 250ms; .slide-left-right-ios7 { > .ng-enter, &.ng-enter, @@ -98,10 +98,11 @@ $ios7-transition-duration: 750ms; @include transition(all $ios7-timing-function $ios7-transition-duration); position: absolute; top: 0; - right: 0; + right: -1px; bottom: 0; - left: 0; - box-shadow: $menu-side-shadow; + left: -1px; + border-left: 1px solid #ddd; + border-right: 1px solid #ddd; } > .ng-enter, &.ng-enter { /* NEW content placed far RIGHT BEFORE it slides IN from the RIGHT */ @@ -123,9 +124,11 @@ $ios7-transition-duration: 750ms; @include transition(all $ios7-timing-function $ios7-transition-duration); position: absolute; top: 0; - right: 0; + right: -1px; bottom: 0; - left: 0; + left: -1px; + border-left: 1px solid #ddd; + border-right: 1px solid #ddd; } > .ng-enter, &.ng-enter { /* NEW content placed far LEFT BEFORE it slides IN from the LEFT */