Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[css-values] Address conflict between clauses per #708 (comment)
  • Loading branch information
fantasai committed Jun 21, 2017
1 parent 393d993 commit 78ea322
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions css-values-3/Overview.bs
Expand Up @@ -1103,17 +1103,17 @@ Absolute lengths: the ''cm'', ''mm'', ''q'', ''in'', ''pt'', ''pc'', ''px'' unit
All of the absolute length units are <a>compatible</a>,
and ''px'' is their <a>canonical unit</a>.

For a CSS device, these dimensions are anchored either
For a CSS device, these dimensions are <dfn lt="anchor unit">anchored</dfn> either

<ol type=i>
<li>by relating the <a>physical units</a> to their physical measurements, or
<li>by relating the <a value>pixel unit</a> to the <a>reference pixel</a>.
</ol>

For print media,
For print media at typical viewing distances,
the anchor unit should be one of the standard physical units (inches, centimeters, etc).
For screen media (including high-resolution devices),
lower-resolution devices,
low-resolution devices,
and devices with unusual viewing distances,
it is recommended instead that the anchor unit be the pixel unit.
For such devices it is recommended that the pixel unit
Expand Down
6 changes: 3 additions & 3 deletions css-values/Overview.bs
Expand Up @@ -1189,17 +1189,17 @@ Absolute lengths: the ''cm'', ''mm'', ''q'', ''in'', ''pt'', ''pc'', ''px'' unit
All of the absolute length units are <a>compatible</a>,
and ''px'' is their <a>canonical unit</a>.

For a CSS device, these dimensions are anchored either
For a CSS device, these dimensions are <dfn lt="anchor unit">anchored</dfn> either

<ol type=i>
<li>by relating the <a>physical units</a> to their physical measurements, or
<li>by relating the <a value>pixel unit</a> to the <a>reference pixel</a>.
</ol>

For print media,
For print media at typical viewing distances,
the anchor unit should be one of the standard physical units (inches, centimeters, etc).
For screen media (including high-resolution devices),
lower-resolution devices,
low-resolution devices,
and devices with unusual viewing distances),
it is recommended instead that the anchor unit be the pixel unit.
For such devices it is recommended that the pixel unit
Expand Down

0 comments on commit 78ea322

Please sign in to comment.