fix(nabber): iOS nabber updates

This commit is contained in:
Adam Bradley
2015-09-29 16:41:30 -05:00
parent 6b07b86e8e
commit f6331a688f
3 changed files with 73 additions and 26 deletions

View File

@@ -1,7 +1,74 @@
import {App} from 'ionic/ionic';
import {App, IonicView, NavController} from 'ionic/ionic';
//
// Tab 1
//
@IonicView({
template: `
<ion-navbar *navbar>
<ion-title>Heart</ion-title>
</ion-navbar>
<ion-content class="padding">
<h2>Tab 1</h2>
</ion-content>
`
})
class Tab1 {
constructor(nav: NavController) {
this.nav = nav;
}
}
//
// Tab 2
//
@IonicView({
template: `
<ion-navbar *navbar>
<ion-title>Star</ion-title>
</ion-navbar>
<ion-content class="padding">
<h2>Tab 2</h2>
</ion-content>
`
})
class Tab2 {
constructor(nav: NavController) {
this.nav = nav;
}
}
//
// Tab 3
//
@IonicView({
template: `
<ion-navbar *navbar>
<ion-title>Stopwatch</ion-title>
</ion-navbar>
<ion-content class="padding">
<h2>Tab 3</h2>
</ion-content>
`
})
class Tab3 {
constructor(nav: NavController) {
this.nav = nav;
}
}
@App({
templateUrl: 'main.html'
template: `
<ion-tabs>
<ion-tab tab-title="Heart" tab-icon="heart" [root]="root1"></ion-tab>
<ion-tab tab-title="Star" tab-icon="star" [root]="root2"></ion-tab>
<ion-tab tab-title="Stopwatch" tab-icon="stopwatch" [root]="root3"></ion-tab>
</ion-tabs>`
})
class E2EApp {}
export class TabsPage {
constructor() {
this.root1 = Tab1;
this.root2 = Tab2;
this.root3 = Tab3;
}
}

View File

@@ -1,20 +0,0 @@
<ion-tabs>
<ion-tab tab-title="Tab 1" tab-icon="home">
<ion-content padding>
Tab 1 Content
</ion-content>
</ion-tab>
<ion-tab tab-title="Tab 2" tab-icon="star">
<ion-content padding>
Tab 2 Content
</ion-content>
</ion-tab>
</ion-tabs>

View File

@@ -49,7 +49,7 @@ $toolbar-ios-title-font-size: 1.7rem !default;
}
.back-button {
margin: 0 4px;
margin: 0;
min-height: 3.2rem;
line-height: 1;
order: map-get($toolbar-order-ios, 'back-button');
@@ -59,7 +59,7 @@ $toolbar-ios-title-font-size: 1.7rem !default;
.back-button-icon {
display: inherit;
margin: 0;
min-width: 20px;
min-width: 18px;
font-size: 3.2rem;
}
@@ -76,7 +76,7 @@ ion-title {
left: 0;
width: 100%;
height: 100%;
padding: 0px 90px;
padding: 0px 90px 1px 90px;
pointer-events: none;
}