Skip to content

Commit 4cc3b1a

Browse files
committed
Per ML discussion, split flex-flow into flex-direction and flex-wrap.
1 parent c771eaa commit 4cc3b1a

2 files changed

Lines changed: 233 additions & 30 deletions

File tree

css3-flexbox/Overview.html

Lines changed: 169 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,10 @@ <h2 class="no-num no-toc" id=table>Table of contents</h2>
157157
and Orientation</a>
158158
<ul class=toc>
159159
<li><a href="#flex-flow"><span class=secno>3.1. </span> Flexbox Flow
160-
Direction: the &lsquo;<code class=property>flex-flow</code>&rsquo;
161-
property</a>
160+
Direction: the &lsquo;<code
161+
class=property>flex-direction</code>&rsquo;, &lsquo;<code
162+
class=property>flex-wrap</code>&rsquo;, and &lsquo;<code
163+
class=property>flex-flow</code>&rsquo; properties</a>
162164

163165
<li><a href="#flex-order"><span class=secno>3.2. </span> Display Order:
164166
the &lsquo;<code class=property>flex-order</code>&rsquo; property</a>
@@ -551,21 +553,23 @@ <h2 id=ordering-orientation><span class=secno>3. </span> Ordering and
551553
properties.
552554

553555
<h3 id=flex-flow><span class=secno>3.1. </span> Flexbox Flow Direction: the
556+
&lsquo;<a href="#flex-direction"><code
557+
class=property>flex-direction</code></a>&rsquo;, &lsquo;<a
558+
href="#flex-wrap"><code class=property>flex-wrap</code></a>&rsquo;, and
554559
&lsquo;<a href="#flex-flow0"><code
555-
class=property>flex-flow</code></a>&rsquo; property</h3>
560+
class=property>flex-flow</code></a>&rsquo; properties</h3>
556561

557562
<table class=propdef>
558563
<tbody>
559564
<tr>
560565
<th>Name:
561566

562-
<td><dfn id=flex-flow0>flex-flow</dfn>
567+
<td><dfn id=flex-direction>flex-direction</dfn>
563568

564569
<tr>
565570
<th>Values:
566571

567-
<td>[ row | row-reverse | column | column-reverse ] [ wrap |
568-
wrap-reverse ]?
572+
<td>row | row-reverse | column | column-reverse
569573

570574
<tr>
571575
<th>Initial:
@@ -593,13 +597,96 @@ <h3 id=flex-flow><span class=secno>3.1. </span> Flexbox Flow Direction: the
593597
<td>visual
594598
</table>
595599

