Skip to content

docs(toolbar): spruce up the toolbar component examples #18745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/components-examples/material/toolbar/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ ng_module(
]),
module_name = "@angular/components-examples/material/toolbar",
deps = [
"//src/material/button",
"//src/material/icon",
"//src/material/toolbar",
],
Expand Down
5 changes: 5 additions & 0 deletions src/components-examples/material/toolbar/index.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
import {NgModule} from '@angular/core';
import {MatButtonModule} from '@angular/material/button';
import {MatIconModule} from '@angular/material/icon';
import {MatToolbarModule} from '@angular/material/toolbar';
import {ToolbarBasicExample} from './toolbar-basic/toolbar-basic-example';
import {ToolbarMultirowExample} from './toolbar-multirow/toolbar-multirow-example';
import {ToolbarOverviewExample} from './toolbar-overview/toolbar-overview-example';

export {
ToolbarBasicExample,
ToolbarMultirowExample,
ToolbarOverviewExample,
};

const EXAMPLES = [
ToolbarBasicExample,
ToolbarMultirowExample,
ToolbarOverviewExample,
];

@NgModule({
imports: [
MatButtonModule,
MatIconModule,
MatToolbarModule,
],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.example-spacer {
flex: 1 1 auto;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<mat-toolbar>
<button mat-icon-button class="example-icon" aria-label="Example icon-button with menu icon">
<mat-icon>menu</mat-icon>
</button>
<span>My App</span>
<span class="example-spacer"></span>
<button mat-icon-button class="example-icon favorite-icon" aria-label="Example icon-button with heart icon">
<mat-icon>favorite</mat-icon>
</button>
<button mat-icon-button class="example-icon" aria-label="Example icon-button with share icon">
<mat-icon>share</mat-icon>
</button>
</mat-toolbar>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import {Component} from '@angular/core';

/**
* @title Basic toolbar
*/
@Component({
selector: 'toolbar-basic-example',
templateUrl: 'toolbar-basic-example.html',
styleUrls: ['toolbar-basic-example.css'],
})
export class ToolbarBasicExample {}
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
/** No CSS for this example */
.example-spacer {
flex: 1 1 auto;
}
Original file line number Diff line number Diff line change
@@ -1 +1,54 @@
<mat-toolbar>My App</mat-toolbar>
<p>
<mat-toolbar>
<button mat-icon-button class="example-icon" aria-label="Example icon-button with menu icon">
<mat-icon>menu</mat-icon>
</button>
<span>My App</span>
<span class="example-spacer"></span>
<button mat-icon-button class="example-icon favorite-icon" aria-label="Example icon-button with heart icon">
<mat-icon>favorite</mat-icon>
</button>
<button mat-icon-button class="example-icon" aria-label="Example icon-button with share icon">
<mat-icon>share</mat-icon>
</button>
</mat-toolbar>
</p>

<p>
<mat-toolbar color="primary">
<button mat-icon-button class="example-icon" aria-label="Example icon-button with menu icon">
<mat-icon>menu</mat-icon>
</button>
<span>My App</span>
<span class="example-spacer"></span>
<button mat-icon-button class="example-icon favorite-icon" aria-label="Example icon-button with heart icon">
<mat-icon>favorite</mat-icon>
</button>
<button mat-icon-button class="example-icon" aria-label="Example icon-button with share icon">
<mat-icon>share</mat-icon>
</button>
</mat-toolbar>
</p>

<p>
<mat-toolbar color="primary">
<mat-toolbar-row>
<span>My App</span>
<span class="example-spacer"></span>
<button mat-icon-button class="example-icon" aria-label="Example icon-button with menu icon">
<mat-icon>menu</mat-icon>
</button>
</mat-toolbar-row>

<mat-toolbar-row>
<span>Second Line</span>
<span class="example-spacer"></span>
<button mat-icon-button class="example-icon favorite-icon" aria-label="Example icon-button with heart icon">
<mat-icon>favorite</mat-icon>
</button>
<button mat-icon-button class="example-icon" aria-label="Example icon-button with share icon">
<mat-icon>share</mat-icon>
</button>
</mat-toolbar-row>
</mat-toolbar>
</p>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {Component} from '@angular/core';

/**
* @title Basic toolbar
* @title Toolbar overview
*/
@Component({
selector: 'toolbar-overview-example',
Expand Down
1 change: 1 addition & 0 deletions src/dev-app/toolbar/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ ng_module(
":toolbar_demo_scss",
],
deps = [
"//src/components-examples/material/toolbar",
"//src/material/button",
"//src/material/form-field",
"//src/material/icon",
Expand Down
2 changes: 2 additions & 0 deletions src/dev-app/toolbar/toolbar-demo-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {MatSelectModule} from '@angular/material/select';
import {MatToolbarModule} from '@angular/material/toolbar';
import {RouterModule} from '@angular/router';
import {ToolbarDemo} from './toolbar-demo';
import {ToolbarExamplesModule} from '@angular/components-examples/material/toolbar';

@NgModule({
imports: [
Expand All @@ -24,6 +25,7 @@ import {ToolbarDemo} from './toolbar-demo';
MatInputModule,
MatSelectModule,
MatToolbarModule,
ToolbarExamplesModule,
RouterModule.forChild([{path: '', component: ToolbarDemo}]),
],
declarations: [ToolbarDemo],
Expand Down
4 changes: 4 additions & 0 deletions src/dev-app/toolbar/toolbar-demo.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<div class="demo-toolbar">
<p>
<toolbar-overview-example></toolbar-overview-example>
</p>

<p>
<mat-toolbar>
<button mat-icon-button>
Expand Down