Skip to content

Commit 5681406

Browse files
committed
docs(demos): update toolbar API demo and add navbar demo
references ionic-team/ionic-site#397
1 parent 1d473ae commit 5681406

File tree

4 files changed

+65
-57
lines changed

4 files changed

+65
-57
lines changed

demos/navbar/index.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import {App} from 'ionic/ionic';
2+
3+
// Use the toolbar demo but pass in the demo name to change the title
4+
@App({
5+
templateUrl: '../toolbar/main.html'
6+
})
7+
class ApiDemoApp {
8+
constructor() {
9+
this.demo = "Navbar";
10+
11+
this.favorites = "recent";
12+
this.apps = "free";
13+
}
14+
}

demos/toolbar/index.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,11 @@ import {App} from 'ionic/ionic';
33
@App({
44
templateUrl: 'main.html'
55
})
6-
class ApiDemoApp {}
6+
class ApiDemoApp {
7+
constructor() {
8+
this.demo = "Toolbar";
9+
10+
this.favorites = "recent";
11+
this.apps = "free";
12+
}
13+
}

demos/toolbar/main.html

Lines changed: 42 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<ion-toolbar>
2-
<ion-title>Toolbar</ion-title>
2+
<ion-title>{{demo}}</ion-title>
33
</ion-toolbar>
44

55
<ion-content>
66

77
<ion-toolbar>
8-
<ion-title>This is the title that never ends. It just goes on and on my friend.</ion-title>
8+
<ion-title>Long title that never ends. It just goes on and on my friend.</ion-title>
99
</ion-toolbar>
1010

1111

@@ -19,89 +19,75 @@
1919
</button>
2020
</ion-buttons>
2121
<ion-buttons end>
22-
<button secondary>
22+
<button>
2323
<ion-icon name="more"></ion-icon>
2424
</button>
2525
</ion-buttons>
26-
<ion-title>Defaults</ion-title>
26+
<ion-title>Default Buttons</ion-title>
2727
</ion-toolbar>
2828

29+
2930
<ion-toolbar>
3031
<ion-buttons start>
31-
<button solid>
32+
<button danger>
3233
<ion-icon name="contact"></ion-icon>
3334
</button>
34-
<button solid>
35-
<ion-icon name="contact"></ion-icon>
36-
Solid
35+
<button secondary>
36+
<ion-icon name="search"></ion-icon>
3737
</button>
3838
</ion-buttons>
39-
<ion-title>Solid</ion-title>
4039
<ion-buttons end>
41-
<button solid secondary>
42-
Help
43-
<ion-icon name="help-circle"></ion-icon>
40+
<button dark>
41+
<ion-icon name="more"></ion-icon>
4442
</button>
4543
</ion-buttons>
44+
<ion-title>Colored Buttons</ion-title>
4645
</ion-toolbar>
4746

4847

4948
<ion-toolbar>
5049
<ion-buttons start>
51-
<button outline>
50+
<button solid>
5251
<ion-icon name="contact"></ion-icon>
5352
</button>
54-
<button outline>
55-
<ion-icon name="star"></ion-icon>
56-
Star
57-
</button>
5853
</ion-buttons>
54+
<ion-title>Solid</ion-title>
5955
<ion-buttons end>
60-
<button secondary outline>
61-
<ion-icon name="contact"></ion-icon>
56+
<button solid secondary>
57+
Help
58+
<ion-icon name="help-circle"></ion-icon>
6259
</button>
6360
</ion-buttons>
64-
<ion-title>Outline</ion-title>
6561
</ion-toolbar>
6662

6763

6864
<ion-toolbar>
6965
<ion-buttons start>
70-
<button>
66+
<button outline>
7167
<ion-icon name="contact"></ion-icon>
72-
Clear
7368
</button>
7469
</ion-buttons>
7570
<ion-buttons end>
76-
<button>
77-
Edit
78-
<ion-icon name="create"></ion-icon>
71+
<button outline secondary>
72+
Help
73+
<ion-icon name="help-circle"></ion-icon>
7974
</button>
8075
</ion-buttons>
81-
<ion-title>Icon/Color Attr</ion-title>
76+
<ion-title>Outline</ion-title>
8277
</ion-toolbar>
8378

8479

80+
8581
<ion-toolbar>
8682
<button menuToggle>
8783
<ion-icon name="menu"></ion-icon>
8884
</button>
89-
<ion-buttons start>
90-
<button>
91-
<ion-icon name="star"></ion-icon>
92-
</button>
93-
</ion-buttons>
94-
<ion-title>Left side menu toggle</ion-title>
85+
<ion-title>Left Menu</ion-title>
9586
</ion-toolbar>
9687

9788

9889
<ion-toolbar>
99-
<ion-buttons end>
100-
<button #button1 (click)="buttonClick(button1)">
101-
<ion-icon name="star"></ion-icon>
102-
</button>
103-
</ion-buttons>
104-
<ion-title>Right side menu toggle</ion-title>
90+
<ion-title>Right Menu</ion-title>
10591
<button menuToggle right>
10692
<ion-icon name="menu"></ion-icon>
10793
</button>
@@ -113,36 +99,36 @@
11399
<ion-icon name="search"></ion-icon>
114100
</button>
115101
</ion-buttons>
116-
<ion-segment secondary>
117-
<ion-segment-button>
118-
Something
102+
<ion-segment danger [(ngModel)]="favorites">
103+
<ion-segment-button value="featured">
104+
Featured
119105
</ion-segment-button>
120-
<ion-segment-button>
121-
Else
106+
<ion-segment-button value="recent">
107+
Recent
122108
</ion-segment-button>
123109
</ion-segment>
124110
</ion-toolbar>
125111

126112
<ion-toolbar>
127-
<ion-segment>
128-
<ion-segment-button>
129-
Light
113+
<ion-segment [(ngModel)]="apps">
114+
<ion-segment-button value="paid">
115+
Paid
130116
</ion-segment-button>
131-
<ion-segment-button>
132-
Toolbar
117+
<ion-segment-button value="free">
118+
Free
133119
</ion-segment-button>
134-
<ion-segment-button>
135-
Default Segment
120+
<ion-segment-button value="top">
121+
Top
136122
</ion-segment-button>
137123
</ion-segment>
138124
</ion-toolbar>
139125

126+
<ion-toolbar>
127+
<ion-searchbar></ion-searchbar>
128+
</ion-toolbar>
140129

141-
<style>
142-
.toolbar {
143-
border-bottom: 1px solid black;
144-
background: #eee !important;
145-
}
146-
</style>
130+
<ion-toolbar primary>
131+
<ion-searchbar></ion-searchbar>
132+
</ion-toolbar>
147133

148134
</ion-content>

ionic/components/navbar/navbar.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ class ToolbarBackground {
8686
* </ion-navbar>
8787
* ```
8888
*
89+
* @demo /docs/v2/demos/navbar/
8990
* @see {@link ../../toolbar/Toolbar/ Toolbar API Docs}
9091
*/
9192
@Component({

0 commit comments

Comments
 (0)