forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From diwa...@apache.org
Subject svn commit: r225449 - in /forrest/trunk: main/webapp/skins/common/xslt/html/ main/webapp/skins/leather-dev/css/ main/webapp/skins/leather-dev/xslt/html/ main/webapp/skins/pelt/css/ whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/re...
Date Wed, 27 Jul 2005 04:08:35 GMT
Author: diwaker
Date: Tue Jul 26 21:08:31 2005
New Revision: 225449

URL: http://svn.apache.org/viewcvs?rev=225449&view=rev
Log:
Misc skin fixes;

o pelt/leather-dev/common used to output "frame warning", "frame note" etc as div classes.
This has 2 problems -- a) its hard to write CSS rules for classes with spaces in them, and
b) that "frame" prefix is thouroughly confusing

o multiple typos in default.css [views] was causing tabs to disappear. Other misc fixes as
well.


Modified:
    forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl
    forrest/trunk/main/webapp/skins/leather-dev/css/basic.css
    forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document2html.xsl
    forrest/trunk/main/webapp/skins/pelt/css/basic.css
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/default.css

Modified: forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl?rev=225449&r1=225448&r2=225449&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl (original)
+++ forrest/trunk/main/webapp/skins/common/xslt/html/document2html.xsl Tue Jul 26 21:08:31
2005
@@ -137,7 +137,7 @@
 
   <xsl:template match="note | warning | fixme">
     <xsl:apply-templates select="@id"/>
-    <div class="frame {local-name()}">
+    <div class="{local-name()}">
       <div class="label">
         <xsl:choose>
           <!-- FIXME: i18n Transformer here -->

Modified: forrest/trunk/main/webapp/skins/leather-dev/css/basic.css
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/leather-dev/css/basic.css?rev=225449&r1=225448&r2=225449&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/css/basic.css (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/css/basic.css Tue Jul 26 21:08:31 2005
@@ -124,17 +124,18 @@
 }
 
 /*============Labels, fixme etc.=================*/
-.frame {
+.note, .warning, .fixme {
 	border: solid black 1px;
 	margin: 1em 3em;
 }
-.frame .label {
+
+.note .label {
 	background: #369;
 	color: white;
 	font-weight: bold;
 	padding: 5px 10px;
 }
-.frame .content {
+.note .content {
 	padding: 5px 10px;
 	background: #F0F0FF;
 	color: black;

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document2html.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document2html.xsl?rev=225449&r1=225448&r2=225449&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document2html.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document2html.xsl Tue Jul 26 21:08:31
2005
@@ -145,7 +145,7 @@
   </xsl:template>
   <xsl:template match="note | warning | fixme">
     <xsl:apply-templates select="@id"/>
-    <div class="frame {local-name()}">
+    <div class="{local-name()}">
       <div class="label">
         <xsl:choose>
           <!-- FIXME: i18n Transformer here -->

Modified: forrest/trunk/main/webapp/skins/pelt/css/basic.css
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/pelt/css/basic.css?rev=225449&r1=225448&r2=225449&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/css/basic.css (original)
+++ forrest/trunk/main/webapp/skins/pelt/css/basic.css Tue Jul 26 21:08:31 2005
@@ -38,18 +38,18 @@
   clear: both;
 }
 
-.frame {
+.note, .warning, .fixme {
   border: solid black 1px;
   margin: 1em 3em;
 }
 
-.frame .label {
+.note .label {
   background: #369;
   color: white;
   font-weight: bold;
   padding: 5px 10px;
 }
-.frame .content {
+.note .content {
   padding: 5px 10px;
   background: #F0F0FF;
   color: black;

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/default.css
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/default.css?rev=225449&r1=225448&r2=225449&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/default.css
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/skin/css/default.css
Tue Jul 26 21:08:31 2005
@@ -41,6 +41,7 @@
     font-weight: bold;
     text-transform: lowercase;
     font-family: sans-serif;
+    max-width: 90%;
 }
 
 #nav-main li { 
@@ -56,10 +57,6 @@
     text-decoration: underline;
 }
 
-/*#nav-main li a.base-selected{*/
-   /*color: #339900;*/
-/*}*/
-
 #nav-main li a.base-selected:before {
     content: "[ ";
 }
@@ -72,33 +69,28 @@
 #leftbar {
     width: 25%;
     float: left;
-    background: #eae8e3;
-    border: thin dashed #565248;
 }
 
-#nav-selection {
-    padding: 0;
-    margin: 0;
+#nav-section {
+    background: #eae8e3;
+    border: thin dashed #565248;
+    margin-bottom: 10px;
 }
 
-#nav-selection ul {
+#nav-section ul {
     list-style: none;
     padding-left: 20px;
 }
 
-#nav-selection li.pagegroup ul {
+#nav-section li.pagegroup ul {
     list-style: none;
 }
 
-
 .menupagetitle {
     color: #013396;
     display: inline;
     font-weight: bold;
 }
-.menupagetitle:hover {
-    text-decoration: none;
-}
 
 .menupagetitle:before {
     content: "[ ";
@@ -108,7 +100,6 @@
     content: " ]";
 }
 
-
 /* The actual content */
 #content {
     margin-left: 25%;
@@ -123,6 +114,7 @@
     background: #314e6c;
     color: #ffffff;
     padding: 2px;
+    clear: both;
 }
 
 #footer a {
@@ -130,14 +122,14 @@
 }
 
 /* note */
-.frame-note {
+.note {
     border: 2px solid #013397;
     background: #b3d3fd;
     padding: 4px;
     margin: 4px;
 }
 
-.frame-note .label {
+.note .label {
     font-weight: bold;
     text-decoration: underline;
     font-size: large;
@@ -146,14 +138,14 @@
 }
 
 /* warning */
-.frame-warning {
+.warning {
     border: 2px solid #980101;
     background: #f44800;
     padding: 4px;
     margin: 4px;
 }
 
-.frame-warning .label {
+.warning .label {
     font-weight: bold;
     text-decoration: underline;
     font-size: large;



Mime
View raw message