javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 19:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(toolbar): added the ability to add a search bar or segment in toolbar

Browse Source 
Removed ion-segments dependency on being in the ion-title as this
should be for text only. References #356
This commit is contained in:
Brandy Carney
2015-11-02 15:43:00 -05:00
parent c19fcd5bed
commit ccd109dfee
3 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
ionic/components/segment/test/basic/main.html
View File

@ -1,14 +1,12 @@
<ion-toolbar>
<ion-title>
<ion-segment [(ng-model)]="relationship">
<ion-segment-button value="friends" class="e2eSegmentFriends">
Friends
</ion-segment-button>
<ion-segment-button value="enemies">
Enemies
</ion-segment-button>
</ion-segment>
</ion-title>
<ion-segment [(ng-model)]="relationship">
<ion-segment-button value="friends" class="e2eSegmentFriends">
Friends
</ion-segment-button>
<ion-segment-button value="enemies">
Enemies
</ion-segment-button>
</ion-segment>
</ion-toolbar>
<ion-toolbar>
@ -17,16 +15,14 @@
<icon search></icon>
</button>
</ion-nav-items>
<ion-title>
<ion-segment secondary>
<ion-segment-button>
Something
</ion-segment-button>
<ion-segment-button>
Else
</ion-segment-button>
</ion-segment>
</ion-title>
<ion-segment secondary>
<ion-segment-button>
Something
</ion-segment-button>
<ion-segment-button>
Else
</ion-segment-button>
</ion-segment>
</ion-toolbar>
<ion-content padding>
@ -87,17 +83,15 @@
</ion-content>
<ion-toolbar position="bottom">
<ion-title>
<ion-segment [(ng-model)]="appType" primary>
<ion-segment-button value="paid">
Paid
</ion-segment-button>
<ion-segment-button value="free">
Free
</ion-segment-button>
<ion-segment-button value="top" class="e2eSegmentTopGrossing">
Top Grossing
</ion-segment-button>
</ion-segment>
</ion-title>
<ion-segment [(ng-model)]="appType" primary>
<ion-segment-button value="paid">
Paid
</ion-segment-button>
<ion-segment-button value="free">
Free
</ion-segment-button>
<ion-segment-button value="top" class="e2eSegmentTopGrossing">
Top Grossing
</ion-segment-button>
</ion-segment>
</ion-toolbar>