596-
<p>The &lsquo;<a href="#flex-flow0"><code
597-
class=property>flex-flow</code></a>&rsquo; property specifies how <a
598-
href="#flexbox-item"><i>flexbox items</i></a> are placed in the flexbox.
599-
The value consists of one or two keywords: the first sets the orientation
600-
and direction of the flexbox's <a href="#main-axis"><i>main axis</i></a>,
601-
which affects the direction that flexbox items are laid out in, and the
602-
meaning of the &lsquo;<a href="#flex-pack0"><code
600+
<table class=propdef>
601+
<tbody>
602+
<tr>
603+
<th>Name:
604+
605+
<td><dfn id=flex-wrap>flex-wrap</dfn>
606+
607+
<tr>
608+
<th>Values:
609+
610+
<td>no-wrap | wrap | wrap-reverse
611+
612+
<tr>
613+
<th>Initial:
614+
615+
<td>no-wrap
616+
617+
<tr>
618+
<th>Applies To:
619+
620+
<td>flexboxes
621+
622+
<tr>
623+
<th>Inherited:
624+
625+
<td>no
626+
627+
<tr>
628+
<th>Computed Value:
629+
630+
<td>specified value
631+
632+
<tr>
633+
<th>Media:
634+
635+
<td>visual
636+
</table>
637+
638+
<table class=propdef>
639+
<tbody>
640+
<tr>
641+
<th>Name:
642+
643+
<td><dfn id=flex-flow0>flex-flow</dfn>
644+
645+
<tr>
646+
<th>Values:
647+
648+
<td>&lt;&lsquo;<a href="#flex-direction"><code
649+
class=property>flex-direction</code></a>&rsquo;> &lt;&lsquo;<a
650+
href="#flex-wrap"><code class=property>flex-wrap</code></a>&rsquo;>?
651+
652+
<tr>
653+
<th>Initial:
654+
655+
<td>see individual properties
656+
657+
<tr>
658+
<th>Applies To:
659+
660+
<td>flexboxes
661+
662+
<tr>
663+
<th>Inherited:
664+
665+
<td>see individual properties
666+
667+
<tr>
668+
<th>Computed Value:
669+
670+
<td>see individual properties
671+
672+
<tr>
673+
<th>Media:
674+
675+
<td>visual
676+
</table>
677+
678+
<p>The &lsquo;<a href="#flex-direction"><code
679+
class=property>flex-direction</code></a>&rsquo; property specifies how <a
680+
href="#flexbox-item"><i>flexbox items</i></a> are placed in the flexbox,
681+
by setting the direction of the flexbox's <a href="#main-axis"><i>main
682+
axis</i></a>. This affects the direction that flexbox items are laid out
683+
in, and the meaning of the &lsquo;<a href="#flex-pack0"><code
684+
class=property>flex-pack</code></a>&rsquo; property.
685+
686+
<p> The value consists of one or two keywords: the first sets the
687+
orientation and direction of the flexbox's <a href="#main-axis"><i>main
688+
axis</i></a>, which affects the direction that flexbox items are laid out
689+
in, and the meaning of the &lsquo;<a href="#flex-pack0"><code
603690
class=property>flex-pack</code></a>&rsquo; properties; the second, if
604691
specified, marks the flexbox as being multiline and sets the direction of
605692
the <a href="#cross-axis"><i>cross axis</i></a>, which affects the
@@ -639,6 +726,27 @@ <h3 id=flex-flow><span class=secno>3.1. </span> Flexbox Flow Direction: the
639726
<dd>Same as <a href="#flex-flow-column"><i>column</i></a>, except the <a
640727
href="#main-start"><i>main-start</i></a> and <a
641728
href="#main-end"><i>main-end</i></a> directions are swapped.
729+
</dl>
730+
731+
<p>The &lsquo;<a href="#flex-wrap"><code
732+
class=property>flex-wrap</code></a>&rsquo; property controls whether the
733+
flexbox is <a href="#single-line"><i>single-line</i></a> or <a
734+
href="#multi-line"><i>multi-line</i></a>, and the direction of the <a
735+
href="#cross-axis"><i>cross axis</i></a>, which affects the direction new
736+
lines are stacked in and the meaning of the &lsquo;<a
737+
href="#flex-align0"><code class=property>flex-align</code></a>&rsquo; and
738+
&lsquo;<a href="#flex-line-pack0"><code
739+
class=property>flex-line-pack</code></a>&rsquo; properties.
740+
741+
<dl>
742+
<dt><dfn id=flex-flow-no-wrap>no-wrap</dfn>
743+
744+
<dd>The flexbox is <a href="#single-line"><i>single-line</i></a>. The <a
745+
href="#cross-start"><i>cross-start</i></a> direction is equivalent to
746+
either the "start" or "before" direction of the current writing mode,
747+
whichever is in the <i>cross-axis</i>, and the <a
748+
href="#cross-end"><i>cross-end</i></a> direction is the opposite
749+
direction of <a href="#cross-start"><i>cross-start</i></a>.
642750

643751
<dt><dfn id=flex-flow-wrap>wrap</dfn>
644752

@@ -656,12 +764,12 @@ <h3 id=flex-flow><span class=secno>3.1. </span> Flexbox Flow Direction: the
656764
href="#cross-end"><i>cross-end</i></a> directions are swapped.
657765
</dl>
658766

659-
<p>If the second keyword is omitted, the flexbox is <a
660-
href="#single-line"><i>single-line</i></a>, and the <a
661-
href="#cross-start"><i>cross-start</i></a> and <a
662-
href="#cross-end"><i>cross-end</i></a> directions are set as described
663-
above for the &lsquo;<a href="#flex-flow-wrap"><code
664-
class=css>wrap</code></a>&rsquo; keyword.
767+
<p>The &lsquo;<a href="#flex-flow0"><code
768+
class=property>flex-flow</code></a>&rsquo; property is a shorthand for
769+
setting the &lsquo;<a href="#flex-direction"><code
770+
class=property>flex-direction</code></a>&rsquo; and &lsquo;<a
771+
href="#flex-wrap"><code class=property>flex-wrap</code></a>&rsquo;
772+
properties together.
665773

