Skip to content

Commit f96c559

Browse files
committed
[css-display] Rename display-extras to display-list. I'll just add new properties as necessary to handle box-model extras.
1 parent 6330db2 commit f96c559

2 files changed

Lines changed: 18 additions & 42 deletions

File tree

css-display/Overview.bs

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,11 @@ Interacting with the layout mode: the 'display-outside' property</h3>
194194
Is <a href="http://lists.w3.org/Archives/Public/www-style/2012Jul/0450.html">fantasai's proposal for a run-in model</a> sane enough to include in this spec?
195195

196196

197-
<h3 id='the-display-extras'>
198-
Additional stuff: the 'display-extras' property</h3>
197+
<h3 id='display-list'>
198+
Creating a list item: the 'display-list' property</h3>
199199

200200
<pre class="propdef">
201-
Name: display-extras
201+
Name: display-list
202202
Value: none | list-item
203203
Initial: none
204204
Applies to: all elements
@@ -208,27 +208,19 @@ Additional stuff: the 'display-extras' property</h3>
208208
Media: all
209209
</pre>
210210

211-
<dl dfn-type="value" dfn-for="display-extras">
211+
<dl dfn-type="value" dfn-for="display-list">
212212
<dt><dfn>list-item</dfn>
213213
<dd>
214214
The element generates a <code>::marker</code> pseudo-element
215215
and is considered a <a>list item</a>.
216216
</dl>
217217

218-
<p class='issue'>
219-
This property is probably dumb,
220-
and at the very least has a dumb name.
221-
Better names?
222-
If I define more one-off weird box-generation details like this,
223-
should I merge them into a single "extras" property like this,
224-
or just have them all be separate properties?
225-
226218
<h3 id='the-display'>
227219
The 'display' shorthand property</h3>
228220

229221
<pre class="propdef">
230222
Name: display
231-
Value: inline | block | list-item | inline-list-item | inline-block | table | inline-table | table-cell | table-caption | flex | inline-flex | grid | inline-grid | [ <<'display-inside'>> || <<'display-outside'>> || <<'display-extras'>> ]
223+
Value: inline | block | list-item | inline-list-item | inline-block | table | inline-table | table-cell | table-caption | flex | inline-flex | grid | inline-grid | [ <<'display-inside'>> || <<'display-outside'>> || <<'display-list'>> ]
232224
Initial: see individual properties
233225
Applies to: see individual properties
234226
Inherited: see individual properties

css-display/Overview.html

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
</p>
5555
<h1 class="p-name no-ref" id=title>CSS Display Module Level 3</h1>
5656
<h2 class="no-num no-toc no-ref heading settled" id=subtitle><span class=content>Editor’s Draft,
57-
<span class=dt-updated><span class=value-title title=20140812>12 August 2014</span></span></span></h2>
57+
<span class=dt-updated><span class=value-title title=20140813>13 August 2014</span></span></span></h2>
5858
<div data-fill-with=spec-metadata><dl>
5959
<dt>This version:
6060
<dd><a class=u-url href=http://dev.w3.org/csswg/css-display>http://dev.w3.org/csswg/css-display</a>
@@ -120,7 +120,7 @@ <h2 class="no-num no-toc no-ref heading settled" id=contents><span class=content
120120
<ul class=toc>
121121
<li><a href=#the-display-inside><span class=secno>2.1</span> Setting the layout mode: the <span class=property data-link-type=propdesc title=display-inside>display-inside</span> property</a>
122122
<li><a href=#the-display-outside><span class=secno>2.2</span> Interacting with the layout mode: the <span class=property data-link-type=propdesc title=display-outside>display-outside</span> property</a>
123-
<li><a href=#the-display-extras><span class=secno>2.3</span> Additional stuff: the <span class=property data-link-type=propdesc title=display-extras>display-extras</span> property</a>
123+
<li><a href=#display-list><span class=secno>2.3</span> Creating a list item: the <span class=property data-link-type=propdesc title=display-list>display-list</span> property</a>
124124
<li><a href=#the-display><span class=secno>2.4</span> The <span class=property data-link-type=propdesc title=display>display</span> shorthand property</a></ul>
125125
<li><a href=#box-suppress><span class=secno>3</span> Controlling box generation: the <span class=property data-link-type=propdesc title=box-suppress>box-suppress</span> property</a>
126126
<li><a href=#run-in><span class=secno>4</span> Run-In Layout</a>
@@ -308,30 +308,22 @@ <h3 class="heading settled" data-level=2.2 id=the-display-outside><span class=se
308308
Is <a href=http://lists.w3.org/Archives/Public/www-style/2012Jul/0450.html>fantasai’s proposal for a run-in model</a> sane enough to include in this spec?
309309

