- From: Elika Etemad via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 12 Aug 2011 23:32:27 +0000
- To: public-css-commits@w3.org
Update of /sources/public/csswg/css3-images
In directory hutz:/tmp/cvs-serv14410
Modified Files:
default.css
Log Message:
Remove conflict by regenerating output
Index: default.css
===================================================================
RCS file: /sources/public/csswg/css3-images/default.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- default.css 6 Apr 2011 08:15:22 -0000 1.2
+++ default.css 12 Aug 2011 23:32:25 -0000 1.3
@@ -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 { 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 @@
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 @@
/* 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 @@
}
.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 @@
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 {
Received on Friday, 12 August 2011 23:32:28 UTC