Skip to content

Commit fec007c

Browse files
committed
merge
2 parents f128300 + bb78eed commit fec007c

4 files changed

Lines changed: 367 additions & 151 deletions

File tree

css3-flexbox/Overview.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<meta content="CSS Flexible Box Layout Module" name=dcterms.title>
1313
<meta content=text name=dcterms.type>
14-
<meta content=2013-03-15 name=dcterms.issued>
14+
<meta content=2013-03-19 name=dcterms.issued>
1515
<meta content="http://dev.w3.org/csswg/css3-flexbox/" name=dcterms.creator>
1616
<meta content=W3C name=dcterms.publisher>
1717
<meta content="http://dev.w3.org/csswg/css3-flexbox/"
@@ -219,11 +219,11 @@
219219
<h1 class=p-name id=head-box-flexible>CSS Flexible Box Layout Module</h1>
220220

221221
<h2 class="no-num no-toc" id=w3c-working>Editor's Draft, <time
222-
class=dt-updated datetime=20130315>15 March 2013</time></h2>
222+
class=dt-updated datetime=20130319>19 March 2013</time></h2>
223223

224224
<dl>
225225
<dt>This version:
226-
<!--<dd><a class="u-url" href="http://dev.w3.org/csswg/css3-flexbox/">http://www.w3.org/TR/2013/CR-css3-flexbox-20130315/</a>-->
226+
<!--<dd><a class="u-url" href="http://dev.w3.org/csswg/css3-flexbox/">http://www.w3.org/TR/2013/CR-css3-flexbox-20130319/</a>-->
227227

228228
<dd><a class=u-url
229229
href="http://dev.w3.org/csswg/css3-flexbox/">http://dev.w3.org/csswg/css3-flexbox/</a>
@@ -241,8 +241,8 @@ <h2 class="no-num no-toc" id=w3c-working>Editor's Draft, <time
241241

242242
<dt>Previous version:
243243

244-
<dd><a href="http://www.w3.org/TR/2012/CR-css3-flexbox-20120921/"
245-
rel=previous>http://www.w3.org/TR/2012/CR-css3-flexbox-20120921/</a>
244+
<dd><a href="http://www.w3.org/TR/2012/CR-css3-flexbox-20120918/"
245+
rel=previous>http://www.w3.org/TR/2012/CR-css3-flexbox-20120918/</a>
246246

247247
<dt>Issues List:
248248

@@ -3949,7 +3949,7 @@ <h3 class=no-num id=informative>Other references</h3>
39493949
<h2 class=no-num id=changes>Changes</h2>
39503950

39513951
<p> The following significant changes were made since the <a
3952-
href="http://www.w3.org/TR/2012/CR-css3-flexbox-20120921/">21 September
3952+
href="http://www.w3.org/TR/2012/CR-css3-flexbox-20120918/">18 September
39533953
2012 Candidate Recommendation</a>:
39543954

39553955
<ul>
@@ -3990,8 +3990,8 @@ <h2 class=no-num id=changes>Changes</h2>
39903990
</ul>
39913991

39923992
<p>A <a
3993-
href="http://dev.w3.org/csswg/css3-flexbox/issues-lc-2012">Disposition of
3994-
Last Call Comments</a> is available.
3993+
href="http://dev.w3.org/csswg/css3-flexbox/issues-cr-2012">Disposition of
3994+
Candidate Recommendation Comments</a> is available.
39953995

39963996
<h2 class=no-num id=property>Property index</h2>
39973997
<!--begin-properties-->

css3-flexbox/Overview.src.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ <h2 class="no-num no-toc" id="w3c-working">[LONGSTATUS], <time class="dt-updated
215215
<dd><a href="http://dev.w3.org/csswg/css3-flexbox/">http://dev.w3.org/csswg/css3-flexbox/</a>
216216

217217
<dt>Previous version:
218-
<dd><a rel="previous" href="http://www.w3.org/TR/2012/CR-css3-flexbox-20120921/">http://www.w3.org/TR/2012/CR-css3-flexbox-20120921/</a>
218+
<dd><a rel="previous" href="http://www.w3.org/TR/2012/CR-css3-flexbox-20120918/">http://www.w3.org/TR/2012/CR-css3-flexbox-20120918/</a>
219219

220220
<dt>Issues List:
221221
<dd><a href="https://www.w3.org/Bugs/Public/buglist.cgi?product=CSS&amp;component=Flexbox&amp;resolution=---">Bugzilla Bugs for Flexbox</a>
@@ -3234,7 +3234,7 @@ <h2 class="no-num" id="changes">Changes</h2>
32343234

32353235
<p>
32363236
The following significant changes were made since the
3237-
<a href="http://www.w3.org/TR/2012/CR-css3-flexbox-20120921/">21 September 2012 Candidate Recommendation</a>:
3237+
<a href="http://www.w3.org/TR/2012/CR-css3-flexbox-20120918/">18 September 2012 Candidate Recommendation</a>:
32383238
<ul>
32393239
<li>
32403240
Absolutely positioned children of a flex container are no longer called "flex items" (to avoid terminology confusion).
@@ -3266,7 +3266,7 @@ <h2 class="no-num" id="changes">Changes</h2>
32663266
<a href="#intrinsic-sizes">Defined the intrinsic sizes of flex containers.</a>
32673267
</ul>
32683268

3269-
<p>A <a href="http://dev.w3.org/csswg/css3-flexbox/issues-lc-2012">Disposition of Last Call Comments</a> is available.
3269+
<p>A <a href="http://dev.w3.org/csswg/css3-flexbox/issues-cr-2012">Disposition of Candidate Recommendation Comments</a> is available.
32703270

32713271
<h2 id="property" class="no-num">Property index</h2>
32723272
<!--properties-->

0 commit comments

Comments
 (0)