This is an automated email from the ASF dual-hosted git repository.
brushed pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new 3a732365a [JSPWIKI-1165] wrap long inline preformatted text
3a732365a is described below
commit 3a732365a034e6b01374ab6fe499c532e5a0df7e
Author: brushed <[email protected]>
AuthorDate: Sat Sep 9 17:09:09 2023 +0200
[JSPWIKI-1165] wrap long inline preformatted text
Fix text wrapping for long inline preformatted texts
---
ChangeLog.md | 7 +++++++
jspwiki-api/src/main/java/org/apache/wiki/api/Release.java | 6 +++---
jspwiki-war/src/main/styles/haddock/default/type.less | 12 ++++++++----
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index 04c6c4553..6f2b102b8 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,13 @@ specific language governing permissions and limitations
under the License.
-->
+**2023-09-09 Dirk Frederickx (brushed AT apache DOT org)**
+
+* _2.12.2-git-01_
+
+* [JSPWIKI-1165](https://issues.apache.org/jira/browse/JSPWIKI-1165) - long
text in monospace font inside {{}} is shown without scroll bar
+ Inline preformatted text will wrap as necessary, and stay within the width
of the line boxes.
+
**2023-07-29 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.12.1-git-02_
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
index 37242c4c8..80004ef50 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
@@ -50,7 +50,7 @@ public final class Release {
* <p>
* If the POSTFIX is empty, it is not added to the version string.
*/
- private static final String POSTFIX = "";
+ private static final String POSTFIX = "-git-";
/** The JSPWiki major version. */
public static final int VERSION = 2;
@@ -59,7 +59,7 @@ public final class Release {
public static final int REVISION = 12;
/** The minor revision. */
- public static final int MINORREVISION = 1;
+ public static final int MINORREVISION = 2;
/** The build number/identifier. This is a String as opposed to an
integer, just so that people can add other identifiers to it.
* The build number is incremented every time a committer checks in code,
and reset when a release is made.
@@ -69,7 +69,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "";
+ public static final String BUILD = "01";
/**
* This is the generic version string you should use when printing out
the version. It is of
diff --git a/jspwiki-war/src/main/styles/haddock/default/type.less
b/jspwiki-war/src/main/styles/haddock/default/type.less
index 508577213..f18e47266 100644
--- a/jspwiki-war/src/main/styles/haddock/default/type.less
+++ b/jspwiki-war/src/main/styles/haddock/default/type.less
@@ -380,13 +380,17 @@ tt {
position: relative;
color: @code-color;
background-color: @code-bg;
- white-space: nowrap;
+ white-space: pre-wrap; /*JSPWIKI-1165*/
border-radius: @border-radius-base;
+ font-family: @font-family-monospace;
+ font-size: 90%;
}
//used for inline {{{code snippets}}}
span.inline-code {
- font-family:monospace;
- white-space:pre;
+ font-family: @font-family-monospace;
+ font-size: 90%;
+ line-height: normal;
+ white-space: pre-wrap; /*JSPWIKI-1165*/
}
//list-unstyled : bootstrap
@@ -669,7 +673,7 @@ div.dropcaps {
font-size: @dropcaps-font-size;
font-weight: @dropcaps-font-weight;
line-height: 80%;
- text-shadow: 2px 2px 1px rgba(0,0,0,.25);
+ text-shadow: 4px 4px 4px rgba(0, 0, 0, 0.2);
}
}
