Zum Inhalt springen

Änderungen von Dokument Confluence bridge for Layout Section

Zuletzt geändert von xwikiadmin am 2025/12/11 07:49
Von Version 6.1
bearbeitet von xwikiadmin
am 2025/12/11 07:49
Änderungskommentar: Install extension [com.xwiki.pro:xwiki-pro-macros-confluence-bridges-ui/1.28.5]
Auf Version 2.1
bearbeitet von xwikiadmin
am 2025/01/07 12:51
Änderungskommentar: Install extension [com.xwiki.pro:xwiki-pro-macros-confluence-bridges-ui/1.25.4]

Zusammenfassung

Details

XWiki.StyleSheetExtension[0]
Code
... ... @@ -2,77 +2,45 @@
2 2   margin-bottom: 20px;
3 3  }
4 4  
5 -.macro-section, .macro-layout-section, .macro-layout-section > .xwiki-metadata-container.cke_widget_editable {
5 +.macro-section, .macro-layout-section {
6 6   display: flex;
7 7   flex-direction: row;
8 - word-break: break-word;
9 9  }
10 -.macro-layout-section > .xwiki-metadata-container.cke_widget_editable {
11 - flex-basis: 100%;
12 -}
13 13  
14 -.macro-layout-section.single .macro-layout-cell, .macro-layout-section.single .cke_widget_wrapper:has(.macro-layout-cell) {
10 +.macro-layout-section.single .macro-layout-cell {
15 15   flex-basis: 100%;
16 16  }
17 -.macro-layout-section.two_equal .macro-layout-cell, .macro-layout-section.two_equal .cke_widget_wrapper:has(.macro-layout-cell) {
13 +.macro-layout-section.two_equal .macro-layout-cell {
18 18   flex-basis: 50%;
19 19  }
20 -.macro-layout-section.three_equal .macro-layout-cell, .macro-layout-section.three_equal .cke_widget_wrapper:has(.macro-layout-cell) {
16 +.macro-layout-section.three_equal .macro-layout-cell {
21 21   flex-basis: 33.33%;
22 22  }
23 -
24 -.macro-layout-section.four_equal .macro-layout-cell, .macro-layout-section.four_equal .cke_widget_wrapper:has(.macro-layout-cell) {
25 - flex-basis: 25%;
26 -}
27 -
28 -.macro-layout-section.five_equal .macro-layout-cell, .macro-layout-section.five_equal .cke_widget_wrapper:has(.macro-layout-cell) {
29 - flex-basis: 20%;
30 -}
31 -
32 32  .macro-layout-section.two_right_sidebar {
33 - .macro-layout-cell, .cke_widget_wrapper:has(.macro-layout-cell) {
20 + .macro-layout-cell {
34 34   flex-basis: 33.33%;
35 35   }
36 - .macro-layout-cell:first-child, .cke_widget_wrapper:has(.macro-layout-cell):first-child {
23 + .macro-layout-cell:first-child {
37 37   flex-basis: 66.66%;
38 38   }
39 39  }
40 40  .macro-layout-section.two_left_sidebar {
41 - .macro-layout-cell, .cke_widget_wrapper:has(.macro-layout-cell) {
28 + .macro-layout-cell {
42 42   flex-basis: 66.66%;
43 43   }
44 - .macro-layout-cell:first-child, .cke_widget_wrapper:has(.macro-layout-cell):first-child {
31 + .macro-layout-cell:first-child {
45 45   flex-basis: 33.33%;
46 46   }
47 47  }
48 -
49 49  .macro-layout-section.three_with_sidebars {
50 - .macro-layout-cell, .cke_widget_wrapper:has(.macro-layout-cell) {
36 + .macro-layout-cell {
51 51   flex-basis: 25%;
52 52   }
53 - .macro-layout-cell:nth-child(2), .cke_widget_wrapper:has(.macro-layout-cell):nth-child(2) {
39 + .macro-layout-cell:nth-child(2) {
54 54   flex-basis: 50%;
55 55   }
56 56  }
57 57  
58 -.macro-layout-section.three_right_sidebars {
59 - .macro-layout-cell, .cke_widget_wrapper:has(.macro-layout-cell) {
60 - flex-basis: 25%;
61 - }
62 - .macro-layout-cell:nth-child(3), .cke_widget_wrapper:has(.macro-layout-cell):nth-child(3) {
63 - flex-basis: 50%;
64 - }
65 -}
66 -
67 -.macro-layout-section.three_left_sidebars {
68 - .macro-layout-cell, .cke_widget_wrapper:has(.macro-layout-cell) {
69 - flex-basis: 25%;
70 - }
71 - .macro-layout-cell:nth-child(1), .cke_widget_wrapper:has(.macro-layout-cell):nth-child(1) {
72 - flex-basis: 50%;
73 - }
74 -}
75 -
76 76  .macro-layout-section {
77 77   gap: 32px;
78 78   h1, h2, h3, h4, h5, h6 {
... ... @@ -80,10 +80,3 @@
80 80   }
81 81  }
82 82  
83 -.macro-layout-section {
84 - gap: 32px;
85 - h1, h2, h3, h4, h5, h6 {
86 - margin: 0;
87 - }
88 -}
89 -
XWiki.WikiMacroClass[0]
Makro-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 = $services.rendering.escape("$!xcontext.macro.params.get('ac:type')", 'xwiki/2.1'))
4 + #set ($cssLayoutClass = $xcontext.macro.params.get('ac:type'))
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')))