Skip to content
This repository has been archived by the owner on Sep 5, 2024. It is now read-only.

Commit

Permalink
fix(card): BREAKING CHANGE now md-card-actions
Browse files Browse the repository at this point in the history
  • Loading branch information
Marcy Sutton authored and ThomasBurleson committed Nov 4, 2015
1 parent bf08e17 commit f8c003c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions src/components/card/card.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ angular.module('material.components.card', [
* container will wrap text content and provide padding. An `<md-card-footer>` element can be
* optionally included to put content flush against the bottom edge of the card.
*
* Action buttons can be included in an element with the `.md-actions` class, also used in `md-dialog`.
* Action buttons can be included in an `<md-card-actions>` element, similar to `<md-dialog-actions>`.
* You can then position buttons using layout attributes.
*
* Cards have constant width and variable heights; where the maximum height is limited to what can
Expand Down Expand Up @@ -55,10 +55,10 @@ angular.module('material.components.card', [
* <h2>Card headline</h2>
* <p>Card content</p>
* </md-card-content>
* <div class="md-actions" layout="row" layout-align="end center">
* <md-card-actions layout="row" layout-align="end center">
* <md-button>Action 1</md-button>
* <md-button>Action 2</md-button>
* </div>
* </md-card-actions>
* </md-card>
* </hljs>
*
Expand Down
2 changes: 1 addition & 1 deletion src/components/card/card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ md-card {
padding: $card-padding;
}

.md-actions {
.md-actions, md-card-actions {
margin: 0;

.md-button {
Expand Down
4 changes: 2 additions & 2 deletions src/components/card/demoBasicUsage/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ <h2 class="md-title">Paracosm</h2>
two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well...
</p>
</md-card-content>
<div class="md-actions" layout="row" layout-align="end center">
<md-card-actions layout="row" layout-align="end center">
<md-button>Action 1</md-button>
<md-button>Action 2</md-button>
</div>
</md-card-actions>
</md-card>
<br/>

Expand Down

0 comments on commit f8c003c

Please sign in to comment.