310310

311-
<h3 class="heading settled" data-level=2.3 id=the-display-extras><span class=secno>2.3 </span><span class=content>
312-
Additional stuff: the <a class=property data-link-type=propdesc href=#propdef-display-extras title=display-extras>display-extras</a> property</span><a class=self-link href=#the-display-extras></a></h3>
311+
<h3 class="heading settled" data-level=2.3 id=display-list><span class=secno>2.3 </span><span class=content>
312+
Creating a list item: the <a class=property data-link-type=propdesc href=#propdef-display-list title=display-list>display-list</a> property</span><a class=self-link href=#display-list></a></h3>
313313

314-
<table class="definition propdef"><tr><th>Name:<td><dfn class=css data-dfn-type=property data-export="" id=propdef-display-extras>display-extras<a class=self-link href=#propdef-display-extras></a></dfn><tr><th>Value:<td class=prod>none <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> list-item<tr><th>Initial:<td>none<tr><th>Applies to:<td>all elements<tr><th>Inherited:<td>no<tr><th>Media:<td>all<tr><th>Computed value:<td>as specified<tr><th>Percentages:<td>n/a</table>
314+
<table class="definition propdef"><tr><th>Name:<td><dfn class=css data-dfn-type=property data-export="" id=propdef-display-list>display-list<a class=self-link href=#propdef-display-list></a></dfn><tr><th>Value:<td class=prod>none <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> list-item<tr><th>Initial:<td>none<tr><th>Applies to:<td>all elements<tr><th>Inherited:<td>no<tr><th>Media:<td>all<tr><th>Computed value:<td>as specified<tr><th>Percentages:<td>n/a</table>
315315

316-
<dl data-dfn-for=display-extras data-dfn-type=value>
317-
<dt><dfn class=css data-dfn-for=display-extras data-dfn-type=value data-export="" id=valuedef-display-extras-list-item>list-item<a class=self-link href=#valuedef-display-extras-list-item></a></dfn>
316+
<dl data-dfn-for=display-list data-dfn-type=value>
317+
<dt><dfn class=css data-dfn-for=display-list data-dfn-type=value data-export="" id=valuedef-display-list-list-item>list-item<a class=self-link href=#valuedef-display-list-list-item></a></dfn>
318318
<dd>
319319
The element generates a <code>::marker</code> pseudo-element
320320
and is considered a <a data-link-type=dfn href=http://dev.w3.org/csswg/css-lists-3/#list-item title="list item">list item</a>.
321321
</dl>
322322

323-
<p class=issue id=issue-70026084><a class=self-link href=#issue-70026084></a>
324-
This property is probably dumb,
325-
and at the very least has a dumb name.
326-
Better names?
327-
If I define more one-off weird box-generation details like this,
328-
should I merge them into a single "extras" property like this,
329-
or just have them all be separate properties?
330-
331323
<h3 class="heading settled" data-level=2.4 id=the-display><span class=secno>2.4 </span><span class=content>
332324
The <a class=property data-link-type=propdesc href=#propdef-display title=display>display</a> shorthand property</span><a class=self-link href=#the-display></a></h3>
333325

