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

Commit

Permalink
fix(cards): applying zero margin only on first and last p elements
Browse files Browse the repository at this point in the history
Accidentally applied zero margin to every `p` in the card, which caused multiple `p` elements to stick together.
This fix is only applies zero margin to the first and last element

* fixed test with iit

Closes #6060
  • Loading branch information
EladBezalel authored and jelbourn committed Dec 3, 2015
1 parent 72fc318 commit aa6a058
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
8 changes: 7 additions & 1 deletion src/components/card/card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,13 @@ md-card {
padding: $card-padding;

& > p {
margin: 0;
&:first-child {
margin-top: 0;
}

&:last-child {
margin-bottom: 0;
}
}

.md-media-xl {
Expand Down
8 changes: 8 additions & 0 deletions src/components/card/demoCardActionButtons/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@
The titles of Washed Out's breakthrough song and the first single from Paracosm share the
two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well...
</p>
<p>
The titles of Washed Out's breakthrough song and the first single from Paracosm share the
two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well...
</p>
<p>
The titles of Washed Out's breakthrough song and the first single from Paracosm share the
two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well...
</p>
</md-card-content>
<md-card-actions layout="row" layout-align="end center">
<md-button>Action 1</md-button>
Expand Down
2 changes: 1 addition & 1 deletion src/components/select/select.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ describe('<md-select>', function() {
}));


iit('removing a valid value from the model deselects its option', inject(function($rootScope) {
it('removing a valid value from the model deselects its option', inject(function($rootScope) {
$rootScope.model = [2,3];
var el = setupMultiple('ng-model="$root.model"', [1,2,3,4]);

Expand Down

0 comments on commit aa6a058

Please sign in to comment.