From 04e313d7084e3704649e81fc89436f79d09a810e Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 14 Jan 2015 10:04:53 +0100 Subject: Doc: Update Copyright information in template/footer This change updates the copyright information as it appears in the footer for both offline and online documentation templates. - Update copyright year to 2015 - Update copyright holder to The Qt Company Ltd Change-Id: I82fef6067dee42ec9db561aef9c3c506beafb3c6 Reviewed-by: Venugopal Shivashankar --- doc/global/html-footer.qdocconf | 6 +++--- doc/global/qt-module-defaults-online.qdocconf | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/doc/global/html-footer.qdocconf b/doc/global/html-footer.qdocconf index 217494575f..e41f6dc5c5 100644 --- a/doc/global/html-footer.qdocconf +++ b/doc/global/html-footer.qdocconf @@ -8,13 +8,13 @@ HTML.footer = \ "\n" \ "
\n" \ "

\n" \ - " © 2015 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ + " © 2015 The Qt Company Ltd.\n" \ + " Documentation contributions included herein are the copyrights of\n" \ " their respective owners.
" \ " The documentation provided herein is licensed under the terms of the" \ " GNU Free Documentation" \ " License version 1.3 as published by the Free Software Foundation.
" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc " \ + " Qt and respective logos are trademarks of The Qt Company Ltd. " \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners.

\n" \ "
\n" \ diff --git a/doc/global/qt-module-defaults-online.qdocconf b/doc/global/qt-module-defaults-online.qdocconf index 6e6854ff82..3085b493fe 100644 --- a/doc/global/qt-module-defaults-online.qdocconf +++ b/doc/global/qt-module-defaults-online.qdocconf @@ -5,13 +5,13 @@ HTML.footer = \ " \n" \ "

\n" \ - " © 2015 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ + " © 2015 The Qt Company Ltd.\n" \ + " Documentation contributions included herein are the copyrights of\n" \ " their respective owners. " \ " The documentation provided herein is licensed under the terms of the" \ " GNU Free Documentation" \ " License version 1.3 as published by the Free Software Foundation. " \ - " Digia, Qt and their respective logos are trademarks of Digia Plc " \ + " Qt and respective logos are trademarks of The Qt Company Ltd. " \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners.

