summaryrefslogtreecommitdiffstats
path: root/doc/global
diff options
context:
space:
mode:
Diffstat (limited to 'doc/global')
-rw-r--r--doc/global/externalsites/qt-webpages.qdoc12
-rw-r--r--doc/global/html-footer-online.qdocconf4
-rw-r--r--doc/global/html-footer.qdocconf4
-rw-r--r--doc/global/html-header-online.qdocconf2
-rw-r--r--doc/global/qt-html-templates-online.qdocconf3
-rw-r--r--doc/global/qt-module-defaults-online-commercial.qdocconf2
-rw-r--r--doc/global/qt-module-defaults-online.qdocconf2
-rw-r--r--doc/global/template/style/online.css30
8 files changed, 38 insertions, 21 deletions
diff --git a/doc/global/externalsites/qt-webpages.qdoc b/doc/global/externalsites/qt-webpages.qdoc
index 888f1d6fe7..695a4ff7f4 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 += \
" <li id=\"menu-item-1365\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1365\"><a href=\"http://doc.qt.io/\">Documentation</a></li>\n" \
" <li id=\"menu-item-1364\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1364\"><a href=\"http://doc.qt.io/qt-5/qtexamplesandtutorials.html\">Examples &amp; Tutorials</a></li>\n" \
" <li id=\"menu-item-1363\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1363\"><a href=\"http://doc.qt.io/qt-5/topics-app-development.html\">Tools</a></li>\n" \
- " <li id=\"menu-item-1361\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1361\"><a href=\"http://qt-project.org/wiki\">Wiki</a></li>\n" \
+ " <li id=\"menu-item-1361\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1361\"><a href=\"http://wiki.qt.io/\">Wiki</a></li>\n" \
" <li id=\"menu-item-1360\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1360\"><a href=\"http://qt-project.org/forums\">Forums</a></li>\n" \
- " <li id=\"menu-item-1362\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1362\"><a href=\"http://qt-project.org/wiki/Qt-Contribution-Guidelines\">Contribute to Qt</a></li>\n" \
+ " <li id=\"menu-item-1362\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1362\"><a href=\"http://wiki.qt.io/?title=Qt_Contribution_Guidelines\">Contribute to Qt</a></li>\n" \
"</ul>\n" \
"</li>\n" \
"<li id=\"menu-item-1347\" class=\"menu-item menu-item-type-post_type menu-item-object-page current-menu-ancestor current-menu-parent current_page_parent current_page_ancestor menu-item-has-children menu-item-1347\"><a href=\"http://qt.io/services/\">Services</a>\n" \
diff --git a/doc/global/html-footer.qdocconf b/doc/global/html-footer.qdocconf
index 0a35e14ead..e41f6dc5c5 100644
--- a/doc/global/html-footer.qdocconf
+++ b/doc/global/html-footer.qdocconf
@@ -8,13 +8,13 @@ HTML.footer = \
"</div>\n" \
"<div class=\"footer\">\n" \
" <p>\n" \
- " <acronym title=\"Copyright\">&copy;</acronym> 2015 The Qt Company Ltd\n" \
+ " <acronym title=\"Copyright\">&copy;</acronym> 2015 The Qt Company Ltd.\n" \
" 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>" \
- " The Qt Company, Qt and their respective logos are trademarks of The Qt Company Ltd " \
+ " 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. </p>\n" \
"</div>\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 = \
"<div class=\"main-rounded\">\n" \
"<div class=\"navigationbar\">\n" \
" <ul class=\"sub-navigation\">\n" \
- " <li><a href=\"http://qt-project.org/wiki\">Wiki</a></li>\n" \
+ " <li><a href=\"http://wiki.qt.io/\">Wiki</a></li>\n" \
" <li><a href=\"http://doc.qt.io/\" class=\"active\">Documentation</a></li>\n" \
" <li><a href=\"http://qt-project.org/forums\">Forum</a></li>\n" \
" <li><a href=\"https://bugreports.qt.io/\">Bug Reports</a></li>\n" \
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/qt-module-defaults-online.qdocconf b/doc/global/qt-module-defaults-online.qdocconf
index 4cbd736097..3085b493fe 100644
--- a/doc/global/qt-module-defaults-online.qdocconf
+++ b/doc/global/qt-module-defaults-online.qdocconf
@@ -11,7 +11,7 @@ HTML.footer = \
" 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. " \
- " The Qt Company, Qt and their respective logos are trademarks of The Qt Company Ltd " \
+ " 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. </p>\n"
diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css
index 3e722128f8..7fefe811d7 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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 00:43:56 +0000