Skip to content

Commit 8637229

Browse files
committed
Some editorial cleanup.
--HG-- extra : rebase_source : df23036eb5701d8de1fe7917f4fd0e1594da4a96
1 parent 91c18c9 commit 8637229

2 files changed

Lines changed: 15 additions & 27 deletions

File tree

css-variables/Overview.html

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<style>
1313
pre.idl { border:solid thin; background:#eee; color:#000; padding:0.5em }
1414
pre.idl :link, pre.idl :visited { color:inherit; background:transparent }
15+
i { font-style: normal; }
1516
</style>
1617

1718
<body>
@@ -301,12 +302,6 @@ <h2 id=defining-variables><span class=secno>2. </span> Defining Variables
301302
custom micro-syntaxes like what's allowed in calc(). There <em>are</em>
302303
still rules, however; for example, unbalanced parentheses are invalid.
303304

304-
<p> The initial value of a <a href="#variable-property"><i>variable
305-
property</i></a> is an empty invalid value. This means that, until a <a
306-
href="#variable-property"><i>variable property</i></a> is explicitly
307-
defined otherwise by a style sheet, it defines an <a
308-
href="#invalid-variable"><i>invalid variable</i></a>
309-
310305
<p> The term <dfn id=variable-property
311306
title="variable property|variables properties">variable property</dfn>
312307
refers to any property whose name is composed of a "var-" prefix followed
@@ -317,6 +312,12 @@ <h2 id=defining-variables><span class=secno>2. </span> Defining Variables
317312
the same name as the property except that the "var-" prefix is replaced
318313
with a "$" prefix.
319314

315+
<p> The initial value of a <a href="#variable-property"><i>variable
316+
property</i></a> is an empty invalid value. This means that, until a <a
317+
href="#variable-property"><i>variable property</i></a> is explicitly
318+
defined otherwise by a style sheet, it defines an <a
319+
href="#invalid-variable"><i>invalid variable</i></a>
320+
320321
<p class=issue> As defined here, the syntax for variable usage is different
321322
from the syntax for variable definition (i.e. var-foo for definition, $foo
322323
for usage). It might be nice to have the syntaxes match, using "$foo" as
@@ -487,13 +488,7 @@ <h2 id=defining-variables><span class=secno>2. </span> Defining Variables
487488
a value that will eventually (when referenced as a variable in a normal
488489
property) resolve to ‘<code class=css>30px</code>’.
489490
</div>
490-
491-
<p> The initial value of a <a href="#variable-property"><i>variable
492-
property</i></a> is a special invalid value which makes the associated
493-
variable an <a href="#invalid-variable"><i>invalid variable</i></a>. This
494-
is represented by the keyword ‘<code class=css>invalid</code>’, but
495-
that keyword has no special meaning in itself, and is valid if set
496-
explicitly in a variable property. <!--
491+
<!--
497492
UUUUUUUU UUUUUUUU iiii
498493
U::::::U U::::::U i::::i
499494
U::::::U U::::::U iiii
@@ -518,7 +513,6 @@ <h2 id=defining-variables><span class=secno>2. </span> Defining Variables
518513
ggg::::::ggg
519514
gggggg
520515
-->
521-
522516

523517
<h2 id=using-variables><span class=secno>3. </span> Using Variables</h2>
524518

css-variables/Overview.src.html

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<style>
99
pre.idl { border:solid thin; background:#eee; color:#000; padding:0.5em }
1010
pre.idl :link, pre.idl :visited { color:inherit; background:transparent }
11+
i { font-style: normal; }
1112
</style>
1213
</head>
1314

@@ -159,19 +160,19 @@ <h2 id="defining-variables">
159160
for example,
160161
unbalanced parentheses are invalid.
161162

162-
<p>
163-
The initial value of a <i>variable property</i> is an empty invalid value.
164-
This means that,
165-
until a <i>variable property</i> is explicitly defined otherwise by a style sheet,
166-
it defines an <i>invalid variable</i>
167-
168163
<p>
169164
The term <dfn title="variable property|variables properties">variable property</dfn> refers to any property
170165
whose name is composed of a "var-" prefix
171166
followed by something matching the IDENT production in <a href="http://www.w3.org/TR/CSS2/syndata.html#tokenization">CSS2.1 Chapter 4</a>.
172167
A <i>variable property</i> defines a value for a corresponding <i>variable</i>
173168
with the same name as the property except that the "var-" prefix is replaced with a "$" prefix.
174169

170+
<p>
171+
The initial value of a <i>variable property</i> is an empty invalid value.
172+
This means that,
173+
until a <i>variable property</i> is explicitly defined otherwise by a style sheet,
174+
it defines an <i>invalid variable</i>
175+
175176
<p class='issue'>
176177
As defined here,
177178
the syntax for variable usage is different from the syntax for variable definition
@@ -347,13 +348,6 @@ <h2 id="defining-variables">
347348
resolve to ''30px''.
348349
</div>
349350

350-
<p>
351-
The initial value of a <i>variable property</i>
352-
is a special invalid value which makes the associated variable an <i>invalid variable</i>.
353-
This is represented by the keyword ''invalid'',
354-
but that keyword has no special meaning in itself,
355-
and is valid if set explicitly in a variable property.
356-
357351

358352
<!--
359353
UUUUUUUU UUUUUUUU iiii

0 commit comments

Comments
 (0)