Skip to content

Commit 4ae806b

Browse files
authored
Merge branch 'next' into ROU-12374
2 parents 324ae26 + 9555a2a commit 4ae806b

File tree

72 files changed

+56
-39
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+56
-39
lines changed

BREAKING.md

Lines changed: 6 additions & 0 deletions

core/api.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1845,7 +1845,7 @@ ion-radio,part,container
18451845
ion-radio,part,label
18461846
ion-radio,part,mark
18471847

1848-
ion-radio-group,none
1848+
ion-radio-group,shadow
18491849
ion-radio-group,prop,allowEmptySelection,boolean,false,false,false
18501850
ion-radio-group,prop,compareWith,((currentValue: any, compareValue: any) => boolean) | null | string | undefined,undefined,false,false
18511851
ion-radio-group,prop,errorText,string | undefined,undefined,false,false
@@ -1855,6 +1855,9 @@ ion-radio-group,prop,name,string,this.inputId,false,false
18551855
ion-radio-group,prop,theme,"ios" | "md" | "ionic",undefined,false,false
18561856
ion-radio-group,prop,value,any,undefined,false,false
18571857
ion-radio-group,event,ionChange,RadioGroupChangeEventDetail<any>,true
1858+
ion-radio-group,part,error-text
1859+
ion-radio-group,part,helper-text
1860+
ion-radio-group,part,supporting-text
18581861

18591862
ion-range,shadow
18601863
ion-range,prop,activeBarStart,number | undefined,undefined,false,false

core/src/components/avatar/avatar.ionic.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244

245245
// Avatar Disabled
246246
// --------------------------------------------------
247-
:host(.avatar-disabled)::before {
247+
:host(.avatar-disabled)::after {
248248
@include globals.border-radius(var(--border-radius));
249249
@include globals.disabled-state();
250250
}

core/src/components/avatar/test/states/avatar.e2e.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ configs({ directions: ['ltr'], modes: ['ionic-md'] }).forEach(({ config, screens
1212
`
1313
<div id="container">
1414
<ion-avatar disabled> AV </ion-avatar>
15+
<ion-avatar disabled>
16+
<ion-icon name="person-outline"></ion-icon>
17+
</ion-avatar>
1518
<ion-avatar disabled>
1619
<img src="/src/components/avatar/test/avatar.svg" />
1720
</ion-avatar>
1.23 KB
1.62 KB
1.3 KB

core/src/components/avatar/test/states/index.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
<ion-content>
2626
<h3>Disabled</h3>
2727
<ion-avatar disabled>AV</ion-avatar>
28+
<ion-avatar disabled>
29+
<ion-icon name="person-outline"></ion-icon>
30+
</ion-avatar>
2831
<ion-avatar disabled>
2932
<img src="/src/components/avatar/test/avatar.svg" />
3033
</ion-avatar>

core/src/components/checkbox/checkbox.ionic.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@ input {
113113
// ----------------------------------------------------------------
114114

115115
.checkbox-bottom {
116-
@include globals.typography(globals.$ion-body-md-regular);
116+
@include globals.typography(globals.$ion-body-sm-medium);
117117
}
118118

119119
.checkbox-bottom .error-text {
120-
color: globals.$ion-semantics-danger-800;
120+
color: globals.$ion-text-danger;
121121
}
122122

123123
.checkbox-bottom .helper-text {
@@ -198,7 +198,7 @@ input {
198198
// Ionic Design Checkbox Invalid
199199
// --------------------------------------------------
200200
:host(.ion-invalid) {
201-
--focus-ring-color: #{globals.$ion-border-focus-error};
201+
--focus-ring-color: #{globals.$ion-border-danger-default};
202202
}
203203

204204
:host(.ion-invalid:not(.checkbox-checked)),
2 Bytes

0 commit comments

Comments
 (0)