Skip to content

Commit f7eccab

Browse files
committed
Merge branch 'release/5.3.2'
* release/5.3.2: (51 commits) move common attributes logic Add TODO comment on mode changes Update annotation comments Restore original DITA-OT indentation to quiet diff Re-run Prettier Update & install dependencies to fix commit hooks Fix broken link IDs Copyedit RTL topic & update navtitle Bump plug-in version to 5.3.2 Fix arrow direction in annotation comments Fix indentation Correct `<codeph>` to `<option>` Update Customization/xsl/topic.xsl Move RTL to layout. Update build_dita2html5-bootstrap.xml Update plugin.xml Update plugin.xml Move direction from main to article Run prettier Document RTL support ...
2 parents ee9ca41 + 7010100 commit f7eccab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+7748
-5293
lines changed

.github/dita-ot/header.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<li class="nav-item">
5454
<a
5555
class="nav-link"
56-
href="https://getbootstrap.com/docs/5.1"
56+
href="https://getbootstrap.com/docs/5.2"
5757
>Bootstrap Docs</a>
5858
</li>
5959
</ul>

.github/dita-ot/theme.css

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,16 @@ footer {
2121
margin: 1rem -0.75rem 0;
2222
border: solid #dee2e6 1px;
2323
}
24+
25+
.custom-popover {
26+
--bs-popover-max-width: 200px;
27+
--bs-popover-border-color: var(--bs-primary);
28+
--bs-popover-header-bg: var(--bs-primary);
29+
--bs-popover-header-color: var(--bs-white);
30+
--bs-popover-body-padding-x: 1rem;
31+
--bs-popover-body-padding-y: 0.5rem;
32+
}
33+
34+
.custom-tooltip {
35+
--bs-tooltip-bg: var(--bs-primary);
36+
}

Customization/xsl/accordion.xsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
exclude-result-prefixes="xs xhtml dita-ot"
1313
>
1414
<!-- Customization to add Bootstrap Accordion Component -->
15-
<!-- https://getbootstrap.com/docs/5.1/components/accordion/ -->
15+
<!-- https://getbootstrap.com/docs/5.2/components/accordion/ -->
1616

1717
<xsl:template match="*[contains(@class,' topic/bodydiv ') and contains(@outputclass, 'accordion')]">
1818
<div>

Customization/xsl/breadcrumb.xsl

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
exclude-result-prefixes="xs dita-ot ditamsg"
1313
>
1414
<!-- Override to add Bootstrap breadcrumb component -->
15-
<!-- https://getbootstrap.com/docs/5.1/components/breadcrumb/ -->
15+
<!-- https://getbootstrap.com/docs/5.2/components/breadcrumb/ -->
1616

1717
<!-- Whether include a bootstrap breadcrumb component on each page. values are 'yes' or 'no' -->
1818
<xsl:param name="BREADCRUMBS" select="'no'"/>
@@ -21,10 +21,9 @@
2121

2222
<!-- Add Bootstrap breadcrumb -->
2323
<xsl:template match="*" mode="gen-user-breadcrumb">
24-
2524
<nav aria-label="breadcrumb">
2625
<xsl:if test="not($BREADCRUMB_DIVIDER = '/')">
27-
<xsl:attribute name="style">
26+
<xsl:attribute name="style">
2827
<xsl:text>--bs-breadcrumb-divider: '</xsl:text>
2928
<xsl:value-of select="$BREADCRUMB_DIVIDER"/>
3029
<xsl:text>';</xsl:text>
@@ -94,6 +93,4 @@
9493
</ol>
9594
</nav>
9695
</xsl:template>
97-
98-
9996
</xsl:stylesheet>

Customization/xsl/card.xsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
1313
>
1414
<!-- Customization to add Bootstrap Card Component -->
15-
<!-- https://getbootstrap.com/docs/5.1/components/card/ -->
15+
<!-- https://getbootstrap.com/docs/5.2/components/card/ -->
1616

1717
<xsl:template match="*[contains(@class,' topic/section ') and contains(@outputclass, 'card')]">
1818
<div>

Customization/xsl/carousel.xsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
exclude-result-prefixes="xs xhtml dita-ot"
1313
>
1414
<!-- Customization to add Bootstrap Carousel Component -->
15-
<!-- https://getbootstrap.com/docs/5.1/components/carousel/ -->
15+
<!-- https://getbootstrap.com/docs/5.2/components/carousel/ -->
1616

1717
<xsl:template
1818
match="*[ (contains(@class,' topic/ul ') or contains(@class, ' topic/ol ')) and contains(@outputclass, 'carousel')]"

Customization/xsl/collapse.xsl

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
exclude-result-prefixes="xs xhtml dita-ot"
1313
>
1414
<!-- Customization to add Bootstrap Collapse Component -->
15-
<!-- https://getbootstrap.com/docs/5.1/components/collapse/ -->
15+
<!-- https://getbootstrap.com/docs/5.2/components/collapse/ -->
1616

1717
<xsl:template match="*[contains(@class,' topic/bodydiv ') and contains(@outputclass, 'collapse-horizontal')]">
18-
<xsl:variable name="id" select="dita-ot:generate-html-id(.)"/>
18+
<xsl:variable name="id" select="if(@id) then dita-ot:generate-html-id(.) else generate-id(.)"/>
1919
<div>
2020
<xsl:if test="contains(@otherprops, 'style(')">
2121
<xsl:attribute name="style">
@@ -65,11 +65,10 @@
6565
</div>
6666
</xsl:template>
6767

68-
6968
<!-- Override to connect an collapsed element to a button -->
7069
<xsl:template match="*[contains(@class,' topic/xref ') and contains(@props, 'collapse-toggle')]">
71-
<xsl:variable name="href" select="replace(@href, '#', '')"/>
72-
<xsl:variable name="id" select="dita-ot:generate-html-id(//*[@id=$href])"/>
70+
<xsl:variable name="href" select="substring-after(@href, '#')"/>
71+
<xsl:variable name="id" select="if(//*[@id=$href]) then dita-ot:generate-html-id(//*[@id=$href]) else generate-id(//*[@id=$href])"/>
7372

7473
<a data-bs-toggle="collapse">
7574
<xsl:call-template name="commonattributes"/>

0 commit comments

Comments
 (0)