Skip to content

Commit 682ba7f

Browse files
authored
[Card]: refactor spacing (#15599)
1 parent ed90b04 commit 682ba7f

File tree

4 files changed

+167
-123
lines changed

4 files changed

+167
-123
lines changed

projects/igniteui-angular/src/lib/core/styles/components/card/_card-theme.scss

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@
114114
$not-material-theme: $variant != 'material';
115115

116116
$card-heading-padding: rem(16px, 16px);
117-
$card-content-padding: rem(16px);
118-
$card-actions-padding: rem(8px);
119117

120118
$card-tgroup-margin: 0 em(16px);
121119

@@ -159,7 +157,7 @@
159157
%igx-card-header {
160158
display: flex;
161159
flex-flow: row wrap;
162-
align-content: flex-start;
160+
align-items: center;
163161
width: 100%;
164162
padding: $card-heading-padding;
165163
color: var-get($theme, 'header-text-color');
@@ -168,10 +166,6 @@
168166
display: block;
169167
padding: 0;
170168
}
171-
172-
@if $variant == 'fluent' {
173-
padding: rem(16px) rem(8px);
174-
}
175169
}
176170

177171
%igx-card-header--vertical {
@@ -195,7 +189,6 @@
195189
}
196190

197191
%igx-card-header-thumbnail {
198-
align-self: flex-start;
199192
margin-inline-end: rem(16px);
200193

201194
@if $variant == 'indigo' {
@@ -235,7 +228,7 @@
235228
%igx-card-content {
236229
display: block;
237230
width: 100%;
238-
padding: $card-content-padding;
231+
padding: rem(16px);
239232
color: var-get($theme, 'content-text-color');
240233
overflow: auto;
241234
}
@@ -259,6 +252,14 @@
259252
}
260253

261254
%igx-card-actions {
255+
$card-actions-padding: map.get((
256+
'material': rem(8px) rem(16px),
257+
'fluent': rem(8px) rem(16px),
258+
'bootstrap': rem(16px),
259+
'indigo': rem(16px),
260+
), $variant);
261+
262+
262263
display: flex;
263264
flex-flow: row wrap;
264265
justify-content: space-between;
@@ -283,29 +284,26 @@
283284

284285
@if $variant == 'bootstrap' {
285286
%igx-card-content {
286-
@if $variant == 'bootstrap' {
287-
padding-block: rem(16px) rem(24px);
288-
padding-inline: rem(24px);
289-
}
290-
}
291-
292-
%igx-card-actions {
293-
padding: rem(16px);
287+
padding-block-end: rem(24px);
294288
}
295289
}
296290

297291
@if $variant == 'indigo' {
298-
%igx-card-content,
299-
%igx-card-actions {
300-
padding: rem(16px);
292+
%igx-card-content {
293+
padding-block-end: rem(8px);
294+
}
295+
296+
%igx-card-content:last-child {
297+
padding-block-end: rem(16px);
301298
}
302299

303-
%igx-card-content + %igx-card-actions {
304-
padding-block-start: rem(8px);
300+
%igx-card-header {
301+
padding-block-end: 0;
305302
}
306303

307-
%igx-card-header + %igx-card-content {
308-
padding-block-start: 0;
304+
%igx-card-header:last-child,
305+
%igx-card-header:first-child {
306+
padding-block-end: rem(16px);
309307
}
310308
}
311309

0 commit comments

Comments
 (0)