Skip to content

Commit d213920

Browse files
committed
Merge branch 'ROU-11882' of https://github.com/ionic-team/ionic-framework into ROU-11882
2 parents 47ba9bb + bd81597 commit d213920

25 files changed

+2002
-1910
lines changed

BREAKING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ To reorder two columns where column 1 has `size="9" push="3"` and column 2 has `
100100
<ion-grid>
101101
<ion-row>
102102
<ion-col size="auto" offset="1">
103-
<div>ion-col push 1</div>
103+
<div>ion-col size="auto" offset="1"</div>
104104
</ion-col>
105105
<ion-col size="auto">
106-
<div>ion-col push 1</div>
106+
<div>ion-col size="auto"</div>
107107
</ion-col>
108108
</ion-row>
109109
</ion-grid>
@@ -127,10 +127,10 @@ To reorder two columns where column 1 has `size="9" push="3"` and column 2 has `
127127
<ion-grid>
128128
<ion-row>
129129
<ion-col size="auto" order="2" order-md="2">
130-
<div>ion-col size="3" size-md="6" order="9" order-md="6"</div>
130+
<div>ion-col size="auto" order="2" order-md="2"</div>
131131
</ion-col>
132132
<ion-col size="auto" order="1" order-md="1">
133-
<div>ion-col size="9" size-md="6" order="3" order-md="6"</div>
133+
<div>ion-col size="auto" order="1" order-md="1"</div>
134134
</ion-col>
135135
</ion-row>
136136
</ion-grid>

0 commit comments

Comments
 (0)