Remove conflict by regenerating output

Author: fantasai

css3-images/default.css

@@ -1,7 +1,6 @@
 /*
  * Style sheet for the CSS3 specification,
  * to be used in addition to http://www.w3.org/StyleSheets/TR/W3C-{WD,PR,REC}
- * $Id$
  */
 
 @media print {
@@ -319,6 +318,8 @@ table.equiv-table { border-bottom: hidden }
 table.equiv-table { empty-cells: show }
 table.equiv-table caption { margin: 0.5em 0 0 0 }
 
+<<<<<<< default.css
+=======
 /* Style for table of properties */
 table.proptable {
     font-size: small;
@@ -333,12 +334,14 @@ table.proptable td, table.proptable th {
     border-style: solid none none dotted;
     border-width: thin;
     border-color: red;
+    vertical-align: baseline;
 }
 table.proptable th:first-child, table.proptable td:first-child {
     border-left-style: none;
 }
 
 
+>>>>>>> 1.14
 /* Style for table that defines a property or a descriptor */
 table.propdef, table.propdef-extra, table.descdef {
     border-spacing: 0;
@@ -440,9 +443,15 @@ table.features td {
 
 /* Style for data tables (and properly marked-up proptables) */
 
+
+/* Style for table of properties */
+
+
     .data, .proptable {
+      font-size: small;
       margin: 1em auto;
       border-collapse: collapse;
+      border-spacing: 0;
       border: solid #005A9B;
     }
     .data caption {
@@ -451,10 +460,16 @@ table.features td {
     }
     .data td, .data th,
     .proptable td, .proptable th {
-      border: thin solid;
-      padding: 0.2em;
+      border: thin;
+      border-style: solid none none dotted;
+      padding: 0.4em;
       text-align: center;
+      border-color: red;
     }
+    th:first-child, td:first-child {
+      border-left-style: none;
+    }
+
     .data thead th[scope="row"],
     .proptable thead th[scope="row"] {
       text-align: right;
@@ -472,11 +487,12 @@ table.features td {
       background: #EEEEEE;
       color: inherit;
     }
-    .data thead,
-    .data tbody,
-    .data tfoot,
-    .data colgroup {
-      border: solid;
+    .proptable code {
+      font: inherit;
+      white-space: nowrap;
+    }
+    .proptable th a {
+      display: block;
     }
 
     .data img {