[freemarker-docgen] branch master updated: Fixed various code block (pre) issues. This also fixes the problem where the right page layout column was stretched by them on mobile.

[dd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ddekany pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/freemarker-docgen.git


The following commit(s) were added to refs/heads/master by this push:
     new 119af00  Fixed various code block (pre) issues. This also fixes the problem where the right page layout column was stretched by them on mobile.
119af00 is described below

commit 119af002edc0d6d8442aba2a3d788071c8aa1eb5
Author: ddekany <dd...@apache.org>
AuthorDate: Thu Jul 30 08:17:49 2020 +0200

    Fixed various code block (pre) issues. This also fixes the problem where the right page layout column was stretched by them on mobile.
---
 .../org/freemarker/docgen/core/less/lib/base.less        | 16 ++++++----------
 .../docgen/core/less/lib/components/code-block.less      | 13 -------------
 .../freemarker/docgen/core/templates/node-handlers.ftlh  |  9 +++++----
 3 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/freemarker-docgen-core/src/main/resources-gulp/org/freemarker/docgen/core/less/lib/base.less b/freemarker-docgen-core/src/main/resources-gulp/org/freemarker/docgen/core/less/lib/base.less
index 190e686..9173b8f 100644
--- a/freemarker-docgen-core/src/main/resources-gulp/org/freemarker/docgen/core/less/lib/base.less
+++ b/freemarker-docgen-core/src/main/resources-gulp/org/freemarker/docgen/core/less/lib/base.less
@@ -88,19 +88,15 @@ code {
 
 pre {
   display: block;
-  border: 0;
-  padding: 6px 12px;
 
-  margin: 0 0 9px;
+  /* To prevent the pre stretching the width of its parent, and become scrollable instead: */
+  width: 0;
+  min-width: 100%;
   overflow-x: auto;
 
-  word-break: normal;
-  white-space: pre;
-
-  @-moz-document url-prefix() {
-    white-space: pre-wrap;
-    word-break: break-all;
-  }
+  border: 0;
+  padding: 6px 12px;
+  margin: 0 0 9px;
 }
 
 img {
diff --git a/freemarker-docgen-core/src/main/resources-gulp/org/freemarker/docgen/core/less/lib/components/code-block.less b/freemarker-docgen-core/src/main/resources-gulp/org/freemarker/docgen/core/less/lib/components/code-block.less
index 9b48fd3..ebf2fe2 100644
--- a/freemarker-docgen-core/src/main/resources-gulp/org/freemarker/docgen/core/less/lib/components/code-block.less
+++ b/freemarker-docgen-core/src/main/resources-gulp/org/freemarker/docgen/core/less/lib/components/code-block.less
@@ -39,19 +39,6 @@
   padding: 3px 6px 4px;
   margin: 12px 0;
   background-color: #f4f4f4;
-  // background-color: #fbf9e9;
-
-  @media(min-width: @screen-md-min) {
-    display: inline-block;
-    min-width: 600px;
-    margin: 0;
-
-    // reduce min-width for code inside lists
-    ul & {
-      min-width: 300px;
-      display: block;
-    }
-  }
 
   .callout & {
     background-color: transparent !important; 
diff --git a/freemarker-docgen-core/src/main/resources/org/freemarker/docgen/core/templates/node-handlers.ftlh b/freemarker-docgen-core/src/main/resources/org/freemarker/docgen/core/templates/node-handlers.ftlh
index 54b9829..8d7f4f7 100644
--- a/freemarker-docgen-core/src/main/resources/org/freemarker/docgen/core/templates/node-handlers.ftlh
+++ b/freemarker-docgen-core/src/main/resources/org/freemarker/docgen/core/templates/node-handlers.ftlh
@@ -380,10 +380,11 @@
   </#switch>
 
   <@CantBeNestedIntoP>
-    <div class="code-wrapper"><#t>
-    <pre class="code-block ${codeType}"><@Anchor/><#t><#-- XXE and usual FO-stylesheet-compatible interpretation of inital line-breaks -->
-      <#local content><#recurse></#local><#t>
-      ${content?markupString?chopLinebreak?noEsc}</pre></div><#t>
+    <pre class="code-block ${codeType}"><@Anchor/><#t>
+      <#-- XXE and usual FO-stylesheet-compatible interpretation of inital line-breaks -->
+      <#local content><#recurse></#local>
+      ${content?markupString?chopLinebreak?noEsc}<#t>
+    </pre><#t>
   </...@CantBeNestedIntoP>
 </#macro>