\n" -- cgit v1.2.3 From ba5f93956bfb218a46ad36d7c4f7660f62a38417 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 14 Jan 2015 10:03:51 +0100 Subject: Doc: Update online documentation template - Online CSS tweaks: Max-width, font-sizes, font-weights to improve readability, other minor fixes - Remove duplicate include statement and unnecessary definitions for online template Change-Id: I713bddd0e175235668c4d9790d0df58b4131d19f Reviewed-by: Martin Smith --- doc/global/qt-html-templates-online.qdocconf | 3 ++- .../qt-module-defaults-online-commercial.qdocconf | 2 -- doc/global/template/style/online.css | 30 +++++++++++++++++----- 3 files changed, 26 insertions(+), 9 deletions(-) (limited to 'doc') diff --git a/doc/global/qt-html-templates-online.qdocconf b/doc/global/qt-html-templates-online.qdocconf index 78d0d497c8..69c399d05a 100644 --- a/doc/global/qt-html-templates-online.qdocconf +++ b/doc/global/qt-html-templates-online.qdocconf @@ -1,5 +1,6 @@ #include standard set of HTML header and footer. -include(html-config.qdocconf) +HTML.nonavigationbar = "false" +HTML.tocdepth = 2 include(html-header-online.qdocconf) include(html-footer-online.qdocconf) diff --git a/doc/global/qt-module-defaults-online-commercial.qdocconf b/doc/global/qt-module-defaults-online-commercial.qdocconf index 23b0998ccb..c5bce13609 100644 --- a/doc/global/qt-module-defaults-online-commercial.qdocconf +++ b/doc/global/qt-module-defaults-online-commercial.qdocconf @@ -25,5 +25,3 @@ HTML.nosubdirs = "false" # Set navigation homepage navigation.homepage = "Qt Documentation" - -sourcedirs += includes-online diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css index d558137e2e..97498f16d7 100644 --- a/doc/global/template/style/online.css +++ b/doc/global/template/style/online.css @@ -860,7 +860,7 @@ html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abb body { font-family:“Open Sans”, Arial, Helvetica, sans-serif; line-height:1.5; - font-weight:300 + font-weight:400 } h1,h2,h3,h4,h5,h6 { font-weight:300 @@ -959,7 +959,7 @@ a:hover { color:#46a2da } .main,.navbar-header,#footerbar>div { - max-width:1500px; + max-width:1280px; width:95%; margin:0 auto } @@ -1083,9 +1083,15 @@ dd { margin-bottom:1.56em } .mainContent li { - margin-bottom:0.8em; + margin-top:0.8em; line-height:1.25em } +.mainContent li.level2 { + margin-left:10px; + margin-top:0.4em; + font-size:0.9375em; + line-height:1.15em; +} .mainContent p { line-height:1.56em; margin-bottom:1.5em; @@ -1093,7 +1099,7 @@ dd { max-width:85% } .mainContent b { - font-weight:400 + font-weight:600 } .context ul { margin-bottom:1.5em @@ -1180,9 +1186,15 @@ li a.active { padding:0px; min-height:2em } -.context h4,.context h3,.context h2 { +.context h2 { font-size:2.1875em } +.context h3 { + font-size:1.75em +} +.context h4 { + font-size:1.375em +} .context p img { margin-top:0.75em; max-width:100% @@ -1207,7 +1219,7 @@ table td,table th { table.alignedsummary,table.propsummary { width:initial } -div.main_index .row:first-child { +div.main_index .row { border-bottom:1px solid #eee } div.main_index .row { @@ -1556,6 +1568,11 @@ input.gsc-search-button:hover { cursor: pointer; } +input.gsc-search-button:focus { + outline: none; + box-shadow: none; +} + .gsc-search-box-tools .gsc-clear-button { display: none !important; visibility: none !important; @@ -1570,6 +1587,7 @@ input.gsc-input { border: 1px solid #d6d6d6 !important; border-radius: 5px !important; box-sizing: border-box !important; + -moz-box-sizing: border-box !important; color: #868482 !important; outline: 0 none !important; padding: 9px 10px 10px !important; -- cgit v1.2.3 From e78643dc0a9e276480afa5de98006c4979fb0125 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Thu, 26 Feb 2015 16:42:10 +0100 Subject: Replace old qt-project.org wiki with wiki.qt.io Change-Id: If6c05a5b1f60e97c64f3d6b64041a84c3af82964 Reviewed-by: Oswald Buddenhagen --- doc/README | 2 +- doc/global/externalsites/qt-webpages.qdoc | 12 ++++++------ doc/global/html-footer-online.qdocconf | 4 ++-- doc/global/html-header-online.qdocconf | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'doc') diff --git a/doc/README b/doc/README index 355f61d353..a00256d195 100644 --- a/doc/README +++ b/doc/README @@ -106,4 +106,4 @@ More Information ================ For more information about Qt 5's documentation, refer to the Qt Project wiki: -http://qt-project.org/wiki/Qt5DocumentationProject +http://wiki.qt.io/?title=Qt5DocumentationProject diff --git a/doc/global/externalsites/qt-webpages.qdoc b/doc/global/externalsites/qt-webpages.qdoc index bc8569f7bd..ec704cec62 100644 --- a/doc/global/externalsites/qt-webpages.qdoc +++ b/doc/global/externalsites/qt-webpages.qdoc @@ -58,7 +58,7 @@ */ /*! - \externalpage http://qt-project.org/wiki/Qt_Coding_Style + \externalpage http://wiki.qt.io/?title=Qt_Coding_Style \title Qt Coding Style */ /*! @@ -78,16 +78,16 @@ \title Pimp my video */ /*! - \externalpage http://qt-project.org/wiki/QtMediaHub + \externalpage http://wiki.qt.io/?title=QtMediaHub \title QtMediaHub */ /*! - \externalpage http://qt-project.org/wiki/Qt-RaspberryPi + \externalpage http://wiki.qt.io/?title=Qt_RaspberryPi \title QtonPi */ /*! - \externalpage http://qt-project.org/wiki/jom + \externalpage http://wiki.qt.io/?title=jom \title jom */ @@ -102,11 +102,11 @@ */ /*! - \externalpage http://qt-project.org/wiki/Qt-Localization + \externalpage http://wiki.qt.io/?title=Qt_Localization \title external: Translating Qt Into Other Languages */ /*! - \externalpage http://qt-project.org/wiki/BlackBerry + \externalpage http://wiki.qt.io/?title=BlackBerry \title Qt for BlackBerry */ diff --git a/doc/global/html-footer-online.qdocconf b/doc/global/html-footer-online.qdocconf index 8487ee187c..6b3ea82968 100644 --- a/doc/global/html-footer-online.qdocconf +++ b/doc/global/html-footer-online.qdocconf @@ -36,9 +36,9 @@ HTML.footer += \ "
  • Documentation
    • \n" \ "
  • Examples & Tutorials
    • \n" \ "
  • Tools
    • \n" \ - "
  • Wiki
    • \n" \ + "
  • Wiki
    • \n" \ "
  • Forums
    • \n" \ - "
  • Contribute to Qt
    • \n" \ + "
  • Contribute to Qt
    • \n" \ "\n" \ "\n" \ "
  • Services\n" \ diff --git a/doc/global/html-header-online.qdocconf b/doc/global/html-header-online.qdocconf index b33defccfe..b7fa9e1a65 100644 --- a/doc/global/html-header-online.qdocconf +++ b/doc/global/html-header-online.qdocconf @@ -114,7 +114,7 @@ HTML.postheader = \ "
    \n" \ "
    \n" \ "