diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> | 2015-11-05 08:27:56 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-11-05 08:27:56 +0000 |
| commit | d8f41bdc2efa36dd9e2f80e23d7cb4874c019452 (patch) | |
| tree | 254f8c661318ac73ddc128eb06498a8ab4d7babe /doc | |
| parent | f7f55c0b294f03932b205f8eae4335928647f57b (diff) | |
| parent | 4159ee840549df11287294f0928e90f35f3e06ff (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/global/qt-html-templates-offline-simple.qdocconf | 3 | ||||
| -rw-r--r-- | doc/global/template/style/offline-simple.css | 8 | ||||
| -rw-r--r-- | doc/global/template/style/offline.css | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/doc/global/qt-html-templates-offline-simple.qdocconf b/doc/global/qt-html-templates-offline-simple.qdocconf index cd924c64e3..4a65cc3c57 100644 --- a/doc/global/qt-html-templates-offline-simple.qdocconf +++ b/doc/global/qt-html-templates-offline-simple.qdocconf @@ -25,6 +25,9 @@ HTML.postpostheader = \ "<div class=\"line\">\n" \ "<div class=\"content mainContent\">\n" +HTML.navigationseparator = \ + "<span class=\"naviSeparator\"> ◦ </span>\n" + # Add some padding around code snippets, as we cannot # currectly style them for QTextBrowser using only CSS. codeindent = 2 diff --git a/doc/global/template/style/offline-simple.css b/doc/global/template/style/offline-simple.css index 3e1c527761..b11cb6a137 100644 --- a/doc/global/template/style/offline-simple.css +++ b/doc/global/template/style/offline-simple.css @@ -136,12 +136,12 @@ code { p.naviNextPrevious { text-align: right; - margin-right: 40px; + margin-right: 20px; } -q.prevPage, a.nextPage { - margin-left: 30px; - } +span.naviSeparator { + white-space: pre; +} .toc h3 { margin: 0px 0px 10px 6px; diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css index 1936b16bda..123d753290 100644 --- a/doc/global/template/style/offline.css +++ b/doc/global/template/style/offline.css @@ -192,6 +192,7 @@ Top navigation margin-left: 30px; } +.naviSeparator { display: none } /* ----------- footer and license |