666774
<div class=example>
667775
<p>Some examples of valid flows:</p>
@@ -678,7 +786,7 @@ <h3 id=flex-flow><span class=secno>3.1. </span> Flexbox Flow Direction: the
678786
</div>
679787

680788
<p class=issue>Is there a good, shorter way to refer to the reversed
681-
physical directions than the 8-character "-reverse" suffix?
789+
directions than the 8-character "-reverse" suffix?
682790

683791
<h3 id=flex-order><span class=secno>3.2. </span> Display Order: the
684792
&lsquo;<a href="#flex-order0"><code
@@ -1689,10 +1797,9 @@ <h2 class=no-num id=property>Property index</h2>
16891797
<td>visual
16901798

16911799
<tr>
1692-
<th><a class=property href="#flex-flow0">flex-flow</a>
1800+
<th><a class=property href="#flex-direction">flex-direction</a>
16931801

1694-
<td>[ row | row-reverse | column | column-reverse ] [ wrap |
1695-
wrap-reverse ]?
1802+
<td>row | row-reverse | column | column-reverse
16961803

16971804
<td>row
16981805

@@ -1704,6 +1811,21 @@ <h2 class=no-num id=property>Property index</h2>
17041811

17051812
<td>visual
17061813

1814+
<tr>
1815+
<th><a class=property href="#flex-flow0">flex-flow</a>
1816+
1817+
<td>&lt;&lsquo;flex-direction&rsquo;> &lt;&lsquo;flex-wrap&rsquo;>?
1818+
1819+
<td>see individual properties
1820+
1821+
<td>flexboxes
1822+
1823+
<td>see individual properties
1824+
1825+
<td>see individual properties
1826+
1827+
<td>visual
1828+
17071829
<tr>
17081830
<th><a class=property href="#flex-line-pack0">flex-line-pack</a>
17091831

@@ -1747,6 +1869,21 @@ <h2 class=no-num id=property>Property index</h2>
17471869

17481870
<td>specified value
17491871

1872+
<td>visual
1873+
1874+
<tr>
1875+
<th><a class=property href="#flex-wrap">flex-wrap</a>
1876+
1877+
<td>no-wrap | wrap | wrap-reverse
1878+
1879+
<td>no-wrap
1880+
1881+
<td>flexboxes
1882+
1883+
<td>no
1884+
1885+
<td>specified value
1886+
17501887
<td>visual
17511888
</table>
17521889
<!--end-properties-->
@@ -1805,6 +1942,9 @@ <h2 class=no-num id=index>Index</h2>
18051942
<li>flexbox item's, <a href="#flexbox-item"
18061943
title="flexbox item's"><strong>2.</strong></a>
18071944

1945+
<li>flex-direction, <a href="#flex-direction"
1946+
title=flex-direction><strong>3.1.</strong></a>
1947+
18081948
<li>flex-flow, <a href="#flex-flow0"
18091949
title=flex-flow><strong>3.1.</strong></a>
18101950

@@ -1828,6 +1968,9 @@ <h2 class=no-num id=index>Index</h2>
18281968
<li>flex-pack, <a href="#flex-pack0"
18291969
title=flex-pack><strong>5.1.</strong></a>
18301970

1971+
<li>flex-wrap, <a href="#flex-wrap"
1972+
title=flex-wrap><strong>3.1.</strong></a>
1973+
18311974
<li>hypothetical neighbors, <a href="#hypothetical-neighbors"
18321975
title="hypothetical neighbors"><strong>2.2.1.</strong></a>
18331976

@@ -1855,6 +1998,9 @@ <h2 class=no-num id=index>Index</h2>
18551998
<li>negative flexibility, <a href="#negative-flexibility"
18561999
title="negative flexibility"><strong>4.1.</strong></a>
18572000

2001+
<li>no-wrap, <a href="#flex-flow-no-wrap"
2002+
title=no-wrap><strong>3.1.</strong></a>
2003+
18582004
<li>positive flexibility, <a href="#positive-flexibility"
18592005
title="positive flexibility"><strong>4.1.</strong></a>
18602006

0 commit comments

Comments
 (0)