Skip to content

Commit 3d00d16

Browse files
authored
fix(card): action-color not working (#15698)
1 parent ca3481b commit 3d00d16

File tree

4 files changed

+35
-49
lines changed

4 files changed

+35
-49
lines changed

projects/igniteui-angular/src/lib/action-strip/themes/_base.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,12 @@ $_theme: $material;
9494
igx-icon {
9595
color: var-get($_theme, 'delete-action');
9696
}
97+
98+
[igxIconButton] {
99+
igx-icon {
100+
color: var-get($_theme, 'delete-action');
101+
}
102+
}
97103
}
98104

99105
@include e(editing-actions) {

projects/igniteui-angular/src/lib/card/themes/_base.scss

Lines changed: 21 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,21 @@
88
$theme: $material;
99

1010
@include layer(base) {
11-
%actions {
11+
%h-actions {
12+
display: flex;
13+
align-items: center;
14+
gap: rem(8px);
15+
16+
[igxIconButton] {
17+
color: var-get($theme, 'actions-text-color');
18+
}
19+
20+
&:empty {
21+
display: none;
22+
}
23+
}
24+
25+
%v-actions {
1226
flex-direction: column;
1327

1428
[igxButton] ~ [igxButton] {
@@ -155,19 +169,14 @@ $theme: $material;
155169
}
156170

157171
@include e(start) {
158-
display: flex;
159-
align-items: center;
160-
order: 0;
161-
gap: rem(8px);
172+
@extend %h-actions;
162173

163-
&:empty {
164-
display: none;
165-
}
174+
order: 0;
166175
}
167176

168177
@include e(end) {
169-
display: flex;
170-
align-items: center;
178+
@extend %h-actions;
179+
171180
order: 1;
172181
color: var-get($theme, 'actions-text-color');
173182
margin-inline-start: auto;
@@ -178,29 +187,6 @@ $theme: $material;
178187
}
179188
}
180189

181-
@include e(igroup) {
182-
display: flex;
183-
flex-flow: row nowrap;
184-
185-
.igx-icon-button {
186-
color: var-get($theme, 'actions-text-color');
187-
}
188-
}
189-
190-
@include e(igroup, $m: start) {
191-
margin-inline-end: auto;
192-
}
193-
194-
@include e(igroup, $m: end) {
195-
margin-inline-start: auto;
196-
}
197-
198-
@include e(bgroup) {
199-
display: flex;
200-
flex-flow: row nowrap;
201-
gap: rem(8px);
202-
}
203-
204190
@include m(vertical) {
205191
flex-direction: column;
206192

@@ -213,11 +199,11 @@ $theme: $material;
213199
}
214200

215201
@include e(start) {
216-
@extend %actions;
202+
@extend %v-actions;
217203
}
218204

219205
@include e(end) {
220-
@extend %actions;
206+
@extend %v-actions;
221207

222208
margin-top: auto;
223209
margin-inline-start: 0;

src/app/grid/grid.sample.html

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ <h5 class="igx-card-header__subtitle">The row is added through the grid API</h5>
1616
</div>
1717
</igx-card-content>
1818
<igx-card-actions>
19-
<div class="igx-card-actions__bgroup">
20-
<button igxButton igxRipple (click)="addRow()">Add</button>
21-
</div>
19+
<button igxButton igxRipple (click)="addRow()">Add</button>
2220
</igx-card-actions>
2321
</igx-card>
2422

@@ -43,9 +41,7 @@ <h3 class="igx-card-header__title">Delete selected row</h3>
4341
<h5 class="igx-card-header__subtitle">Revertable for the last deleted row</h5>
4442
</igx-card-header>
4543
<igx-card-actions>
46-
<div class="igx-card-actions__bgroup">
47-
<button igxButton igxRipple (click)="deleteRow()">Delete Row</button>
48-
</div>
44+
<button igxButton igxRipple (click)="deleteRow()">Delete Row</button>
4945
</igx-card-actions>
5046
</igx-card>
5147

src/app/tooltip/tooltip.sample.html

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,12 @@ <h4 class="sample-title">Rich tooltip</h4>
6767
</div>
6868
</igx-card-content>
6969
<igx-card-actions>
70-
<div class="igx-card-actions__igroup igx-card-actions__igroup--start">
71-
<span igxIconButton="flat" igxRipple [igxRippleCentered]="true">
72-
<igx-icon>favorite</igx-icon>
73-
</span>
74-
<span igxIconButton="flat" igxRipple [igxRippleCentered]="true">
75-
<igx-icon>share</igx-icon>
76-
</span>
77-
</div>
70+
<span igxStart igxIconButton="flat" igxRipple [igxRippleCentered]="true">
71+
<igx-icon>favorite</igx-icon>
72+
</span>
73+
<span igxStart igxIconButton="flat" igxRipple [igxRippleCentered]="true">
74+
<igx-icon>share</igx-icon>
75+
</span>
7876
</igx-card-actions>
7977
</igx-card>
8078
</article>

0 commit comments

Comments
 (0)