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

Commit aa6a058

Browse files
EladBezaleljelbourn
authored andcommitted
fix(cards): applying zero margin only on first and last p elements
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
1 parent 72fc318 commit aa6a058

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

src/components/card/card.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,13 @@ md-card {
117117
padding: $card-padding;
118118

119119
& > p {
120-
margin: 0;
120+
&:first-child {
121+
margin-top: 0;
122+
}
123+
124+
&:last-child {
125+
margin-bottom: 0;
126+
}
121127
}
122128

123129
.md-media-xl {

src/components/card/demoCardActionButtons/index.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@
1313
The titles of Washed Out's breakthrough song and the first single from Paracosm share the
1414
two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well...
1515
</p>
16+
<p>
17+
The titles of Washed Out's breakthrough song and the first single from Paracosm share the
18+
two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well...
19+
</p>
20+
<p>
21+
The titles of Washed Out's breakthrough song and the first single from Paracosm share the
22+
two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well...
23+
</p>
1624
</md-card-content>
1725
<md-card-actions layout="row" layout-align="end center">
1826
<md-button>Action 1</md-button>

src/components/select/select.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ describe('<md-select>', function() {
487487
}));
488488

489489

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

0 commit comments

Comments
 (0)