From afcc26619f642baee9a09151dc8dae5ef2cb9e2e Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 16 Oct 2015 12:12:09 +0200 Subject: qdoc: Conditionally generate the navigation bar items as table cells The new offline template for Qt 5.6, including simplified CSS rules suitable for rendering with a QTextBrowser, requires the navigation bar to be generated as an HTML table instead of the previously-used unordered list. Make QDoc select between the two based on the contents of HTML.postheader .qdocconf variable, which defines the header of the navigation bar. Modify the old offline CSS to look good also when the nav. bar is a table. Task-number: QTBUG-48322 Change-Id: I00e16c24f436e0be049b85d4bcfc916c33ea6b73 Reviewed-by: Venugopal Shivashankar Reviewed-by: Martin Smith --- doc/global/template/style/offline.css | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'doc/global/template') diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css index 16f26f43bb..1936b16bda 100644 --- a/doc/global/template/style/offline.css +++ b/doc/global/template/style/offline.css @@ -266,7 +266,7 @@ footer and license float: left } - .navigationbar li a { + .navigationbar li a, .navigationbar td a { display: block; text-decoration: none; background: url(../images/arrow_bc.png); @@ -275,6 +275,23 @@ footer and license padding-right: 17px; } +table.buildversion { + float: right; + margin-top: -18px !important; +} + +.navigationbar table { + border-radius: 0; + border: 0 none; + background-color: #F2F2F2; + margin: 0; +} + +.navigationbar table td { + padding: 0; + border: 0 none; +} + #buildversion { font-style: italic; font-size: small; -- cgit v1.2.3