You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2020/08/03 23:03:53 UTC
[freemarker-docgen] 02/04: Made "programlisting" labels part of the
HTML content.
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
commit ca23b89426ea24477f3a037faa61564f1811aca4
Author: ddekany <dd...@apache.org>
AuthorDate: Sun Aug 2 12:00:20 2020 +0200
Made "programlisting" labels part of the HTML content.
---
.../core/less/lib/components/code-block.less | 81 +++++++---------------
.../docgen/core/templates/node-handlers.ftlh | 28 +++++---
2 files changed, 42 insertions(+), 67 deletions(-)
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 ebf2fe2..5a908a1 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
@@ -16,77 +16,44 @@
* specific language governing permissions and limitations
* under the License.
*/
-.code-label() {
- position: absolute;
- top: 0;
- right: 0;
- left: 0;
+
+.code-block {
+ margin: 12px 0;
+
+ &.role-template {
+ .code-block-label { background-color: #e4e4e4; }
+ .code-block-body { background-color: #f4f4f4; }
+ }
+
+ &.role-data-model {
+ .code-block-label { background-color: #D2E2EF; }
+ .code-block-body { background-color: #ecf3f8; }
+ }
+
+ &.role-output {
+ .code-block-label { background-color: #D5EAD7; }
+ .code-block-body { background-color: #ECF8EE; }
+ }
+}
+
+.code-block-label {
padding: 3px 9px;
font-size: 10px;
font-weight: bold;
- font-family: @font-sans-serif;
text-transform: uppercase;
color: rgba(94, 94, 94, 0.8);
}
-.code-block-with-label() {
- padding-top: 23px;
-}
-
-.code-block {
+.code-block-body {
border: 0;
- position:relative;
+ position: relative;
padding: 3px 6px 4px;
- margin: 12px 0;
+ margin: 0;
background-color: #f4f4f4;
.callout & {
background-color: transparent !important;
padding: 0 !important;
margin: 0 !important;
-
- &::after {
- display: none !important;
- }
- }
-
- &.code-template {
- background-color: #f4f4f4;
- .code-block-with-label();
-
- &::after {
- .code-label();
- background-color: #e4e4e4;
- content: "Template";
- }
- }
-
- &.code-data-model {
- background-color: #ecf3f8;
- .code-block-with-label();
-
- &::after {
- .code-label();
- background-color: #D2E2EF;
- content: "Data Model";
- }
- }
-
- &.code-output {
- background-color: #ECF8EE;
- .code-block-with-label();
-
- &::after {
- .code-label();
- background-color: #D5EAD7;
- content: "Output";
- }
- }
-
- /*
- &.code-unspecified {
- // Same as default for now
}
- */
-
}
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 8d7f4f7..c3e9827 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
@@ -359,16 +359,20 @@
<#switch role>
<#case "output">
- <#local codeType = "code-output">
+ <#local roleCssClass = "role-output">
+ <#local roleLabel = "Output">
<#break>
<#case "dataModel">
- <#local codeType = "code-data-model">
+ <#local roleCssClass = "role-data-model">
+ <#local roleLabel = "Data Model">
<#break>
<#case "template">
- <#local codeType = "code-template">
+ <#local roleCssClass = "role-template">
+ <#local roleLabel = "Template">
<#break>
<#case "unspecified">
- <#local codeType = "code-unspecified">
+ <#local roleCssClass = "role-unspecified">
+ <#local roleLabel = "">
<#break>
<#case "metaTemplate">
<pre class="metaTemplate"><#t>
@@ -376,15 +380,19 @@
</pre><#lt>
<#return>
<#default>
- <#local codeType = "code-default">
+ <#local roleCssClass = "role-default">
+ <#local roleLabel = "">
</#switch>
<@CantBeNestedIntoP>
- <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>
+ <div class="code-block ${roleCssClass}">
+ <#if roleLabel != ''><div class="code-block-label">${roleLabel}</div></#if><#t>
+ <pre class="code-block-body"><@Anchor/><#t>
+ <#-- XXE and usual FO-stylesheet-compatible interpretation of inital line-breaks -->
+ <#local content><#recurse></#local>
+ ${content?markupString?chopLinebreak?noEsc}<#t>
+ </pre><#t>
+ </div>
</...@CantBeNestedIntoP>
</#macro>