Skip to content

Commit f39db96

Browse files
vhardyvhardy
committed
merge
2 parents 117d218 + 8960d0f commit f39db96

12 files changed

Lines changed: 3037 additions & 2700 deletions

File tree

‎css-device-adapt/Overview.html‎

Lines changed: 149 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2178,7 +2178,155 @@ <h3 class=no-num id=other-references>Other references</h3>
21782178
</dl>
21792179

21802180
<h2 class=no-num id=descriptor-index>Descriptor index</h2>
2181-
<!--descriptors-->
2181+
<!--begin-descriptors-->
2182+
2183+
<table class=proptable>
2184+
<thead>
2185+
<tr>
2186+
<th>Descriptor
2187+
2188+
<th>Value
2189+
2190+
<th>Initial
2191+
2192+
<th>Percentages
2193+
2194+
<th>Media
2195+
2196+
<tbody>
2197+
<tr>
2198+
<th><a class=property href="#height">height</a>
2199+
2200+
<td>&lt;viewport-length&gt;{1,2}
2201+
2202+
<td>See individual descriptors
2203+
2204+
<td>See individual descriptors
2205+
2206+
<td>visual, continuous
2207+
2208+
<tr>
2209+
<th><a class=property href="#max-height">max-height</a>
2210+
2211+
<td>&lt;viewport-length&gt;
2212+
2213+
<td>auto
2214+
2215+
<td>Refer to the height of the initial viewport
2216+
2217+
<td>visual, continuous
2218+
2219+
<tr>
2220+
<th><a class=property href="#max-width">max-width</a>
2221+
2222+
<td>&lt;viewport-length&gt;
2223+
2224+
<td>auto
2225+
2226+
<td>Refer to the width of the initial viewport
2227+
2228+
<td>visual, continuous
2229+
2230+
<tr>
2231+
<th><a class=property href="#max-zoom">max-zoom</a>
2232+
2233+
<td>auto | &lt;number&gt; | &lt;percentage&gt;
2234+
2235+
<td>auto
2236+
2237+
<td>The zoom factor itself
2238+
2239+
<td>visual, continuous
2240+
2241+
<tr>
2242+
<th><a class=property href="#min-height">min-height</a>
2243+
2244+
<td>&lt;viewport-length&gt;
2245+
2246+
<td>auto
2247+
2248+
<td>Refer to the height of the initial viewport
2249+
2250+
<td>visual, continuous
2251+
2252+
<tr>
2253+
<th><a class=property href="#min-width">min-width</a>
2254+
2255+
<td>&lt;viewport-length&gt;
2256+
2257+
<td>auto
2258+
2259+
<td>Refer to the width of the initial viewport
2260+
2261+
<td>visual, continuous
2262+
2263+
<tr>
2264+
<th><a class=property href="#min-zoom">min-zoom</a>
2265+
2266+
<td>auto | &lt;number&gt; | &lt;percentage&gt;
2267+
2268+
<td>auto
2269+
2270+
<td>The zoom factor itself
2271+
2272+
<td>visual, continuous
2273+
2274+
<tr>
2275+
<th><a class=property href="#orientation">orientation</a>
2276+
2277+
<td>auto | portrait | landscape
2278+
2279+
<td>auto
2280+
2281+
<td>N/A
2282+
2283+
<td>visual, continuous
2284+
2285+
<tr>
2286+
<th><a class=property href="#resolution">resolution</a>
2287+
2288+
<td>auto | device | &lt;resolution&gt;
2289+
2290+
<td>auto
2291+
2292+
<td>N/A
2293+
2294+
<td>visual, continuous
2295+
2296+
<tr>
2297+
<th><a class=property href="#user-zoom">user-zoom</a>
2298+
2299+
<td>zoom | fixed
2300+
2301+
<td>zoom
2302+
2303+
<td>N/A
2304+
2305+
<td>visual, continuous
2306+
2307+
<tr>
2308+
<th><a class=property href="#width">width</a>
2309+
2310+
<td>&lt;viewport-length&gt;{1,2}
2311+
2312+
<td>See individual descriptors
2313+
2314+
<td>See individual descriptors
2315+
2316+
<td>visual, continuous
2317+
2318+
<tr>
2319+
<th><a class=property href="#zoom">zoom</a>
2320+
2321+
<td>auto | &lt;number&gt; | &lt;percentage&gt;
2322+
2323+
<td>auto
2324+
2325+
<td>The zoom factor itself
2326+
2327+
<td>visual, continuous
2328+
</table>
2329+
<!--end-descriptors-->
21822330

21832331
<h2 class=no-num id=index>Index</h2>
21842332
<!--begin-index-->

‎css3-flexbox/Overview.html‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,38 @@ <h2 id=display-flexbox><span class=secno>3. </span> New values for
500500
Additionally, each of the <a href="#flexbox-item"><i>flexbox items</i></a>
501501
establishes a new formatting context for its contents.
502502

