Skip to content

Commit

Permalink
[css-page-floats] merged
Browse files Browse the repository at this point in the history
  • Loading branch information
Johannes Wilm committed Mar 26, 2015
2 parents 823c512 + c5fdfb3 commit f34c380
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
8 changes: 7 additions & 1 deletion css-pseudo/Overview.bs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ Editor: fantasai, Invited Expert, http://fantasai.inkedblade.net/contact
Editor: Alan Stearns, Adobe Systems Inc., stearns@adobe.com
Abstract: This CSS module defines pseudo-elements, abstract elements that represent portions of the CSS render tree that can be selected and styled.
Ignored Terms: initial-letter
Link Defaults: css-color-3 (property) color
</pre>
<pre class="link-defaults">
spec:css-color-3; type:value; text:currentcolor
spec:css-color-3; type:property; text:color
</pre>

<h2 id="intro">Introduction</h2>
Expand Down Expand Up @@ -674,6 +677,9 @@ List Markers: the ''::marker'' pseudo-element</h3>
however at the moment marker box layout is not fully defined,
so only these properties are allowed.

UAs must add the following rule to their default style sheet:
<pre>::marker { font-variant-numeric: tabular-nums; }</pre>

<h3 id="placeholder-pseudo">
Placeholder Input: the ''::placeholder'' pseudo-element</h3>

Expand Down
8 changes: 7 additions & 1 deletion css-pseudo/Overview.html
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ <h2 class="no-num no-toc no-ref heading settled" id="contents"><span class="cont




<h2 class="heading settled" data-level="1" id="intro"><span class="secno">1. </span><span class="content">Introduction</span><a class="self-link" href="#intro"></a></h2>


Expand Down Expand Up @@ -824,7 +825,7 @@ <h3 class="heading settled" data-level="3.2" id="highlight-styling"><span class=
<p>If <a class="property" data-link-type="propdesc" href="http://www.w3.org/TR/css3-color/#color0">color</a> is not specified, the text (and text decoration)'s
unselected color must be used for the highlight.
(As usual, the initial <a class="property" data-link-type="propdesc" href="http://www.w3.org/TR/css3-background/#background-color">background-color</a> is <a class="css" data-link-type="maybe" href="http://dev.w3.org/csswg/css-color-4/#valdef-color-transparent">transparent</a>.)
Issue: Can we reuse <a class="css" data-link-type="maybe" href="http://dev.w3.org/csswg/css-color-4/#valdef-color-currentcolor">currentColor</a> for this, now that it computes to itself?</p>
Issue: Can we reuse <span class="css">currentColor</span> for this, now that it computes to itself?</p>


<p>The UA should use the OS-default highlight colors
Expand Down Expand Up @@ -1083,6 +1084,11 @@ <h3 class="heading settled" data-level="4.2" id="marker-pseudo"><span class="sec
so only these properties are allowed.

</p>
<p>UAs must add the following rule to their default style sheet:</p>

<pre>::marker { font-variant-numeric: tabular-nums; }</pre>


<h3 class="heading settled" data-level="4.3" id="placeholder-pseudo"><span class="secno">4.3. </span><span class="content">
Placeholder Input: the <a class="css" data-link-type="maybe" href="#selectordef-placeholder">::placeholder</a> pseudo-element</span><a class="self-link" href="#placeholder-pseudo"></a></h3>

Expand Down

0 comments on commit f34c380

Please sign in to comment.