Skip to Content
Last modified by Frank Fock on 2025/04/04 21:18
From version 1.1
edited by Frank Fock
on 2025/01/26 23:11
Change comment: Install extension [com.xwiki.pro:xwiki-pro-macros-confluence-bridges-ui/1.25.5]
To version 2.1
edited by Frank Fock
on 2025/04/04 21:18
Change comment: Install extension [com.xwiki.pro:xwiki-pro-macros-confluence-bridges-ui/1.26.14]

Summary

Details

XWiki.StyleSheetExtension[0]
Code
... ... @@ -5,6 +5,7 @@
5 5  .macro-section, .macro-layout-section {
6 6   display: flex;
7 7   flex-direction: row;
8 + word-break: break-word;
8 8  }
9 9  
10 10  .macro-layout-section.single .macro-layout-cell {
... ... @@ -40,7 +40,72 @@
40 40   flex-basis: 50%;
41 41   }
42 42  }
44 +.macro-layout-section {
45 + margin-bottom: 20px;
46 +}
43 43  
48 +.macro-layout-section.single .macro-layout-cell {
49 + flex-basis: 100%;
50 +}
51 +.macro-layout-section.two_equal .macro-layout-cell {
52 + flex-basis: 50%;
53 +}
54 +.macro-layout-section.three_equal .macro-layout-cell {
55 + flex-basis: 33.33%;
56 +}
57 +
58 +.macro-layout-section.four_equal .macro-layout-cell {
59 + flex-basis: 25%;
60 +}
61 +
62 +.macro-layout-section.five_equal .macro-layout-cell {
63 + flex-basis: 20%;
64 +}
65 +
66 +.macro-layout-section.two_right_sidebar {
67 + .macro-layout-cell {
68 + flex-basis: 33.33%;
69 + }
70 + .macro-layout-cell:first-child {
71 + flex-basis: 66.66%;
72 + }
73 +}
74 +.macro-layout-section.two_left_sidebar {
75 + .macro-layout-cell {
76 + flex-basis: 66.66%;
77 + }
78 + .macro-layout-cell:first-child {
79 + flex-basis: 33.33%;
80 + }
81 +}
82 +
83 +.macro-layout-section.three_with_sidebars {
84 + .macro-layout-cell {
85 + flex-basis: 25%;
86 + }
87 + .macro-layout-cell:nth-child(2) {
88 + flex-basis: 50%;
89 + }
90 +}
91 +
92 +.macro-layout-section.three_right_sidebars {
93 + .macro-layout-cell {
94 + flex-basis: 25%;
95 + }
96 + .macro-layout-cell:nth-child(3) {
97 + flex-basis: 50%;
98 + }
99 +}
100 +
101 +.macro-layout-section.three_left_sidebars {
102 + .macro-layout-cell {
103 + flex-basis: 25%;
104 + }
105 + .macro-layout-cell:nth-child(1) {
106 + flex-basis: 50%;
107 + }
108 +}
109 +
44 44  .macro-layout-section {
45 45   gap: 32px;
46 46   h1, h2, h3, h4, h5, h6 {
... ... @@ -48,3 +48,10 @@
48 48   }
49 49  }
50 50  
117 +.macro-layout-section {
118 + gap: 32px;
119 + h1, h2, h3, h4, h5, h6 {
120 + margin: 0;
121 + }
122 +}
123 +
XWiki.WikiMacroClass[0]
Macro code
... ... @@ -1,7 +1,7 @@
1 1  {{velocity output="false"}}
2 2  #macro (executeMacro)
3 3   #set ($discard = $xwiki.ssx.use('Confluence.Macros.ConfluenceLayoutSection'))
4 - #set ($cssLayoutClass = $xcontext.macro.params.get('ac:type'))
4 + #set ($cssLayoutClass = $services.rendering.escape("$!xcontext.macro.params.get('ac:type')", 'xwiki/2.1'))
5 5   (% class="macro-layout-section $cssLayoutClass" %)(((
6 6   ## Since 11.5 the content of the macro can be edited in WYSIWYG editor.
7 7   #if ($services.rendering.getMacroDescriptor($services.rendering.resolveMacroId('wikimacrocontent')))