Skip to content

bug(button): properly align text in fab buttons #5632 #5634

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

Merged
merged 2 commits into from
Jul 21, 2017
Merged

bug(button): properly align text in fab buttons #5632 #5634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbac6cb
bug(button): properly align text in fab buttons #5632
amcdnl Jul 9, 2017
21ccda6
chore(lint): fix css lint
amcdnl Jul 9, 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
5 changes: 5 additions & 0 deletions src/demo-app/button/button-demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,14 @@
<button md-fab>
<md-icon class="md-24">check</md-icon>
</button>
<button md-fab>Btn</button>
<a md-fab routerLink=".">Link</a>
<a md-fab routerLink="."><md-icon class="md-24">check</md-icon></a>
<button md-mini-fab>
<md-icon class="md-24">check</md-icon>
</button>
<button md-mini-fab>Btn</button>
<a md-mini-fab routerLink=".">Link</a>
</section>

<section>
Expand Down
3 changes: 2 additions & 1 deletion src/lib/button/_button-base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,9 @@ $mat-mini-fab-padding: 8px !default;
@include mat-elevation(12);
}

i, .mat-icon {
.mat-button-wrapper {
padding: $padding 0;
display: inline-block;
line-height: $mat-icon-button-line-height;
}
}
2 changes: 1 addition & 1 deletion src/lib/button/_button-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
}

@mixin mat-button-typography($config) {
.mat-button, .mat-raised-button, .mat-icon-button {
.mat-button, .mat-raised-button, .mat-icon-button, .mat-fab, .mat-mini-fab {
Copy link
Member

@jelbourn jelbourn Jul 10, 2017

Choose a reason for hiding this comment

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

@crisbeto did you have a reason for omitting the fab buttons here?

Copy link
Member

@crisbeto crisbeto Jul 10, 2017

Choose a reason for hiding this comment

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

I don't remember, but it was probably because the fabs aren't really meant to be used with text.

Copy link
Contributor Author

@amcdnl amcdnl Jul 10, 2017

Choose a reason for hiding this comment

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

@crisbeto Is there any reason why not to?

Copy link
Member

@crisbeto crisbeto Jul 10, 2017

Choose a reason for hiding this comment

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

The spec doesn't really have fabs with text, if I remember correctly, but it shouldn't be an issue to keep it anyway.

Copy link
Contributor Author

@amcdnl amcdnl Jul 10, 2017

Choose a reason for hiding this comment

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

@crisbeto We good to merge then?

font: {
family: mat-font-family($config);
size: mat-font-size($config, button);
Expand Down