Skip to content

Commit 650ad7c

Browse files
committed
[css-align] Rename <item-position> to <self-position>, so both productions reference the properties they're used in.
--HG-- extra : rebase_source : 71475b0447b0f139349cfbb8d59d50a7f7249d63
1 parent 73138e4 commit 650ad7c

2 files changed

Lines changed: 88 additions & 257 deletions

File tree

css-align/Overview.bs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,15 @@ Positional Alignment: the ''center'', ''start'', ''end'', ''self-start'', ''self
184184
The positional alignment keywords specify a position for an <a>alignment subject</a>
185185
with respect to its <a>alignment container</a>.
186186

187-
The <<item-position>> set of values is used by 'justify-self' and 'align-self'
187+
The <<self-position>> set of values is used by 'justify-self' and 'align-self'
188188
to align the box within its <a>alignment container</a>,
189189
and also by 'justify-items' and 'align-items'
190190
(to specify default values for 'justify-self' and 'align-self').
191191
The <<content-position>> set of values is used by 'justify-content' and 'align-content'
192192
to align the box's contents within itself.
193193

194194
<pre class='prod'>
195-
<dfn>&lt;item-position></dfn> = center | start | end | self-start | self-end |
195+
<dfn>&lt;self-position></dfn> = center | start | end | self-start | self-end |
196196
flex-start | flex-end | left | right;
197197
<dfn>&lt;content-position></dfn> = center | start | end | flex-start | flex-end | left | right;
198198
</pre>
@@ -201,43 +201,43 @@ Positional Alignment: the ''center'', ''start'', ''end'', ''self-start'', ''self
201201
Values have the following meanings:
202202

203203
<dl dfn-type="value">
204-
<dt><dfn for="<item-position>, <content-position>">center</dfn>
204+
<dt><dfn for="<self-position>, <content-position>">center</dfn>
205205
<dd>Centers the <a>alignment subject</a> within its <a>alignment container</a>.
206206

207-
<dt><dfn for="<item-position>, <content-position>">start</dfn>
207+
<dt><dfn for="<self-position>, <content-position>">start</dfn>
208208
<dd>Aligns the <a>alignment subject</a> to be flush with the <a>alignment container</a>’s start edge.
209209

210-
<dt><dfn for="<item-position>, <content-position>">end</dfn>
210+
<dt><dfn for="<self-position>, <content-position>">end</dfn>
211211
<dd>Aligns the <a>alignment subject</a> to be flush with the <a>alignment container</a>’s end edge.
212212

213-
<dt><dfn for="<item-position>">self-start</dfn>
213+
<dt><dfn for="<self-position>">self-start</dfn>
214214
<dd>Aligns the <a>alignment subject</a> to be flush with the edge of the <a>alignment container</a>
215215
corresponding to the <a>alignment subject</a>’s start side.
216216

217-
<dt><dfn for="<item-position>">self-end</dfn>
217+
<dt><dfn for="<self-position>">self-end</dfn>
218218
<dd>Aligns the <a>alignment subject</a> to be flush with the edge of the <a>alignment container</a>
219219
corresponding to the <a>alignment subject</a>’s end side.
220220

221-
<dt><dfn for="<item-position>, <content-position>">flex-start</dfn>
221+
<dt><dfn for="<self-position>, <content-position>">flex-start</dfn>
222222
<dd><strong>Only used in flex layout.</strong> [[!CSS3-FLEXBOX]]
223223
Aligns the <a>alignment subject</a> to be flush with the edge of the <a>alignment container</a>
224224
corresponding to the <a>flex container</a>’s main-start or cross-start side, as appropriate.
225225
When used in layout modes other than Flexbox,
226226
this value computes to ''start''.
227227

228-
<dt><dfn for="<item-position>, <content-position>">flex-end</dfn>
228+
<dt><dfn for="<self-position>, <content-position>">flex-end</dfn>
229229
<dd><strong>Only used in flex layout.</strong>
230230
Aligns the <a>alignment subject</a> to be flush with the edge of the <a>alignment container</a>
231231
corresponding to the <a>flex container</a>’s main-end or cross-end side, as appropriate.
232232
When used in layout modes other than Flexbox,
233233
this value computes to ''end''.
234234

