Updates to spacing and script
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/b6ae8329 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/b6ae8329 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/b6ae8329 Branch: refs/heads/master Commit: b6ae8329c7aa8b11c703b0748e84e9e5b586287a Parents: de1d17f Author: Duncan Godwin <duncan.god...@cloudsoftcorp.com> Authored: Mon Feb 22 13:58:07 2016 +0000 Committer: Duncan Godwin <duncan.god...@cloudsoftcorp.com> Committed: Thu Feb 25 14:52:55 2016 +0000 ---------------------------------------------------------------------- _build/buildPDF.sh | 9 ++++--- style/css/singlePage.css | 60 +++++++++++++++++++++---------------------- zoneMergeManual.html | 32 +++++++++++------------ zoneMergeStarted.html | 31 +++++++++++----------- 4 files changed, 67 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b6ae8329/_build/buildPDF.sh ---------------------------------------------------------------------- diff --git a/_build/buildPDF.sh b/_build/buildPDF.sh index a3d1196..a41ca69 100755 --- a/_build/buildPDF.sh +++ b/_build/buildPDF.sh @@ -7,14 +7,15 @@ if [ ! -x _build/build.sh ] ; then exit 1 fi -if [ "$#" -lt 2 ] ; then +if [ "$#" -ne 2 ] ; then echo "Usage: buildPDF.sh <source html> <target PDF>" exit 1 fi -command -v wkhtmltopdf >/dev/null 2>&1 || { - echo "ERROR: script requires wkhtmltopdf but it's not installed." >&2; exit 1; - } +if ! command -v wkhtmltopdf >/dev/null 2>&1; then + echo "ERROR: script requires wkhtmltopdf but it's not installed." + exit 1 +fi # run the PDF build with wkhtmltopdf wkhtmltopdf --page-size Letter --margin-top 0.75in --margin-right 0.75in --margin-bottom 0.75in --margin-left 0.75in --encoding UTF-8 $1 $2 http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b6ae8329/style/css/singlePage.css ---------------------------------------------------------------------- diff --git a/style/css/singlePage.css b/style/css/singlePage.css index 0517ddb..07d7395 100644 --- a/style/css/singlePage.css +++ b/style/css/singlePage.css @@ -1,56 +1,56 @@ /* Fix the bootstrap parts so they show the content not the controls*/ .nav.nav-tabs{ - display: none; + display: none; } .tab-content > .tab-pane { - display: inline; + display: inline; } .fade { - opacity: 1; + opacity: 1; } #next, *[id$='_next']{ - display: none; + display: none; } .collapse { - display: block; + display: block; } .section-breaker { - page-break-before:always; + page-break-before:always; } .panel-heading{ - padding-bottom: 15px; + padding-bottom: 15px; } /* The styled bootstrap panels */ .panel-body, .panel-default{ - background: none; - border: 0px solid #fff !important; - box-shadow: none; - padding: 0px; + background: none; + border: 0px solid #fff !important; + box-shadow: none; + padding: 0px; } .panel-default > .panel-heading{ - background: none; - border: 0px solid #fff !important; - box-shadow: none; - padding-top: 0px; - padding-right: 0px; - padding-left: 0px; + background: none; + border: 0px solid #fff !important; + box-shadow: none; + padding-top: 0px; + padding-right: 0px; + padding-left: 0px; } pre, pre code{ - overflow: auto; - white-space: pre-wrap; /* CSS 3 */ - white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ - white-space: -pre-wrap; /* Opera 4-6 */ - white-space: -o-pre-wrap; /* Opera 7 */ - word-wrap: break-word; /* Internet Explorer 5.5+ */ + overflow: auto; + white-space: pre-wrap; /* CSS 3 */ + white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ + white-space: -pre-wrap; /* Opera 4-6 */ + white-space: -o-pre-wrap; /* Opera 7 */ + word-wrap: break-word; /* Internet Explorer 5.5+ */ } .goToTop{ - padding-right: 25px; - padding-top: 75px; - float: right; - font-size: 20pt; - font-weight: bold; + padding-right: 25px; + padding-top: 75px; + float: right; + font-size: 20pt; + font-weight: bold; } #content_container h1{ - display: inline-block; - width: 95%; + display: inline-block; + width: 95%; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b6ae8329/zoneMergeManual.html ---------------------------------------------------------------------- diff --git a/zoneMergeManual.html b/zoneMergeManual.html index 89c57f1..d1b8e6e 100644 --- a/zoneMergeManual.html +++ b/zoneMergeManual.html @@ -8,24 +8,24 @@ availablePages: [] --- {% comment %}<!-- This page builds the single page manual for the PDF, note that this name must be retained for conversion order -->{% endcomment %} - <div id="content_container" class="container"> +<div id="content_container" class="container"> <header> <h1 id="content-top">Apache Brooklyn: User Manual</h1> </header> - <h1>Contents</h1> + <h1>Contents</h1> - <nav><ul> - {% assign visited = "" | split: "|" %} - {% for node in site.data.menu %} - {% push site_items node %} - {% include singlepage-item.html %} - {% endfor %} - </ul></nav> - - {% assign visitedb = "" | split: "|" %} + <nav><ul> + {% assign visited = "" | split: "|" %} {% for node in site.data.menu %} - {% push site_items node %} - {% include singlepage-content.html %} - {% endfor %} - - </div> \ No newline at end of file + {% push site_items node %} + {% include singlepage-item.html %} + {% endfor %} + </ul></nav> + + {% assign visitedb = "" | split: "|" %} + {% for node in site.data.menu %} + {% push site_items node %} + {% include singlepage-content.html %} + {% endfor %} + +</div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b6ae8329/zoneMergeStarted.html ---------------------------------------------------------------------- diff --git a/zoneMergeStarted.html b/zoneMergeStarted.html index 3cf4710..e4d703a 100644 --- a/zoneMergeStarted.html +++ b/zoneMergeStarted.html @@ -8,23 +8,24 @@ availablePages: [] --- {% comment %}<!-- This page builds the single page getting started for the PDF, note that this name must be retained for conversion order -->{% endcomment %} - <div id="content_container" class="container"> +<div id="content_container" class="container"> <header> <h1 id="content-top">Apache Brooklyn: Getting Started Guide</h1> </header> - <h1>Contents</h1> + <h1>Contents</h1> - <nav><ul> - {% assign visited = "" | split: "|" %} - {% for node in site.data.menu %} - {% push site_items node %} - {% include singlepage-item.html %} - {% endfor %} - </ul></nav> + <nav><ul> + {% assign visited = "" | split: "|" %} + {% for node in site.data.menu %} + {% push site_items node %} + {% include singlepage-item.html %} + {% endfor %} + </ul></nav> - {% assign visitedb = "" | split: "|" %} - {% for node in site.data.menu %} - {% push site_items node %} - {% include singlepage-content.html %} - {% endfor %} - </div> \ No newline at end of file + {% assign visitedb = "" | split: "|" %} + {% for node in site.data.menu %} + {% push site_items node %} + {% include singlepage-content.html %} + {% endfor %} + +</div> \ No newline at end of file
