Skip to content

Commit 1813f65

Browse files
committed
[css-cascade] Per WG decision, Transition and Animations positions in the cascade are set.
1 parent 4455ee5 commit 1813f65

2 files changed

Lines changed: 2 additions & 11 deletions

File tree

css-cascade/Overview.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,6 @@ <h2 id=cascading><span class=secno>6. </span> Cascading</h2>
960960
<ol>
961961
<li>Transition declarations <a href="#CSS3-TRANSITIONS"
962962
rel=biblioentry>[CSS3-TRANSITIONS]<!--{{!CSS3-TRANSITIONS}}--></a>
963-
<sup><a href="#animations-origin-note">[NOTE]</a></sup>
964963

965964
<li>Important user agent declarations
966965

@@ -973,7 +972,6 @@ <h2 id=cascading><span class=secno>6. </span> Cascading</h2>
973972

974973
<li>Animation declarations <a href="#CSS3-ANIMATIONS"
975974
rel=biblioentry>[CSS3-ANIMATIONS]<!--{{!CSS3-ANIMATIONS}}--></a>
976-
<sup><a href="#animations-origin-note">[NOTE]</a></sup>
977975

978976
<li>Normal override declarations <a href="#DOM-LEVEL-2-STYLE"
979977
rel=biblioentry>[DOM-LEVEL-2-STYLE]<!--{{!DOM-LEVEL-2-STYLE}}--></a>
@@ -985,10 +983,6 @@ <h2 id=cascading><span class=secno>6. </span> Cascading</h2>
985983
<li>Normal user agent declarations
986984
</ol>
987985

988-
<p class=note id=animations-origin-note> The precise ordering of
989-
Transition and Animation declarations is still under <a
990-
href="http://lists.w3.org/Archives/Public/www-style/2013Mar/0297.html">discussion</a>.
991-
992986
<p> Declarations from <a href="#origin"><i>origins</i></a> earlier in
993987
this list win over declarations from later <a
994988
href="#origin"><i>origins</i></a>.

css-cascade/Overview.src.html

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -650,21 +650,18 @@ <h2 id='cascading'>
650650
The precedence of the various <i>origins</i> is, in descending order:
651651

652652
<ol>
653-
<li>Transition declarations [[!CSS3-TRANSITIONS]] <sup><a href="#animations-origin-note">[NOTE]</a></sup>
653+
<li>Transition declarations [[!CSS3-TRANSITIONS]]
654654
<li>Important user agent declarations
655655
<li>Important user declarations
656656
<li>Important override declarations [[!DOM-LEVEL-2-STYLE]]
657657
<li>Important author declarations
658-
<li>Animation declarations [[!CSS3-ANIMATIONS]] <sup><a href="#animations-origin-note">[NOTE]</a></sup>
658+
<li>Animation declarations [[!CSS3-ANIMATIONS]]
659659
<li>Normal override declarations [[!DOM-LEVEL-2-STYLE]]
660660
<li>Normal author declarations
661661
<li>Normal user declarations
662662
<li>Normal user agent declarations
663663
</ol>
664664

665-
<p id="animations-origin-note" class="note">
666-
The precise ordering of Transition and Animation declarations is still under <a href="http://lists.w3.org/Archives/Public/www-style/2013Mar/0297.html">discussion</a>.
667-
668665
<p>
669666
Declarations from <i>origins</i> earlier in this list win over declarations from later <i>origins</i>.
670667

0 commit comments

Comments
 (0)