You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by br...@apache.org on 2010/04/23 13:47:26 UTC

svn commit: r937262 - in /incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH: ChangeLog src/com/ecyrd/jspwiki/Release.java src/webdocs/templates/default/jspwiki.css

Author: brushed
Date: Fri Apr 23 11:47:26 2010
New Revision: 937262

URL: http://svn.apache.org/viewvc?rev=937262&view=rev
Log:
2.8.4-svn-11 - [JSPWIKI-627]: Login and MyPrefs buttons not properly aligned in Chrome and Safari.

Modified:
    incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
    incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
    incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/jspwiki.css

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog?rev=937262&r1=937261&r2=937262&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Fri Apr 23 11:47:26 2010
@@ -1,3 +1,10 @@
+2010-04-23  Dirk Frederickx <br...@apache.org>
+
+        * 2.8.4-svn-11
+        
+        * JSPWIKI-627: Login and MyPrefs buttons not properly aligned
+        in Chrome and Safari.
+
 2010-04-08  Harry Metske <me...@apache.org>
 
         * 2.8.4-svn-10

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=937262&r1=937261&r2=937262&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java Fri Apr 23 11:47:26 2010
@@ -77,7 +77,7 @@ public final class Release
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "10";
+    public static final String     BUILD         = "11";
     
     /**
      *  This is the generic version string you should use

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/jspwiki.css
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/jspwiki.css?rev=937262&r1=937261&r2=937262&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/jspwiki.css (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/jspwiki.css Fri Apr 23 11:47:26 2010
@@ -886,6 +886,7 @@ label[for="edittoc"] {
 .userbox {
 	overflow:hidden;
 	padding:0.5em 0;
+	white-space:nowrap;
 }
 #favorites .userbox a.action, #favorites .userbox .username {
 	float:left;
@@ -1079,7 +1080,6 @@ a.action.logout {
 	line-height:normal;
 	border:1px solid #ddd;
 	background:#f9f9f9;
-	white-space:nowrap;
 }
 a.action.edit, a.action.more {
 	margin-left:4px;
@@ -1632,6 +1632,19 @@ div.collapse li {
 .collapse .collapsebody, .collapsebox .collapse .collapsebody {
 	padding-left:1.5em;
 }
+
+/*
+Make sure to print collapsed items as it they were not collapsed.
+This requires some smart 'specific' css selector rules, in order to
+overwrite the style set by the mootools animation routines.
+*/
+@media print {
+.collapse .collapsebody ul, .collapsebox div.collapsebody  {
+	height:auto !important;
+}
+}
+
+
 /* ie7 hack */
 *:first-child+html .collapse .collapsebody,
 *:first-child+html .collapsebox .collapse .collapsebody {