You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2013/02/01 15:18:49 UTC

svn commit: r1441455 - in /servicemix/website/trunk: pom.xml src/main/webapp/css/style.css

Author: gertv
Date: Fri Feb  1 14:18:48 2013
New Revision: 1441455

URL: http://svn.apache.org/viewvc?rev=1441455&view=rev
Log:
Upgrade to Scalate 1.6.1 and Scala 2.10.0

Modified:
    servicemix/website/trunk/pom.xml
    servicemix/website/trunk/src/main/webapp/css/style.css

Modified: servicemix/website/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/website/trunk/pom.xml?rev=1441455&r1=1441454&r2=1441455&view=diff
==============================================================================
--- servicemix/website/trunk/pom.xml (original)
+++ servicemix/website/trunk/pom.xml Fri Feb  1 14:18:48 2013
@@ -39,12 +39,17 @@
         <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
         <jetty-port>8080</jetty-port>
         <jetty-war-dir>${project.build.directory}/webapp/</jetty-war-dir>
-        <scalate.version>1.5.3</scalate.version>
-        <wikitext.version>1.3</wikitext.version>
+
+
         <scalate.editor>${env.SCALATE_EDITOR}</scalate.editor>
         <scalate.mode>production</scalate.mode>
         <scalate.workdir>${project.build.directory}/scalateWorkDir</scalate.workdir>
-        <scala.version>2.9.1</scala.version>
+
+        <logback.version>1.0.9</logback.version>
+        <scala.version>2.10.0</scala.version>
+        <scalate.version>1.6.1</scalate.version>
+        <slf4j.version>1.6.1</slf4j.version>
+        <wikitext.version>1.4</wikitext.version>
 
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
@@ -66,7 +71,7 @@
     <dependencies>
         <dependency>
             <groupId>org.fusesource.scalate</groupId>
-            <artifactId>scalate-wikitext</artifactId>
+            <artifactId>scalate-wikitext_2.10</artifactId>
             <version>${scalate.version}</version>
         </dependency>
         <dependency>
@@ -81,18 +86,18 @@
         </dependency>
         <dependency>
             <groupId>org.fusesource.scalate</groupId>
-            <artifactId>scalate-page</artifactId>
+            <artifactId>scalate-page_2.10</artifactId>
             <version>${scalate.version}</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>0.9.24</version>
+            <version>${logback.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.6.0</version>
+            <version>${slf4j.version}</version>
         </dependency>
 		<dependency>
 			<groupId>org.scala-lang</groupId>
@@ -151,7 +156,7 @@
             </plugin>
             <plugin>
                 <groupId>org.fusesource.scalate</groupId>
-                <artifactId>maven-scalate-plugin</artifactId>
+                <artifactId>maven-scalate-plugin_2.10</artifactId>
                 <version>${scalate.version}</version>
                 <executions>
                     <execution>

Modified: servicemix/website/trunk/src/main/webapp/css/style.css
URL: http://svn.apache.org/viewvc/servicemix/website/trunk/src/main/webapp/css/style.css?rev=1441455&r1=1441454&r2=1441455&view=diff
==============================================================================
--- servicemix/website/trunk/src/main/webapp/css/style.css (original)
+++ servicemix/website/trunk/src/main/webapp/css/style.css Fri Feb  1 14:18:48 2013
@@ -197,6 +197,11 @@ td.align {
 	padding-bottom: 10px;
 }
 
+.wiki-content ul p {
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
 /*
 ** when this stylesheet is used for the Tiny MCE Wysiwyg editor's edit area, we can't
 ** use an id=PageContent or class=wiki-content, so we must
@@ -225,6 +230,11 @@ ul, ol {
     padding-bottom: 0px;
 }
 
+ul p {
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
 pre {
     padding: 0px;
     margin-top: 5px;