Merge branch 'master' into 17.2.0-update

IgniteUI · Apr 24, 2024 · fa1ba27 · fa1ba27
2 parents ef2f264 + fd32f0e
commit fa1ba27
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -111,4 +111,4 @@
     "typescript": "5.3.3",
     "webpack-bundle-analyzer": "^4.10.0"
   }
-}
+}
diff --git a/...s/carousel/carousel-with-components-sample/carousel-with-components-sample.component.scss b/...s/carousel/carousel-with-components-sample/carousel-with-components-sample.component.scss
@@ -18,13 +18,6 @@
         width: unset;
     }
 
-    .igx-nav-dot {
-        background: black;
-        box-shadow: none;
-        width: 15px;
-        height: 15px;
-    }
-
     .igx-slide {
         display: flex;
         justify-content: center;

diff --git a/src/app/layouts/carousel/carousel.component.scss b/src/app/layouts/carousel/carousel.component.scss
@@ -17,13 +17,6 @@
         width: unset;
     }
 
-    .igx-nav-dot {
-        background: black;
-        box-shadow: none;
-        width: 15px;
-        height: 15px;
-    }
-
     .igx-slide {
         display: flex;
         justify-content: center;

diff --git a/src/app/theming/animations/animations-sample-2/animations-sample-2.component.html b/src/app/theming/animations/animations-sample-2/animations-sample-2.component.html
@@ -2,10 +2,8 @@
     <igx-card [horizontal]="horizontal">
         <div igxLayout igxLayoutDir="column" igxFlex [igxFlexGrow]="1">
             <igx-card-header>
-                <div class="igx-card-header__tgroup">
-                    <h5 class="igx-card-header__title">Rozes</h5>
-                    <h5 class="igx-card-header__subtitle">Under the Grave (2016)</h5>
-                </div>
+                <h5 class="igx-card-header__title">Rozes</h5>
+                <h5 class="igx-card-header__subtitle">Under the Grave (2016)</h5>
                 <igx-card-media width="64px" height="64px">
                     <img src="assets/images/card/media/ROZES-Under-the-Grave.jpg">
                 </igx-card-media>

diff --git a/src/app/theming/shadows/card-sample-shadow/card-sample-shadow.html b/src/app/theming/shadows/card-sample-shadow/card-sample-shadow.html
@@ -32,10 +32,8 @@ <h5 class="igx-card-header__subtitle">subtitle</h5>
 <div class="card-sample custom-card">
     <igx-card>
         <igx-card-header>
-            <div class="igx-card-header__tgroup">
-                <h3 class="igx-card-header__title">Elevation Colors</h3>
-                <h5 class="igx-card-header__subtitle">subtitle</h5>
-            </div>
+            <h3 class="igx-card-header__title">Elevation Colors</h3>
+            <h5 class="igx-card-header__subtitle">subtitle</h5>
         </igx-card-header>
         <div style="overflow: hidden">
             <img
-Original file line number
+Diff line change
@@ Expand Up / @@ -111,4 +111,4 @@ @@
         "typescript": "5.3.3",
         "webpack-bundle-analyzer": "^4.10.0"
       }
-    }
+    }