334-
<table class="definition propdef"><tr><th>Name:<td><dfn class=css data-dfn-type=property data-export="" id=propdef-display>display<a class=self-link href=#propdef-display></a></dfn><tr><th>Value:<td class=prod>inline <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> block <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> list-item <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> inline-list-item <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> inline-block <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> table <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> inline-table <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> table-cell <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> table-caption <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> flex <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> inline-flex <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> grid <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> inline-grid <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> [ <a class=production data-link-type=propdesc href=#propdef-display-inside title=display-inside>&lt;‘display-inside’&gt;</a> <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-any title=||>||</a> <a class=production data-link-type=propdesc href=#propdef-display-outside title=display-outside>&lt;‘display-outside’&gt;</a> <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-any title=||>||</a> <a class=production data-link-type=propdesc href=#propdef-display-extras title=display-extras>&lt;‘display-extras’&gt;</a> ]<tr><th>Initial:<td>see individual properties<tr><th>Applies to:<td>see individual properties<tr><th>Inherited:<td>see individual properties<tr><th>Media:<td>see individual properties<tr><th>Computed value:<td>see individual properties<tr><th>Animatable:<td>see individual properties</table>
326+
<table class="definition propdef"><tr><th>Name:<td><dfn class=css data-dfn-type=property data-export="" id=propdef-display>display<a class=self-link href=#propdef-display></a></dfn><tr><th>Value:<td class=prod>inline <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> block <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> list-item <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> inline-list-item <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> inline-block <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> table <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> inline-table <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> table-cell <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> table-caption <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> flex <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> inline-flex <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> grid <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> inline-grid <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-one title=|>|</a> [ <a class=production data-link-type=propdesc href=#propdef-display-inside title=display-inside>&lt;‘display-inside’&gt;</a> <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-any title=||>||</a> <a class=production data-link-type=propdesc href=#propdef-display-outside title=display-outside>&lt;‘display-outside’&gt;</a> <a class=prod-punc data-link-type=grammar href=http://dev.w3.org/csswg/css-values-3/#comb-any title=||>||</a> <a class=production data-link-type=propdesc href=#propdef-display-list title=display-list>&lt;‘display-list’&gt;</a> ]<tr><th>Initial:<td>see individual properties<tr><th>Applies to:<td>see individual properties<tr><th>Inherited:<td>see individual properties<tr><th>Media:<td>see individual properties<tr><th>Computed value:<td>see individual properties<tr><th>Animatable:<td>see individual properties</table>
335327

