xlawrence 2005/10/06 16:19:53 CEST
Modified files:
core/src/webapp/jsp/jahia/css colorsAndStyles.css
core/src/webapp/jsp/jahia/engines/css styles.css
Log:
renamed some CSS definitions to avoid conflicts with the jsCalendar used in
the TimeBasedPublishing
Revision Changes Path
1.5 +3 -3 jahia/core/src/webapp/jsp/jahia/css/colorsAndStyles.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/colorsAndStyles.css.diff?r1=1.4&r2=1.5&f=h
1.4 +7 -6 jahia/core/src/webapp/jsp/jahia/engines/css/styles.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/css/styles.css.diff?r1=1.3&r2=1.4&f=h
Index: colorsAndStyles.css
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/css/colorsAndStyles.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- colorsAndStyles.css 5 Oct 2005 14:44:14 -0000 1.4
+++ colorsAndStyles.css 6 Oct 2005 14:19:53 -0000 1.5
@@ -66,15 +66,15 @@
/* TABLE STRUCT */
/* ------------------------------------------------ */
-th {
+#wrapper th {
color: #111;
}
-tr {
+#wrapper tr {
font-style: italic;
}
-td {
+#wrapper td {
font-size: 12px;
}
Index: styles.css
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/css/styles.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- styles.css 6 Oct 2005 12:19:16 -0000 1.3
+++ styles.css 6 Oct 2005 14:19:53 -0000 1.4
@@ -101,31 +101,32 @@
/* TABLE STRUCT */
/* ------------------------------------------------ */
-table {
+#wrapper table {
margin-bottom: 18px;
}
-table, caption {
+#wrapper table,
+#wrapper caption {
margin-top: 14px;
width: 100%;
text-align: left;
}
-caption {
+#wrapper caption {
margin-bottom: 12px;
text-align: justify;
}
-th {
+#wrapper th {
font-size: 12px;
font-weight: normal;
}
-tr {
+#wrapper tr {
font-style: normal;
}
-td {
+#wrapper td {
text-align: justify;
}
