Skip to content

Commit 25865ee

Browse files
committed
Changing class names to avoid clash
1 parent 7b7c524 commit 25865ee

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

core/src/components/col/col.scss

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,13 @@
3737
flex: 0 0 auto;
3838
}
3939

40-
:host([class^="ion-grid-col-"]),
41-
:host([class*=" ion-grid-col-"]) {
42-
flex: 0 0 calc(var(--ion-grid-col-span) * var(--col-unit-size) + (var(--ion-grid-col-span) - 1) * var(--ion-grid-gap));
40+
:host([class^="ion-grid-col--"]),
41+
:host([class*=" ion-grid-col--"]) {
4342
flex: 0 0 calc(var(--ion-grid-col-span) * var(--col-unit-size) + (var(--ion-grid-col-span) - 1) * var(--ion-grid-gap, 0px));
4443
}
4544

46-
:host([class^="ion-grid-offset-col-"]),
47-
:host([class*=" ion-grid-offset-col-"]) {
45+
:host([class^="ion-grid-offset-col--"]),
46+
:host([class*=" ion-grid-offset-col--"]) {
4847
--margin-calc: calc(
4948
var(--col-unit-size) * var(--ion-grid-col-margin) + (var(--ion-grid-gap, 0px) * var(--ion-grid-col-margin))
5049
);
@@ -55,15 +54,15 @@
5554
$grid-col-number: 12;
5655

5756
@for $i from 1 through $grid-col-number {
58-
:host(.ion-grid-col-#{$i}) {
57+
:host(.ion-grid-col--#{$i}) {
5958
--ion-grid-col-span: #{$i};
6059
}
6160

62-
:host(.ion-grid-order-col-#{$i}) {
61+
:host(.ion-grid-order-col--#{$i}) {
6362
order: #{$i};
6463
}
6564

66-
:host(.ion-grid-offset-col-#{$i}) {
65+
:host(.ion-grid-offset-col--#{$i}) {
6766
--ion-grid-col-margin: #{$i};
6867
}
6968
}

core/src/components/col/col.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ export class Col implements ComponentInterface {
248248
return;
249249
}
250250

251-
return `${className}-col-${valueNumber}`;
251+
return `${className}-col--${valueNumber}`;
252252
}
253253

254254
private getSizeClass(): string | undefined {

0 commit comments

Comments
 (0)