336328
<p>The single-keyword values listed explicitly in the grammar above are handled specially,
337329
for legacy reasons.
@@ -666,8 +658,8 @@ <h2 class="no-num no-ref heading settled" id=index><span class=content>
666658
<li>contents, <a href=#valuedef-display-outside-contents title="section 2.2">2.2</a>
667659
<li>discard, <a href=#valuedef-box-suppress-discard title="section 3">3</a>
668660
<li>display, <a href=#propdef-display title="section 2.4">2.4</a>
669-
<li>display-extras, <a href=#propdef-display-extras title="section 2.3">2.3</a>
670661
<li>display-inside, <a href=#propdef-display-inside title="section 2.1">2.1</a>
662+
<li>display-list, <a href=#propdef-display-list title="section 2.3">2.3</a>
671663
<li>display-outside, <a href=#propdef-display-outside title="section 2.2">2.2</a>
672664
<li>flex<ul><li>value for display-inside, <a href=#valuedef-display-inside-flex title="section 2.1">2.1</a>
673665
<li>value for display, <a href=#valuedef-display-flex title="section 2.4">2.4</a>
@@ -684,7 +676,7 @@ <h2 class="no-num no-ref heading settled" id=index><span class=content>
684676
<li>internal ruby element, <a href=#valuedef-display-outside-internal-ruby-element title="section 2.2">2.2</a>
685677
<li>internal table element, <a href=#valuedef-display-outside-internal-table-element title="section 2.2">2.2</a>
686678
<li>layout-specific display role, <a href=#layout-specific-display-role title="section 2.2">2.2</a>
687-
<li>list-item<ul><li>value for display-extras, <a href=#valuedef-display-extras-list-item title="section 2.3">2.3</a>
679+
<li>list-item<ul><li>value for display-list, <a href=#valuedef-display-list-list-item title="section 2.3">2.3</a>
688680
<li>value for display, <a href=#valuedef-display-list-item title="section 2.4">2.4</a>
689681
</ul><li>none, <a href=#valuedef-display-outside-none title="section 2.2">2.2</a>
690682
<li>ruby, <a href=#valuedef-display-inside-ruby title="section 2.1">2.1</a>
@@ -714,8 +706,8 @@ <h2 class="no-num no-ref heading settled" id=property-index><span class=content>
714706
<div data-fill-with=property-index><table class="proptable data"><thead><tr><th scope=col>Name<th scope=col>Value<th scope=col>Initial<th scope=col>Applies to<th scope=col>Inh.<th scope=col>%ages<th scope=col>Media<th scope=col>Animatable<th scope=col>Computed value<tbody>
715707
<tr><th scope=row><a class=css data-link-type=property href=#propdef-display-inside title=display-inside>display-inside</a><td>auto | block | table | flex | grid | ruby<td>auto<td>all elements<td>no<td>n/a<td>all<td><td>a keyword
716708
<tr><th scope=row><a class=css data-link-type=property href=#propdef-display-outside title=display-outside>display-outside</a><td>block-level | inline-level | run-in | contents | none | table-row-group | table-header-group | table-footer-group | table-row | table-cell | table-column-group | table-column | table-caption | ruby-base | ruby-text | ruby-base-container | ruby-text-container<td>inline-level<td>all elements<td>no<td>n/a<td>all<td><td>as specified
717-
<tr><th scope=row><a class=css data-link-type=property href=#propdef-display-extras title=display-extras>display-extras</a><td>none | list-item<td>none<td>all elements<td>no<td>n/a<td>all<td><td>as specified
718-
<tr><th scope=row><a class=css data-link-type=property href=#propdef-display title=display>display</a><td>inline | block | list-item | inline-list-item | inline-block | table | inline-table | table-cell | table-caption | flex | inline-flex | grid | inline-grid | [ &lt;‘display-inside’&gt; || &lt;‘display-outside’&gt; || &lt;‘display-extras’&gt; ]<td>see individual properties<td>see individual properties<td>see individual properties<td><td>see individual properties<td>see individual properties<td>see individual properties
709+
<tr><th scope=row><a class=css data-link-type=property href=#propdef-display-list title=display-list>display-list</a><td>none | list-item<td>none<td>all elements<td>no<td>n/a<td>all<td><td>as specified
710+
<tr><th scope=row><a class=css data-link-type=property href=#propdef-display title=display>display</a><td>inline | block | list-item | inline-list-item | inline-block | table | inline-table | table-cell | table-caption | flex | inline-flex | grid | inline-grid | [ &lt;‘display-inside’&gt; || &lt;‘display-outside’&gt; || &lt;‘display-list’&gt; ]<td>see individual properties<td>see individual properties<td>see individual properties<td><td>see individual properties<td>see individual properties<td>see individual properties
719711
<tr><th scope=row><a class=css data-link-type=property href=#propdef-box-suppress title=box-suppress>box-suppress</a><td>show | discard | hide<td>normal<td>all elements<td>no<td>n/a<td>all<td><td>see prose</table></div>
720712

721713

@@ -728,12 +720,4 @@ <h2 class="no-num heading settled" id=issues-index><span class=content>Issues In
728720
Is <a href=http://lists.w3.org/Archives/Public/www-style/2012Jul/0450.html>fantasai’s proposal for a run-in model</a> sane enough to include in this spec?
729721

730722

731-
<a href=#issue-959f23ef></a></div><div class=issue>
732-
This property is probably dumb,
733-
and at the very least has a dumb name.
734-
Better names?
735-
If I define more one-off weird box-generation details like this,
736-
should I merge them into a single "extras" property like this,
737-
or just have them all be separate properties?
738-
739-
<a href=#issue-70026084></a></div></div>
723+
<a href=#issue-959f23ef></a></div></div>

0 commit comments

Comments
 (0)