Merge branch 'master' into angular-19

IgniteUI · Nov 15, 2024 · 8a440c9 · 8a440c9
2 parents 6d58aa0 + 2d42b31
commit 8a440c9
Showing 1 changed file with 7 additions and 53 deletions.
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/list/_list-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/list/_list-theme.scss
@@ -287,30 +287,6 @@
         'indigo': rem(8px),
     ), $variant);
 
-    $list-icon-margin-inline: (
-        comfortable: rem(16px),
-        cosy: rem(8px),
-        compact: rem(4px)
-    );
-
-    $list-icon-margin-block: (
-        comfortable: rem(8px),
-        cosy: rem(6px),
-        compact: rem(4px)
-    );
-
-    $list-line-margin: (
-        comfortable: rem(16px),
-        cosy: rem(12px),
-        compact: rem(8px)
-    );
-
-    $list-actions-margin: (
-        comfortable: rem(8px),
-        cosy: rem(6px),
-        compact: rem(4px)
-    );
-
     %igx-list {
         @include sizable();
 
@@ -326,6 +302,10 @@
         z-index: 0;
         border-radius: var-get($theme, 'border-radius');
 
+        @if $variant == 'bootstrap' {
+            border: rem(1px) solid var-get($theme, 'border-color');
+        }
+
         &:focus-visible {
             outline-style: none;
         }
@@ -479,21 +459,14 @@
         align-items: center;
         justify-content: center;
         color: var-get($theme, 'item-action-color');
-
-        @if $variant == 'indigo' {
-            gap: sizable(rem(4), rem(6), rem(8));
-        }
+        gap: if($variant == 'indigo', sizable(rem(4), rem(6), rem(8)), rem(8px));
 
         &:empty {
             display: none;
         }
 
         > * {
             --component-size: #{if($variant == 'indigo', 2, var(--list-size))};
-
-            @if $variant != 'indigo' {
-                margin-inline-start: pad-inline(map.get($list-actions-margin, 'compact'), map.get($list-actions-margin, 'cosy'), map.get($list-actions-margin, 'comfortable'));
-            }
         }
 
         igc-icon,
@@ -517,10 +490,7 @@
         border-radius: var-get($theme, 'item-border-radius');
         background: inherit;
         z-index: 2;
-
-        @if $variant == 'indigo' {
-            gap: rem(8px);
-        }
+        gap: if($variant == 'indigo', rem(8px), rem(16px));
     }
 
     %igx-list-header,
@@ -533,7 +503,7 @@
         display: flex;
         align-items: center;
         justify-content: center;
-        align-self: if($variant == 'indigo', center, flex-start);
+        align-self: center;
         padding: 0;
         color: var-get($theme, 'item-thumbnail-color');
         gap: rem(8px);
@@ -542,12 +512,6 @@
         > igx-icon,
         > igc-icon {
             --component-size: #{if($variant == 'indigo', 2, var(--list-size))};
-
-            @if $variant != 'indigo' {
-                margin-inline-end: pad-inline(map.get($list-icon-margin-inline, 'compact'), map.get($list-icon-margin-inline, 'cosy'), map.get($list-icon-margin-inline, 'comfortable'));
-                margin-inline-start: 0;
-                margin-block: pad-block(map.get($list-icon-margin-block, 'compact'), map.get($list-icon-margin-block, 'cosy'), map.get($list-icon-margin-block, 'comfortable'));
-            }
         }
 
         &:empty {
@@ -557,16 +521,6 @@
 
     %igx-list__item-thumbnail:not(:empty) + %igx-list__item-lines {
         --component-size: var(--list-size);
-
-        @if $variant != 'indigo' {
-            margin-inline-start: pad-inline(map.get($list-line-margin, 'compact'), map.get($list-line-margin, 'cosy'), map.get($list-line-margin, 'comfortable'));
-        }
-    }
-
-    @if $variant != 'indigo' {
-        %igx-list__item-lines + %igx-list__item-actions {
-            margin-inline-start: rem(8px);
-        }
     }
 
     %igx-list-item-content--active {