(merge)

Author: bert-github

.htaccess

@@ -29,7 +29,7 @@ RewriteRule ^css3-background/(.*)$ http://dev.w3.org/csswg/css-backgrounds/$1 [R
 RewriteRule ^css3-box/(.*)$ http://dev.w3.org/csswg/css-box/$1 [R=301,L]
 RewriteRule ^css3-break/(.*)$ http://dev.w3.org/csswg/css-break/$1 [R=301,L]
 RewriteRule ^css3-cascade/(.*)$ http://dev.w3.org/csswg/css-cascade/$1 [R=301,L]
-RewriteRule ^css3-color/(.*)$ http://dev.w3.org/csswg/css-color-3/$1 [R=301,L]
+RewriteRule ^css3-color/(.*)$ http://dev.w3.org/csswg/css-color/$1 [R=301,L]
 RewriteRule ^css3-conditional/(.*)$ http://dev.w3.org/csswg/css-conditional/$1 [R=301,L]
 RewriteRule ^css3-content/(.*)$ http://dev.w3.org/csswg/css-content/$1 [R=301,L]
 RewriteRule ^css3-exclusions/(.*)$ http://dev.w3.org/csswg/css-exclusions/$1 [R=301,L]
@@ -115,7 +115,7 @@ RewriteRule ^css-backgrounds-3/(.*)$ css-backgrounds/$1
 RewriteRule ^css-box-3/(.*)$ css-box/$1
 RewriteRule ^css-break-3/(.*)$ css-break/$1
 RewriteRule ^css-cascade-3/(.*)$ css-cascade/$1
-RewriteRule ^css-color-4/(.*)$ css-color/$1
+RewriteRule ^css-color-3/(.*)$ css-color/$1
 RewriteRule ^css-conditional-3/(.*)$ css-conditional/$1
 RewriteRule ^css-content-3/(.*)$ css-content/$1
 RewriteRule ^css-counter-styles-3/(.*)$ css-counter-styles/$1

bin/README

@@ -1,3 +1,3 @@
-Scripts in this directory should be chmod 755.
+Scripts in this directory should be chmod 744.
 NOT 755. 744. Yeah.
 

bin/hg-functions

@@ -0,0 +1,17 @@
+# You always want to do rebase pulls.
+alias pull='hg pull --rebase'
+
+# You always want to pull before pushing, to avoid spurious collisions.
+alias push='pull && hg push'
+
+# Commits, and prepends the current directory name to the commit message.
+# Just pass it the commit message as an argument.
+function save {
+	hg commit -m "[${PWD##*/}] ${1}"
+}
+
+# Regens, commits, and pulls/pushes, all in one package.
+# Pass it the commit message as an argument.
+function rcommit {
+	regenerate && save "${1}" . && push
+}

css-align/Overview.html

@@ -10,7 +10,7 @@
   <link rel="stylesheet" type="text/css" href="http://www.w3.org/StyleSheets/TR/W3C-[STATUS].css">
   <style type="text/css">
     .issue th:first-child { text-align: left !important; }  
-    [rowspan] > img { max-height: 4em; float: right; }  
+    [rowspan] > img { float: right; }  
     [rowspan] { vertical-align: middle; }
     small { display: block; }
   </style>
@@ -166,7 +166,7 @@ <h2 id="overview">
   <tbody>
     <tr><th>'justify-content'
         <td>inline
-        <td rowspan=2><img src="content-target.jpg" alt="">content within element <small>(effectively adjusts padding)</small>
+        <td rowspan=2><img src="images/content-example.svg" width=106 height=106 alt="">content within element <small>(effectively adjusts padding)</small>
         <td>block containers and flex containers
     <tr><th>'align-content'
         <td>stacking
@@ -175,7 +175,7 @@ <h2 id="overview">
   <tbody>
     <tr><th>'justify-self'
         <td>inline
-        <td rowspan=2><img src="self-target.jpg" alt=""> element within parent <small>(effectively adjusts margins)</small>
+        <td rowspan=2><img src="images/self-example.svg" width=106 height=106 alt=""> element within parent <small>(effectively adjusts margins)</small>
         <td>block-level elements and grid items
     <tr><th>'align-self'
         <td>stacking
@@ -184,7 +184,7 @@ <h2 id="overview">
   <tbody>
     <tr><th>'justify-items'
         <td>inline
-        <td rowspan=2><img src="child-target.jpg" alt=""> items inside element <small>(controls child items&rsquo; ''align/justify-self: auto'')</small>
+        <td rowspan=2><img src="images/items-example.svg" width=106 height=106 alt=""> items inside element <small>(controls child items&rsquo; ''align/justify-self: auto'')</small>
         <td>grid containers
     <tr><th>'align-items'
         <td>stacking
@@ -499,7 +499,7 @@ <h2 id='content-distribution'>
   <p>The 'justify-content' and 'align-content' properties control alignment of the box's content within the box.
 
   <div class="figure">
-    <p><img alt="Diagram showing that the alignment of the content within the element is affected." src="content-target.jpg">
+    <p><img alt="Diagram showing that the alignment of the content within the element is affected." src="images/content-example.svg" width=212 height=212>
   </div>
 
   <table class=propdef>
@@ -649,7 +649,7 @@ <h2 id='self-alignment'>
     The 'justify-self' and 'align-self' properties control alignment of the box within its containing block.
 
   <div class="figure">
-    <p><img alt="Diagram showing that the alignment of the element within its containing block is affected." src="self-target.jpg">
+    <p><img alt="Diagram showing that the alignment of the element within its containing block is affected." src="images/self-example.svg" width=212 height=212>
   </div>
 
 <h3 id='justify-self-property'>
@@ -931,7 +931,7 @@ <h2 id='default-alignment'>
     The 'align-items' and 'justify-items' properties set the default 'align-self' and 'justify-self' behavior of the items contained by the element.
 
   <div class="figure">
-    <p><img alt="Diagram showing that the alignment of grid items within the element is affected." src="child-target.jpg">
+    <p><img alt="Diagram showing that the alignment of grid items within the element is affected." src="images/items-example.svg" width=212 height=212>
   </div>
 
 <h3 id='justify-items-property'>
@@ -1068,12 +1068,12 @@ <h2 id="changes">
     <li>Defined terms <i>alignment container</i> and <i>alignment subject</i>
       to make ti easier to define alignment.
     <li>Pulled out all value definitions into a general section on <a href="#alignment-values">Alignment Values</a>.
-    <li>Added both ''safe'' and ''true'' as <a href="file:///home/fantasai/w3c/csswg/css-align/Overview.html#overflow-values">overflow alignment keywords</a>
+    <li>Added both ''safe'' and ''true'' as <a href="#overflow-values">overflow alignment keywords</a>
       and made the default layout-mode-dependent.
     <li>Removed ''head'' and ''foot'' keywords,
       defined ''start'' and ''end'' keywords as relative to the <i>alignment container</i>'s <i>writing mode</i>,
       and added ''self-start'' and ''self-end'' to be relative to the <i>alignment subject</i>.
-    <li>Filled out details on <a href="file:///home/fantasai/w3c/csswg/css-align/Overview.html#baseline">baseline alignment</a>.
+    <li>Filled out details on <a href="#baseline">baseline alignment</a>.
     <li>Made 'justify-items' handle the <code>&lt;CENTER&gt;></code>/<code>align</code> attribute requirements
       by adding ''legacy'' keyword.
     <li>Added <i>fallback alignment</i> ability for 'justify-content' and 'align-content'.