svn commit: r1495828 [3/3] - in /incubator/jspwiki/trunk: ./ jspwiki-war/ jspwiki-war/src/main/java/org/apache/wiki/ jspwiki-war/src/main/webapp/scripts/ jspwiki-war/src/main/webapp/templates/default/

[gm...@apache.org]

Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/jspwiki.css
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/jspwiki.css?rev=1495828&r1=1495827&r2=1495828&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/jspwiki.css (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/jspwiki.css Sun Jun 23 15:15:52 2013
@@ -1922,13 +1922,13 @@ a.slimbox:hover {
 }
 
 
-/* Pretty printing styles. Used with prettify.js. */
+/* Pretty printing styles. Used with prettify.js. 
 pre.prettyprint {
 }
 
-.str {color: #489a1b; } /* string 080*/
-.kwd {color: #1b609a; } /*keyword 008*/
-.com {color: #888; } /*800*/
+.str {color: #489a1b; } 
+.kwd {color: #1b609a; }
+.com {color: #888; } 
 .typ {color: #666; }
 .lit {color: #066; }
 .pun {color: #660; }
@@ -1950,8 +1950,43 @@ pre.prettyprint {
   .atn {color: #404; }
   .atv {color: #060; }
 }
+*/
 
+/* Pretty printing styles. Used with prettify.js from 
+   Google Code Prettify (4 March 2013 version). Below CSS
+   adapted from prettify.css in GCP download.
+   CSS for line nums not included, as presently not 
+   supported by JSPWiki.
+*/
+pre.prettyprint {
+}
+
+.pln { color: #000 }  /* plain text */
+.str { color: #080 }  /* string content */
+.kwd { color: #008 }  /* a keyword */
+.com { color: #800 }  /* a comment */
+.typ { color: #606 }  /* a type name */
+.lit { color: #066 }  /* a literal value */
+/* punctuation, lisp open bracket, lisp close bracket */
+.pun, .opn, .clo { color: #660 }
+.tag { color: #008 }  /* a markup tag name */
+.atn { color: #606 }  /* a markup attribute name */
+.atv { color: #080 }  /* a markup attribute value */
+.dec, .var { color: #606 }  /* a declaration; a variable name */
+.fun { color: red }  /* a function name */
 
+/* Use higher contrast and text-weight for printable form. */
+@media print {
+  .str { color: #060 }
+  .kwd { color: #006; font-weight: bold }
+  .com { color: #600; font-style: italic }
+  .typ { color: #404; font-weight: bold }
+  .lit { color: #044 }
+  .pun, .opn, .clo { color: #440 }
+  .tag { color: #006; font-weight: bold }
+  .atn { color: #404 }
+  .atv { color: #060 }
+}
 
 div.coverflow {
 	background-color:#000;

Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1495828&r1=1495827&r2=1495828&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Sun Jun 23 15:15:52 2013
@@ -455,14 +455,15 @@
           <groupId>net.alchim31.maven</groupId>
           <artifactId>yuicompressor-maven-plugin</artifactId>
           <version>1.3.2</version>
-          <configuration>
-            <excludeResources>true</excludeResources>
-            <nosuffix>true</nosuffix>
-            <webappDirectory>${project.build.directory}/generated-sources/yuicompress</webappDirectory>
-          </configuration>
         </plugin>
         
         <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>jslint-maven-plugin</artifactId>
+          <version>1.0.1</version>
+        </plugin>
+
+        <plugin>
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
           <version>0.8</version>