503+
<p> The baseline of a flexbox is:
504+
505+
<ul>
506+
<li> If any of the <a href="#flexbox-item"><i>flexbox items</i></a> on the
507+
flexbox's first line (after reordering with &lsquo;<a
508+
href="#flex-order0"><code class=property>flex-order</code></a>&rsquo;)
509+
have a computed value of &lsquo;<a href="#flex-align-baseline"><code
510+
class=css>baseline</code></a>&rsquo; for &lsquo;<a
511+
href="#flex-item-align"><code
512+
class=property>flex-item-align</code></a>&rsquo;, the flexbox's baseline
513+
is the baseline of those <a href="#flexbox-item"><i>flexbox
514+
items</i></a>.
515+
516+
<li> Otherwise, if the flexbox has at least one <a
517+
href="#flexbox-item"><i>flexbox item</i></a>, and the baseline of its
518+
first <a href="#flexbox-item"><i>flexbox item</i></a> (after reordering
519+
with &lsquo;<a href="#flex-order0"><code
520+
class=property>flex-order</code></a>&rsquo;) is parallel to the flexbox's
521+
<a href="#main-axis"><i>main axis</i></a>, the flexbox's baseline is the
522+
baseline of its first <a href="#flexbox-item"><i>flexbox item</i></a>.
523+
524+
<li> Otherwise, the flexbox's baseline is the "after" edge of its content
525+
box.
526+
</ul>
527+
528+
<p> The table in <a
529+
href="http://www.w3.org/TR/CSS2/visuren.html#dis-pos-flo">CSS 2.1 Chapter
530+
9.7</a> must be amended to contain an additional row, with &lsquo;<code
531+
class=css>inline-flexbox</code>&rsquo; in the "Specified Value" column and
532+
&lsquo;<a href="#flexbox"><code class=css>flexbox</code></a>&rsquo; in the
533+
"Copmputed Value" column.
534+
503535
<h2 id=flex-items><span class=secno>4. </span> Flexbox Items</h2>
504536

505537
<p>The flexbox layout algorithm operates on boxes generated by <dfn
@@ -587,6 +619,13 @@ <h2 id=flex-items><span class=secno>4. </span> Flexbox Items</h2>
587619
and thus out of flow.</p>
588620
</div>
589621

622+
<p> The computed value for &lsquo;<code
623+
class=property>display</code>&rsquo; for elements that are <a
624+
href="#flexbox-item"><i>flexbox items</i></a> must be determined by
625+
applying the table in <a
626+
href="http://www.w3.org/TR/CSS2/visuren.html#dis-pos-flo">CSS 2.1 Chapter
627+
9.7</a>.
628+
590629
<h3 id=abspos-flexbox-items><span class=secno>4.1. </span> Absolutely
591630
Positioned Flexbox Children</h3>
592631

‎css3-flexbox/Overview.src.html‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,30 @@ <h2 id='display-flexbox'>
170170

171171
<p>A flexbox establishes a new <dfn>flexbox formatting context</dfn> for its contents. This is similar to a block formatting context root: floats do not intrude into the flexbox, and the flexbox's margins do not collapse with the margins of its contents. Additionally, each of the <i>flexbox items</i> establishes a new formatting context for its contents.</p>
172172

173+
<p>
174+
The baseline of a flexbox is:
175+
176+
<ul>
177+
<li>
178+
If any of the <i>flexbox items</i> on the flexbox's first line
179+
(after reordering with 'flex-order')
180+
have a computed value of ''baseline'' for 'flex-item-align',
181+
the flexbox's baseline is the baseline of those <i>flexbox items</i>.
182+
183+
<li>
184+
Otherwise, if the flexbox has at least one <i>flexbox item</i>,
185+
and the baseline of its first <i>flexbox item</i>
186+
(after reordering with 'flex-order')
187+
is parallel to the flexbox's <i>main axis</i>,
188+
the flexbox's baseline is the baseline of its first <i>flexbox item</i>.
189+
190+
<li>
191+
Otherwise, the flexbox's baseline is the "after" edge of its content box.
192+
</ul>
193+
194+
<p>
195+
The table in <a href="http://www.w3.org/TR/CSS2/visuren.html#dis-pos-flo">CSS 2.1 Chapter 9.7</a> must be amended to contain an additional row, with ''inline-flexbox'' in the "Specified Value" column and ''flexbox'' in the "Copmputed Value" column.
196+
173197
<h2 id='flex-items'>
174198
Flexbox Items</h2>
175199

@@ -240,6 +264,10 @@ <h2 id='flex-items'>
240264
flexbox item. Similarly, the block element "not-an-item2" is not a flexbox item, because it's absolutely positioned and thus out of flow.</p>
241265
</div>
242266

267+
<p>
268+
The computed value for 'display' for elements that are <i>flexbox items</i>
269+
must be determined by applying the table in <a href="http://www.w3.org/TR/CSS2/visuren.html#dis-pos-flo">CSS 2.1 Chapter 9.7</a>.
270+
243271
<h3 id='abspos-flexbox-items'>
244272
Absolutely Positioned Flexbox Children</h3>
245273

0 commit comments

Comments
 (0)