Holding off on platform tweaks just yet

This commit is contained in:
Max Lynch
2014-06-12 13:28:46 -05:00
parent f0bafafec0
commit 0e647e77af
4 changed files with 42 additions and 5 deletions

View File

@@ -28,12 +28,12 @@ IonicModule
},
'android': {
'$ionicNavBarConfig': {
transition: 'no-animation',
alignTitle: 'left',
backButtonIcon: 'ion-android-arrow-back'
transition: 'nav-title-slide-ios7',
alignTitle: 'center',
backButtonIcon: 'ion-ios7-arrow-back'
},
'$ionicNavViewConfig': {
transition: 'fade-implode'
transition: 'slide-left-right-ios7'
},
'$ionicTabsConfig': {
type: 'tabs-striped',

View File

@@ -801,4 +801,39 @@ $nav-title-slide-ios7-delay: $ios7-transition-duration;
}
}
$nav-title-android-delay: 200ms;
$nav-title-android-timing-function: linear;
.nav-title-android {
&:not(.no-animation) .button.back-button {
@include transition(all $nav-title-android-delay);
@include transition-timing-function($nav-title-android-timing-function);
opacity: 1;
&.ng-hide {
opacity: 0;
}
&.ng-hide-add,
&.ng-hide-remove {
display: block !important;
}
&.ng-hide-add {
position: absolute;
}
&.ng-hide-remove {
}
}
> .ng-enter, &.ng-enter,
> .ng-leave, &.ng-leave {
@include transition(all $nav-title-android-delay);
@include transition-timing-function($nav-title-android-timing-function);
}
> .ng-enter, &.ng-enter {
opacity: 0;
}
> .ng-enter.ng-enter-active, &.ng-enter.ng-enter-active {
opacity: 1;
}
> .ng-leave.ng-leave-active, &.ng-leave.ng-leave-active {
opacity: 0;
}
}

View File

@@ -17,6 +17,7 @@
font-family: "Roboto", $font-family-base;
}
}
/*
.platform-android {
@@ -93,7 +94,7 @@
font-family: 'Roboto', $font-family-base;
}
*/
}
//}
.platform-ios7.platform-cordova {
// iOS7 has a status bar which sits on top of the header.

View File

@@ -14,6 +14,7 @@
<div>
<ion-nav-bar class="bar-positive">
<ion-nav-back-button class="button-icon" from-title>
Back
</ion-nav-back-button>
</ion-nav-bar>
<ion-nav-view></ion-nav-view>