235-
<dt><dfn for="<item-position>, <content-position>">left</dfn>
235+
<dt><dfn for="<self-position>, <content-position>">left</dfn>
236236
<dd>Aligns the <a>alignment subject</a> to be flush with the <a>alignment container</a>’s <a href="http://www.w3.org/TR/css3-writing-modes/#line-left">line-left</a> edge.
237237
If the property's axis is not parallel with the inline axis,
238238
this value computes to ''start''.
239239

240-
<dt><dfn for="<item-position>, <content-position>">right</dfn>
240+
<dt><dfn for="<self-position>, <content-position>">right</dfn>
241241
<dd>Aligns the <a>alignment subject</a> to be flush with the <a>alignment container</a>’s <a href="http://www.w3.org/TR/css3-writing-modes/#line-right">line-right</a> edge.
242242
If the property's axis is not parallel with the inline axis,
243243
this value computes to ''start''.
@@ -366,7 +366,7 @@ Distributed Alignment: the ''<content-distribution>/stretch'', ''space-between''
366366
Unless otherwise specified,
367367
this value falls back to ''flex-start''.
368368
<span class='note'>(For layout modes other than flex layout, ''flex-start'' is identical to ''start''.)</span>
369-
369+
370370
Issue: Should this value allow a fallback alignment on 'align-self' and 'justify-self',
371371
like it does on 'align-content' and 'justify-content'?
372372
</dl>
@@ -582,7 +582,7 @@ Inline/Main-Axis Alignment: the 'justify-self' property</h3>
582582

583583
<pre class="propdef">
584584
Name: justify-self
585-
Value: auto | stretch | <<baseline-position>> | [ <<overflow-position>>? && <<item-position>> ]
585+
Value: auto | stretch | <<baseline-position>> | [ <<overflow-position>>? && <<self-position>> ]
586586
Initial: auto
587587
Applies to: block-level boxes, absolutely-positioned boxes, and grid items
588588
Inherited: no
@@ -683,7 +683,7 @@ Block/Cross-Axis Alignment: the 'align-self' property</h3>
683683

684684
<pre class="propdef">
685685
Name: align-self
686-
Value: auto | stretch | <<baseline-position>> | [ <<overflow-position>>? && <<item-position>> ]
686+
Value: auto | stretch | <<baseline-position>> | [ <<overflow-position>>? && <<self-position>> ]
687687
Initial: auto
688688
Applies to: flex items, grid items, and absolutely-positioned boxes
689689
Inherited: no
@@ -811,7 +811,7 @@ Inline/Main-Axis Alignment: the 'justify-items' property</h3>
811811

812812
<pre class="propdef">
813813
Name: justify-items
814-
Value: auto | stretch | <<baseline-position>> | [ <<item-position>> && <<overflow-position>>? ] | [ legacy && [ ''<content-position>/left'' | ''<content-position>/right'' | ''<content-position>/center'' ] ]
814+
Value: auto | stretch | <<baseline-position>> | [ <<self-position>> && <<overflow-position>>? ] | [ legacy && [ ''<content-position>/left'' | ''<content-position>/right'' | ''<content-position>/center'' ] ]
815815
Initial: auto
816816
Applies to: block containers, flex containers, and grid containers
817817
Inherited: no
@@ -855,7 +855,7 @@ Block/Cross-Axis Alignment: the 'align-items' property</h3>
855855

856856
<pre class="propdef">
857857
Name: align-items
858-
Value: auto | stretch | <<baseline-position>> | [ <<item-position>> && <<overflow-position>>? ]
858+
Value: auto | stretch | <<baseline-position>> | [ <<self-position>> && <<overflow-position>>? ]
859859
Initial: auto
860860
Applies to: block-level elements
861861
Inherited: no

0 commit comments

Comments
 (0)