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 2015/06/30 06:54:35 UTC
svn commit: r1688357 - in /jspwiki/trunk: ./
jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/scripts/wiki-edit/
jspwiki-war/src/main/styles/haddock/default/
jspwiki-war/src/main/styles/haddock/fontjspwiki/
Author: brushed
Date: Tue Jun 30 04:54:35 2015
New Revision: 1688357
URL: http://svn.apache.org/r1688357
Log:
2.10.2-svn-21
* [JSPWIKI-892] Haddock editor when launched is always at bottom of window in Firefox
* Fixing latest update of Icon Styles
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.Sections.js
jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less
jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/font-jspwiki.less
jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/icons.less
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1688357&r1=1688356&r2=1688357&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Tue Jun 30 04:54:35 2015
@@ -1,3 +1,14 @@
+2015-06-30 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.10.2-svn-21
+
+ HADDOCK Template fixes:
+
+ * JSPWIKI-892 Haddock editor when launched is always at bottom of window in Firefox
+
+ * Fixing latest update of Icon Styles
+
+
2015-06-28 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.2-svn-20
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1688357&r1=1688356&r2=1688357&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Tue Jun 30 04:54:35 2015
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "20";
+ public static final String BUILD = "21";
/**
* This is the generic version string you should use when printing out the version. It is of
Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.Sections.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.Sections.js?rev=1688357&r1=1688356&r2=1688357&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.Sections.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Snipe.Sections.js Tue Jun 30 04:54:35 2015
@@ -225,7 +225,7 @@ Snipe.Sections = new Class({
}
- work.value = ""; //FIXME google chrome 43.0.2357.65 bug -- if omitted, the textarea is displayed EMPTY!! ??
+ //work.value = ""; //FIXME google chrome 43.0.2357.65 bug -- if omitted, the textarea is displayed EMPTY!! ??
work.value = main.slice(begin, end);
self.begin = begin;
self.end = end;
Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less?rev=1688357&r1=1688356&r2=1688357&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less Tue Jun 30 04:54:35 2015
@@ -151,11 +151,12 @@ a.logo {
position: relative;
display:block;
font-family: @wiki-logo-font-family;
- font-size:75%; //@font-size-base* .75
+ //font-size:75%; //@font-size-base* .75
font-weight: 200;
letter-spacing: 3px;
text-decoration: none;
- padding:1px 1px @font-size-base 3px;
+ //padding:1px 1px @font-size-base 3px;
+ padding:1px 1px 20px 3px;
//border:1px solid @white;
//border-radius:.5em;
color:inherit;
Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/font-jspwiki.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/font-jspwiki.less?rev=1688357&r1=1688356&r2=1688357&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/font-jspwiki.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/font-jspwiki.less Tue Jun 30 04:54:35 2015
@@ -5,8 +5,8 @@
//@import "../fontawesome/variables";
//@import "../fontawesome/mixins";
-@import "path.less";
-@import "core.less";
+@import "./path.less";
+@import "./core.less";
//@import "../fontawesome/larger";
//@import "../fontawesome/fixed-width";
//@import "../fontawesome/list";
@@ -14,4 +14,4 @@
//@import "../fontawesome/spinning";
//@import "../fontawesome/rotated-flipped";
//@import "../fontawesome/stacked";
-@import "icons.less";
+@import "./icons.less";
Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/icons.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/icons.less?rev=1688357&r1=1688356&r2=1688357&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/icons.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/fontjspwiki/icons.less Tue Jun 30 04:54:35 2015
@@ -45,7 +45,7 @@
content: "\a0";
}
.icon-search:before {
- content: "\e601";
+ content: "\f002";
}
.icon-user:before {
content: "\e602";
@@ -65,15 +65,6 @@
.icon-picture:before {
content: "\e607";
}
-.icon-font:before {
- content: "\e608";
-}
-.icon-bold:before {
- content: "\e609";
-}
-.icon-italic:before {
- content: "\e60a";
-}
.icon-tint:before {
content: "\e60b";
}
@@ -83,12 +74,13 @@
.icon-external-link:before {
content: "\e60d";
}
-.icon-sign-out:before {
+.icon-signout:before {
content: "\e60e";
}
-.icon-sign-in:before {
+.icon-signin:before {
content: "\e60f";
}
+
.icon-rss:before {
content: "\e610";
}
@@ -101,7 +93,7 @@
.icon-link:before {
content: "\e613";
}
-.icon-paperclip:before {
+.icon-paper-clip:before {
content: "\e614";
}
.icon-undo:before {
@@ -110,10 +102,73 @@
.icon-euro:before {
content: "\e616";
}
-.icon-slimbox:before {
+.icon-slimbox:before,
+.icon-expand:before {
content: "\e617";
}
.icon-columns:before {
content: "\e600";
}
-
+.icon-leanpub:before {
+ content: "\f212";
+}
+.icon-unlock-alt:before {
+ content: "\f13e";
+}
+.icon-file-o:before {
+ content: "\f016";
+}
+.icon-file-text-o:before {
+ content: "\f0f6";
+}
+.icon-file-pdf-o:before {
+ content: "\f1c1";
+}
+.icon-file-word-o:before {
+ content: "\f1c2";
+}
+.icon-file-excel-o:before {
+ content: "\f1c3";
+}
+.icon-file-powerpoint-o:before {
+ content: "\f1c4";
+}
+.icon-file-archive-o:before {
+ content: "\f1c6";
+}
+.icon-file-zip-o:before {
+ content: "\f1c6";
+}
+.icon-file-image-o:before {
+ content: "\f1c5";
+}
+.icon-file-photo-o:before {
+ content: "\f1c5";
+}
+.icon-file-picture-o:before {
+ content: "\f1c5";
+}
+.icon-file-audio-o:before {
+ content: "\f1c7";
+}
+.icon-file-sound-o:before {
+ content: "\f1c7";
+}
+.icon-file-movie-o:before {
+ content: "\f1c8";
+}
+.icon-file-video-o:before {
+ content: "\f1c8";
+}
+.icon-pencil:before {
+ content: "\f040";
+}
+.icon-group:before {
+ content: "\f0c0";
+}
+.icon-users:before {
+ content: "\f0c0";
+}
+.icon-ellipsis-v:before {
+ content: "\f142";
+}