Skip to content

Commit 416e758

Browse files
authored
Merge pull request #16566 from IgniteUI/sivanova/list-styling
fix(list): styling discrepancies
2 parents be48f78 + c7a26a3 commit 416e758

File tree

2 files changed

+37
-33
lines changed

2 files changed

+37
-33
lines changed

projects/igniteui-angular/core/src/core/styles/components/list/_list-theme.scss

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
border-radius: var-get($theme, 'border-radius');
7070

7171
@if $variant == 'bootstrap' {
72-
border: rem(1px) solid var-get($theme, 'border-color');
72+
border: var-get($theme, 'border-width') solid var-get($theme, 'border-color');
7373
}
7474

7575
&:focus-visible {
@@ -137,43 +137,48 @@
137137
justify-content: center;
138138
border-radius: var-get($theme, 'item-border-radius');
139139
color: var-get($theme, 'item-text-color');
140+
border-bottom: var-get($theme, 'border-width') solid var-get($theme, 'border-color');
140141

141-
@if $bootstrap-theme or $variant == 'fluent' {
142-
border-bottom: var-get($theme, 'border-width') solid var-get($theme, 'border-color');
143-
144-
&:last-of-type {
145-
border-bottom: none;
146-
}
142+
&:last-of-type {
143+
border-bottom: none;
147144
}
145+
}
148146

149-
&:hover {
147+
%igx-list-item-base:not(%igx-list-item-base--selected) {
148+
&:hover,
149+
&:focus-within {
150150
%igx-list__item-lines {
151151
color: currentColor;
152152
}
153153

154-
%igx-list__item-line-title {
155-
color: var-get($theme, 'item-title-color-hover');
156-
}
154+
%igx-list-item-content:not(%igx-list-item-content--active) {
155+
color: var-get($theme, 'item-text-color-hover');
156+
background: var-get($theme, 'item-background-hover');
157157

158-
%igx-list__item-line-subtitle {
159-
color: var-get($theme, 'item-subtitle-color-hover');
160-
}
158+
%igx-list__item-line-title {
159+
color: var-get($theme, 'item-title-color-hover');
160+
}
161161

162-
%igx-list__item-actions {
163-
color: var-get($theme, 'item-action-color-hover');
162+
%igx-list__item-line-subtitle {
163+
color: var-get($theme, 'item-subtitle-color-hover');
164+
}
164165

165-
igx-icon,
166-
igc-icon {
167-
color: var-get($theme, 'item-action-color-hover')
166+
%igx-list__item-actions {
167+
color: var-get($theme, 'item-action-color-hover');
168+
169+
igx-icon,
170+
igc-icon {
171+
color: var-get($theme, 'item-action-color-hover')
172+
}
168173
}
169-
}
170174

171-
%igx-list__item-thumbnail {
172-
color: var-get($theme, 'item-thumbnail-color-hover');
175+
%igx-list__item-thumbnail {
176+
color: var-get($theme, 'item-thumbnail-color-hover');
173177

174-
igx-icon,
175-
igc-icon {
176-
color: var-get($theme, 'item-thumbnail-color-hover')
178+
igx-icon,
179+
igc-icon {
180+
color: var-get($theme, 'item-thumbnail-color-hover')
181+
}
177182
}
178183
}
179184
}
@@ -256,12 +261,6 @@
256261
background: var-get($theme, 'item-background');
257262
z-index: 2;
258263
gap: if($variant == 'indigo', rem(8px), rem(16px));
259-
260-
&:hover,
261-
&:focus-within {
262-
color: var-get($theme, 'item-text-color-hover');
263-
background: var-get($theme, 'item-background-hover');
264-
}
265264
}
266265

267266
%igx-list-header,
@@ -285,6 +284,11 @@
285284
--component-size: #{if($variant == 'indigo', 2, var(--list-size))};
286285
}
287286

287+
igx-icon,
288+
igc-icon {
289+
color: var-get($theme, 'item-thumbnail-color');
290+
}
291+
288292
&:empty {
289293
display: none;
290294
}

src/app/list/list.sample.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ <h5 class="sample-title">WC List</h5>
5555
<span>Employees List</span>
5656
</igc-list-header>
5757
@for(employee of employeeItems; track employee){
58-
<igc-list-item>
58+
<igc-list-item [selected]="employee.selected">
5959
@if(properties.addAvatarThumbnail) {
6060
<igc-avatar slot="start" [src]="employee.imageURL"></igc-avatar>
6161
}
@@ -69,7 +69,7 @@ <h5 class="sample-title">WC List</h5>
6969
<span slot="subtitle">{{employee.position}}</span>
7070
}
7171
@if(properties.addCheckboxAction) {
72-
<igc-checkbox slot="end"></igc-checkbox>
72+
<igc-checkbox slot="end" [checked]="employee.selected"></igc-checkbox>
7373
}
7474
@if(properties.addIconAction) {
7575
<igc-icon slot="end" name="info"></igc-icon>

0 commit comments

Comments
 (0)