Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat(dialog): add the ability to align the content of md-dialog-actions #2557

Merged
merged 3 commits into from
Jan 13, 2017
Merged

feat(dialog): add the ability to align the content of md-dialog-actions #2557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db8dc5b
feat(dialog): add the ability to align the content of md-dialog-actions
crisbeto Jan 6, 2017
9903e05
Fix linter error.
crisbeto Jan 7, 2017
f99ce1c
Rename "middle" to "center".
crisbeto Jan 13, 2017
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
8 changes: 8 additions & 0 deletions src/demo-app/dialog/dialog-demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@ <h2>Dialog position</h2>

<h2>Other options</h2>

<p>
<md-select placeholder="Button alignment" [(ngModel)]="actionsAlignment">
<md-option>Start</md-option>
<md-option value="end">End</md-option>
<md-option value="center">Center</md-option>
</md-select>
</p>

<md-checkbox [(ngModel)]="config.disableClose">Disable close</md-checkbox>
</md-card-content>
</md-card>
Expand Down
10 changes: 7 additions & 3 deletions src/demo-app/dialog/dialog-demo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {MdDialog, MdDialogRef, MdDialogConfig} from '@angular/material';
export class DialogDemo {
dialogRef: MdDialogRef<JazzDialog>;
lastCloseResult: string;
actionsAlignment: string;
config: MdDialogConfig = {
disableClose: false,
width: '',
Expand All @@ -34,7 +35,8 @@ export class DialogDemo {
}

openContentElement() {
this.dialog.open(ContentElementDialog, this.config);
let dialogRef = this.dialog.open(ContentElementDialog, this.config);
dialogRef.componentInstance.actionsAlignment = this.actionsAlignment;
}
}

Expand Down Expand Up @@ -78,7 +80,7 @@ export class JazzDialog {
</p>
</md-dialog-content>

<md-dialog-actions>
<md-dialog-actions [attr.align]="actionsAlignment">
<button
md-raised-button
color="primary"
Expand All @@ -92,4 +94,6 @@ export class JazzDialog {
</md-dialog-actions>
`
})
export class ContentElementDialog { }
export class ContentElementDialog {
actionsAlignment: string;
}
2 changes: 1 addition & 1 deletion src/lib/dialog/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ A reference to the dialog created by the MdDialog `open` method.
| `md-dialog-title` | Marks the title of the dialog.
| `md-dialog-content` | Scrollable content of the dialog.
| `md-dialog-close` | When added to a `button`, makes the element act as a close button for the dialog.
| `md-dialog-actions` | Wrapper for the set of actions at the bottom of a dialog. Typically contains buttons.
| `md-dialog-actions` | Wrapper for the set of actions at the bottom of a dialog. Typically contains buttons. The element's content can be aligned via the `align` attribute either to the `center` or the `end`. |

## Example
The service can be injected in a component.
Expand Down
10 changes: 9 additions & 1 deletion src/lib/dialog/dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,20 @@ md-dialog-content, [md-dialog-content], mat-dialog-content, [mat-dialog-content]

md-dialog-actions, [md-dialog-actions], mat-dialog-actions, [mat-dialog-actions] {
padding: $md-dialog-padding / 2 0;
display: block;
display: flex;

&:last-child {
// If the actions are the last element in a dialog, we need to pull them down
// over the dialog padding, in order to avoid the action's padding stacking
// with the dialog's.
margin-bottom: -$md-dialog-padding;
}

&[align='end'] {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If someone sets align with a binding ([align]="buttonAlignment")` does it still apply this attribute?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does. That's what I did in the playground/demo app.

justify-content: flex-end;
}

&[align='center'] {
justify-content: center;
}
}