diff options
author | Jerome Pasion <jerome.pasion@digia.com> | 2013-10-29 13:23:59 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-01 12:56:46 +0100 |
commit | 616b431a21595e9e8e968dca05e4df177f32e363 (patch) | |
tree | ecda56e040b66913d1d1c7f600ca09bebdf76a7d /doc | |
parent | b7440536c788b04861591187edd071bf2c2ec137 (diff) |
Doc: Fixed footer style and information for offline builds.
-footer is left aligned and smaller text.
-footer contains fewer <div> which were not used.
-CSS rules for footer changed to accommodate new specifications.
-information not relevant in offline builds taken out.
Task-number: QTBUG-33802
Change-Id: Icc57bad9ead8ce812d5df8e72a7bac8c22831b5f
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/global/html-footer.qdocconf | 30 | ||||
-rw-r--r-- | doc/global/template/style/offline.css | 50 |
2 files changed, 33 insertions, 47 deletions
diff --git a/doc/global/html-footer.qdocconf b/doc/global/html-footer.qdocconf index 6c26dc7c29..c53eb2f599 100644 --- a/doc/global/html-footer.qdocconf +++ b/doc/global/html-footer.qdocconf @@ -7,24 +7,14 @@ HTML.footer = \ " </div>\n" \ "</div>\n" \ "<div class=\"footer\">\n" \ - " <div class=\"qt13a-copyright\" id=\"copyright\">\n" \ - " <div class=\"qt13a-container\">\n" \ - " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2013 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ - " their respective owners.</p>\n" \ - " <p>\n" \ - " The documentation provided herein is licensed under the terms of the\n" \ - " <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation\n" \ - " License version 1.3</a> as published by the Free Software Foundation.</p>\n" \ - " <p>\n" \ - " Documentation sources may be obtained from <a href=\"http://www.qt-project.org\">\n" \ - " www.qt-project.org</a>.</p>\n" \ - " <p>\n" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ - " in Finland and/or other countries worldwide. All other trademarks are property\n" \ - " of their respective owners. <a title=\"Privacy Policy\"\n" \ - " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \ - " </div>\n" \ - " </div>\n" \ + " <p>\n" \ + " <acronym title=\"Copyright\">©</acronym> 2013 Digia Plc and/or its\n" \ + " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ + " their respective owners.<br>" \ + " The documentation provided herein is licensed under the terms of the" \ + " <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation" \ + " License version 1.3</a> as published by the Free Software Foundation.<br>" \ + " Digia, Qt and their respective logos are trademarks of Digia Plc " \ + " in Finland and/or other countries worldwide. All other trademarks are property\n" \ + " of their respective owners. </p>\n" \ "</div>\n" \ diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css index 5dc4908aff..81e11aac0b 100644 --- a/doc/global/template/style/offline.css +++ b/doc/global/template/style/offline.css @@ -192,7 +192,29 @@ footer and license */ .footer { - text-align: center + text-align: left; + margin-top: 50px; + padding-left: 5px; + margin-bottom: 10px; + font-size: 10px; + border-top: 1px solid #999; + padding-top: 11px; +} + +.footer p { + line-height: 14px; + font-size: 11px; +} + +.footer a[href*="http://"], a[href*="ftp://"], a[href*="https://"] { + font-weight: bold; +} + +.footerNavi { + width: auto; + text-align: right; + margin-top: 50px; + z-index: 1; } .navigationbar { @@ -244,16 +266,6 @@ footer and license padding-right: 17px; } -/* ------------ -footer and license ------------ -*/ - -.footer { - text-align: center -} - #buildversion { font-style: italic; font-size: small; @@ -492,22 +504,6 @@ ol { padding: 20px 20px 20px 20px; } -.footer { - margin-top: 50px; - padding-left: 5px; - margin-bottom: 10px; - font-size: 10px; - border-top: 1px solid #999; - padding-top: 11px; -} - -.footerNavi { - width: auto; - text-align: right; - margin-top: 50px; - z-index: 1; -} - .memItemLeft { padding-right: 3px } |