cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: r594924 - in /cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF: resources/images/h1-image.gif resources/styles/main.css sitemap.xmap
Date Wed, 14 Nov 2007 15:59:04 GMT
Author: vgritsenko
Date: Wed Nov 14 07:59:03 2007
New Revision: 594924

URL: http://svn.apache.org/viewvc?rev=594924&view=rev
Log:
copy css, gif from cocoon-welcome.
rewrite css resources.

Added:
    cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/resources/images/h1-image.gif
      - copied unchanged from r594628, cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/h1-image.gif
Modified:
    cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/resources/styles/main.css
    cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/sitemap.xmap

Modified: cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/resources/styles/main.css
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/resources/styles/main.css?rev=594924&r1=594923&r2=594924&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/resources/styles/main.css
(original)
+++ cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/resources/styles/main.css
Wed Nov 14 07:59:03 2007
@@ -1,27 +1,27 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 body { background-color: white; color: black; font-family: verdana, helvetica, arial, sans-serif;
font-size: 80%; }
 
-h1 { color: #336699; text-align: center; font-size: 3em; padding-bottom: 10px; margin: 0px;
}
-h2 { color: #336699; }
-h3 { color: #336699; }
-h4 { color: #336699; }
+h1 { color: #0086b3; text-align: center; font-size: 3em; padding-bottom: 10px; margin: 0px;
}
+h2 { color: #0086b3; }
+h3 { color: #0086b3; }
+h4 { color: #0086b3; }
 
-a:link { color: #336699; }
+a:link { color: #0086b3; }
 a:visited { color: #800080; }
 a:hover { color: #800080; background-color: #ffff80; }
 a:active { color: #006666; }
@@ -29,36 +29,26 @@
 img { border: 0; }
 .figure { text-align: center; }
 
-span.year { color: #336699; }
+span.year { color: #0086b3; }
 
-p.copyright { text-align: center; padding-top: 10px; border-width: 1px 0px 0px 0px; border-style:
solid; border-color: #336699; }
-p.author { color: #336699; padding-bottom: 10px; }
+p.copyright { text-align: center; padding-top: 10px; border-width: 1px 0 0 0; border-style:
solid; border-color: #0086b3; }
+p.author { color: #0086b3; padding-bottom: 10px; }
 p.block { text-align: center; }
 
-hr { height: 0px; color: #336699; }
+hr { height: 0; color: #336699; }
 
-span.description { color: #336699; font-weight: bold; }
+span.description { color: #0086b3; font-weight: bold; }
 span.switch { cursor: pointer; margin-left: 5px; text-decoration: underline; }
 
 /* Samples */
 
 .samplesGroup {
-    /* a tasteful shade of blue */
-    background-color: #BFCCDF;
-    color: black;
-    border-width: 0px 0px 2px 0px;
-    border-style: solid;
-    border-color: #336699;
-    font-size:120%;
-    padding-left: 0.2em;
-    padding-top: 0.2em;
-    padding-bottom: 0.2em;
-    margin-top: 1em;
-    margin-bottom: 0;
- 
-    /* mozilla and some others support the fancy CSS3 borders */
-    -moz-border-radius-bottomleft: 1em;
-    border-radius-bottomleft: 1em;
+    margin: 15px 0 10px 0;
+    padding: 0 0 5px 17px;
+    background: url(servlet:/images/h1-image.gif) no-repeat left 4px;
+    font-size: 120%;
+    color: #0086b3;
+    border-bottom: 1px solid #0086b3;
 }
 
 .samplesNote {
@@ -84,7 +74,6 @@
 div.resources {
     text-align: right;
 }
-
 div.resources a {
     margin: 5px;
 }

Modified: cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/sitemap.xmap?rev=594924&r1=594923&r2=594924&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/sitemap.xmap
Wed Nov 14 07:59:03 2007
@@ -15,55 +15,53 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
   <map:pipelines>
-    <map:pipeline id="service-resource">
-      <!-- 
-        All matcher in this pipeline are intended to be called
-        when making use of servlet services from other blocks 
+    <map:pipeline id="services">
+      <!--
+        These matchers are intended to be called
+        when making use of servlet services from other blocks
       -->
       <map:match pattern="service/blocks/*">
-        <map:generate src="service-consumer:" />
-        <map:transform src="blocks/{1}.xsl" />
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize type="html" />
+        <map:generate src="service-consumer:"/>
+        <map:transform src="blocks/{1}.xsl"/>
+        <map:transform type="servletLinkRewriter"/>
+        <map:serialize type="html"/>
       </map:match>
       <map:match pattern="service/common/*">
-        <map:generate src="service-consumer:" />
-        <map:transform src="common/style/xsl/html/{1}.xsl" />
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize type="html" />
+        <map:generate src="service-consumer:"/>
+        <map:transform src="common/style/xsl/html/{1}.xsl"/>
+        <map:transform type="servletLinkRewriter"/>
+        <map:serialize type="html"/>
       </map:match>
       <map:match pattern="service/system/*">
-        <map:generate src="service-consumer:" />
-        <map:transform src="stylesheets/system/{1}.xslt" />
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize type="html" />
+        <map:generate src="service-consumer:"/>
+        <map:transform src="stylesheets/system/{1}.xslt"/>
+        <map:transform type="servletLinkRewriter"/>
+        <map:serialize type="html"/>
       </map:match>
     </map:pipeline>
 
-    <map:pipeline id="internal-resource">
-      <map:match pattern="**.css">
-        <map:read src="resources/{1}.css" />
-      </map:match>
+    <map:pipeline id="resources">
       <map:match pattern="**.gif">
-        <map:read src="resources/{1}.gif" />
+        <map:read src="resources/{1}.gif"/>
       </map:match>
       <map:match pattern="**.ico">
-        <map:read src="resources/{1}.ico" />
+        <map:read src="resources/{1}.ico"/>
       </map:match>
-    </map:pipeline>
 
-    <map:pipeline id="external-resource">
+      <map:match pattern="**.css">
+        <map:read type="servletLinkRewriter" src="resources/{1}.css"/>
+      </map:match>
       <map:match pattern="**.js">
-        <map:read type="servletLinkRewriter" src="resources/{1}.js" />
+        <map:read type="servletLinkRewriter" src="resources/{1}.js"/>
       </map:match>
       <map:match pattern="**">
-        <map:read type="servletLinkRewriter" src="{1}" />
+        <map:read type="servletLinkRewriter" src="{1}"/>
       </map:match>
     </map:pipeline>
   </map:pipelines>
 
 </map:sitemap>
-



Mime
View raw message