Skip to content

Commit fa1ba27

Browse files
committed
Merge branch 'master' into 17.2.0-update
2 parents ef2f264 + fd32f0e commit fa1ba27

File tree

5 files changed

+5
-23
lines changed

5 files changed

+5
-23
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,4 @@
111111
"typescript": "5.3.3",
112112
"webpack-bundle-analyzer": "^4.10.0"
113113
}
114-
}
114+
}

src/app/layouts/carousel/carousel-with-components-sample/carousel-with-components-sample.component.scss

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@
1818
width: unset;
1919
}
2020

21-
.igx-nav-dot {
22-
background: black;
23-
box-shadow: none;
24-
width: 15px;
25-
height: 15px;
26-
}
27-
2821
.igx-slide {
2922
display: flex;
3023
justify-content: center;

src/app/layouts/carousel/carousel.component.scss

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@
1717
width: unset;
1818
}
1919

20-
.igx-nav-dot {
21-
background: black;
22-
box-shadow: none;
23-
width: 15px;
24-
height: 15px;
25-
}
26-
2720
.igx-slide {
2821
display: flex;
2922
justify-content: center;

src/app/theming/animations/animations-sample-2/animations-sample-2.component.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
<igx-card [horizontal]="horizontal">
33
<div igxLayout igxLayoutDir="column" igxFlex [igxFlexGrow]="1">
44
<igx-card-header>
5-
<div class="igx-card-header__tgroup">
6-
<h5 class="igx-card-header__title">Rozes</h5>
7-
<h5 class="igx-card-header__subtitle">Under the Grave (2016)</h5>
8-
</div>
5+
<h5 class="igx-card-header__title">Rozes</h5>
6+
<h5 class="igx-card-header__subtitle">Under the Grave (2016)</h5>
97
<igx-card-media width="64px" height="64px">
108
<img src="assets/images/card/media/ROZES-Under-the-Grave.jpg">
119
</igx-card-media>

src/app/theming/shadows/card-sample-shadow/card-sample-shadow.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@ <h5 class="igx-card-header__subtitle">subtitle</h5>
3232
<div class="card-sample custom-card">
3333
<igx-card>
3434
<igx-card-header>
35-
<div class="igx-card-header__tgroup">
36-
<h3 class="igx-card-header__title">Elevation Colors</h3>
37-
<h5 class="igx-card-header__subtitle">subtitle</h5>
38-
</div>
35+
<h3 class="igx-card-header__title">Elevation Colors</h3>
36+
<h5 class="igx-card-header__subtitle">subtitle</h5>
3937
</igx-card-header>
4038
<div style="overflow: hidden">
4139
<img

0 commit comments

Comments
 (0)