Skip to content

Commit

Permalink
Merge branch 'release/3.4'
Browse files Browse the repository at this point in the history
* release/3.4:
  Update screenshot for 3.4 release
  Update header link to latest Bootstrap (4.4.1) CSS
  Update Bootstrap docs references to latest: 4.4
  Update toolkit version references for 3.4 release
  Fix typo
  • Loading branch information
infotexture committed Jan 31, 2020
2 parents 797c743 + 8451e2e commit f38a7fb
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ A plug-in for [DITA Open Toolkit][1] that extends the default HTML5 output with

Use the `dita` command to add this plug-in to your DITA Open Toolkit installation:

DITA-OT 3.3:
DITA-OT 3.3 and newer:

dita --install net.infotexture.dita-bootstrap

Expand Down Expand Up @@ -64,7 +64,7 @@ For more extensive customizations, you may want to [fork][5] this repository and
- If you know how to fix it yourself, [submit a pull request][8] with the proposed changes.

[1]: http://www.dita-ot.org
[2]: https://getbootstrap.com/docs/3.3
[2]: https://getbootstrap.com/docs/4.4
[3]: https://github.com/infotexture/dita-bootstrap/blob/master/includes/bs-navbar-inverse.hdr.xml
[4]: https://github.com/infotexture/dita-bootstrap/blob/master/css/custom.css
[5]: https://help.github.com/articles/fork-a-repo/
Expand Down
2 changes: 1 addition & 1 deletion css/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ nav[role=toc] li.active > a {
font-weight: bold;
}

/* Adjust navigation indendation */
/* Adjust navigation indentation */
.bs-docs-sidenav,
.bs-docs-sidenav li ul {
padding-left: 20px;
Expand Down
Binary file modified images/dita-bootstrap-default-screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion includes/bootstrap.hdf.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous"/>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous"/>
</div>
2 changes: 1 addition & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<!-- See the accompanying LICENSE file for applicable license -->

<plugin id="net.infotexture.dita-bootstrap">
<feature extension="package.version" value="3.3"/>
<feature extension="package.version" value="3.4"/>
<require plugin="org.dita.html5"/>
<transtype name="html5-bootstrap" extends="html5" desc="HTML5 with Bootstrap style"/>
<feature extension="ant.import" file="build_dita2html5-bootstrap.xml"/>
Expand Down
6 changes: 3 additions & 3 deletions xsl/html5-bootstrap.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
</head>
</xsl:template>

<!-- Override to add Bootstrap fluid container & row to page body -->
<!-- https://getbootstrap.com/docs/3.3/css/#grid-example-fluid -->
<!-- Override to add Bootstrap container & row to page -->
<!-- https://getbootstrap.com/docs/4.4/layout/grid/ -->
<xsl:template match="*" mode="chapterBody">
<body>
<xsl:apply-templates select="." mode="addAttributesToHtmlBodyElement"/>
Expand All @@ -57,7 +57,7 @@
</xsl:template>

<!-- Override to add Bootstrap large grid classes. -->
<!-- https://getbootstrap.com/docs/4.3/layout/grid -->
<!-- https://getbootstrap.com/docs/4.4/layout/grid -->
<xsl:attribute-set name="main">
<xsl:attribute name="class">col-lg-9</xsl:attribute>
<xsl:attribute name="role">main</xsl:attribute>
Expand Down

0 comments on commit f38a7fb

Please sign in to comment.