Skip to content

Commit 74230a6

Browse files
committed
Merge branch 'next' of github.com:ionic-team/ionic-framework into next-branch/FW-6439
2 parents 837e089 + 02c1388 commit 74230a6

File tree

723 files changed

+634
-456
lines changed

Some content is hidden

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

723 files changed

+634
-456
lines changed

core/api.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1707,10 +1707,8 @@ ion-progress-bar,prop,shape,"rectangular" | "round" | undefined,undefined,false,
17071707
ion-progress-bar,prop,theme,"ios" | "md" | "ionic",undefined,false,false
17081708
ion-progress-bar,prop,type,"determinate" | "indeterminate",'determinate',false,false
17091709
ion-progress-bar,prop,value,number,0,false,false
1710-
ion-progress-bar,css-prop,--background,ionic
17111710
ion-progress-bar,css-prop,--background,ios
17121711
ion-progress-bar,css-prop,--background,md
1713-
ion-progress-bar,css-prop,--progress-background,ionic
17141712
ion-progress-bar,css-prop,--progress-background,ios
17151713
ion-progress-bar,css-prop,--progress-background,md
17161714
ion-progress-bar,part,progress

core/src/components/accordion-group/accordion-group.ionic.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
// --------------------------------------------------
66

77
:host {
8-
min-width: 272px;
8+
min-width: calc(#{globals.$ion-scale-6200} + #{globals.$ion-space-600});
99

10-
background-color: globals.$ion-primitives-base-white;
10+
background-color: globals.$ion-bg-neutral-subtlest-default;
1111
}
1212

1313
// Inset Accordion Group

0 commit comments

Comments
 (0)