Skip to content

docs(button): add stroked buttons to examples #11433

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 1 commit into from
Jun 28, 2018

Conversation

crisbeto
Copy link
Member

Adds the stroked buttons to the button varieties example and includes some margin so the buttons don't stick together.

Fixes #11379.

@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label May 21, 2018
@@ -3,3 +3,7 @@
align-items: center;
justify-content: space-around;
}

button, a {
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we want to make sure this margin-right is only added to ".example-button-row"?

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure. I went with the simpler selectors, because we've got style encapsulation, but these could still leak into other elements if we expand the example. It's changed now.

@crisbeto crisbeto force-pushed the stroked-button-docs branch from 3551737 to 9907a88 Compare May 22, 2018 17:44
@ngbot
Copy link

ngbot bot commented Jun 7, 2018

Hi @crisbeto! This PR has merge conflicts due to recent upstream merges.
Please help to unblock it by resolving these conflicts. Thanks!

2 similar comments
@ngbot
Copy link

ngbot bot commented Jun 7, 2018

Hi @crisbeto! This PR has merge conflicts due to recent upstream merges.
Please help to unblock it by resolving these conflicts. Thanks!

@ngbot
Copy link

ngbot bot commented Jun 7, 2018

Hi @crisbeto! This PR has merge conflicts due to recent upstream merges.
Please help to unblock it by resolving these conflicts. Thanks!

Adds the stroked buttons to the button varieties example and includes some margin so the buttons don't stick together.

Fixes angular#11379.
@crisbeto crisbeto force-pushed the stroked-button-docs branch from 9907a88 to 087ad6e Compare June 8, 2018 05:25
@josephperrott josephperrott added pr: lgtm action: merge The PR is ready for merge by the caretaker labels Jun 28, 2018
Copy link
Member

@josephperrott josephperrott left a comment

Choose a reason for hiding this comment

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

LGTM

@josephperrott josephperrott merged commit aa09628 into angular:master Jun 28, 2018
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 9, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Outlined button
4 participants