summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/global/manifest-meta.qdocconf3
-rw-r--r--doc/global/qt-html-templates-offline-simple.qdocconf32
-rw-r--r--doc/global/qt-html-templates-offline.qdocconf5
-rw-r--r--doc/global/qt-module-defaults-offline.qdocconf1
-rw-r--r--doc/global/template/style/offline-simple.css176
-rw-r--r--doc/global/template/style/offline.css19
6 files changed, 234 insertions, 2 deletions
diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf
index e7f0464efd..b5eaf96a3f 100644
--- a/doc/global/manifest-meta.qdocconf
+++ b/doc/global/manifest-meta.qdocconf
@@ -51,7 +51,8 @@ manifestmeta.highlighted.names = "QtQuick/Qt Quick Demo - Same Game" \
"QtQuickDialogs/Qt Quick System Dialog Examples" \
"QtWinExtras/Quick Player" \
"QtMultimedia/QML Video Shader Effects Example" \
- "QtCanvas3D/Planets Example"
+ "QtCanvas3D/Planets Example" \
+ "QtLocation/Map Viewer (QML)"
manifestmeta.highlighted.attributes = isHighlighted:true
diff --git a/doc/global/qt-html-templates-offline-simple.qdocconf b/doc/global/qt-html-templates-offline-simple.qdocconf
new file mode 100644
index 0000000000..cd924c64e3
--- /dev/null
+++ b/doc/global/qt-html-templates-offline-simple.qdocconf
@@ -0,0 +1,32 @@
+# Specify a custom CSS file used by this template
+HTML.stylesheets += template/style/offline-simple.css
+qhp.extraFiles += style/offline-simple.css
+
+# Override the header styles
+HTML.headerstyles = \
+ " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline-simple.css\" />\n" \
+ " <script type=\"text/javascript\">\n" \
+ " window.onload = function(){document.getElementsByTagName(\"link\").item(0).setAttribute(\"href\", \"style/offline.css\");};\n" \
+ " </script>\n"
+
+HTML.postheader = \
+ "<body>\n" \
+ "<div class=\"header\" id=\"qtdocheader\">\n"\
+ " <div class=\"main\">\n" \
+ " <div class=\"main-rounded\">\n" \
+ " <div class=\"navigationbar\">\n" \
+ " <table><tr>\n"
+
+HTML.postpostheader = \
+ " </tr></table>\n"\
+ " </div>\n" \
+ " </div>\n" \
+ "<div class=\"content\">\n" \
+ "<div class=\"line\">\n" \
+ "<div class=\"content mainContent\">\n"
+
+# Add some padding around code snippets, as we cannot
+# currectly style them for QTextBrowser using only CSS.
+codeindent = 2
+codeprefix = "\n\n"
+codesuffix = "\n\n"
diff --git a/doc/global/qt-html-templates-offline.qdocconf b/doc/global/qt-html-templates-offline.qdocconf
index cd8315aa9a..d5780a35da 100644
--- a/doc/global/qt-html-templates-offline.qdocconf
+++ b/doc/global/qt-html-templates-offline.qdocconf
@@ -26,3 +26,8 @@ qhp.extraFiles += style/offline.css \
images/bullet_dn.png \
images/bullet_sq.png \
images/bgrContent.png
+
+# By default, include override definitions for a simplified template/CSS,
+# suited for rendering HTML with QTextBrowser. Comment out this line to
+# select the standard CSS.
+include(qt-html-templates-offline-simple.qdocconf)
diff --git a/doc/global/qt-module-defaults-offline.qdocconf b/doc/global/qt-module-defaults-offline.qdocconf
index af7afdd96f..ee9557fe5c 100644
--- a/doc/global/qt-module-defaults-offline.qdocconf
+++ b/doc/global/qt-module-defaults-offline.qdocconf
@@ -7,6 +7,7 @@ include(qt-cpp-defines.qdocconf)
include(compat.qdocconf)
include(manifest-meta.qdocconf)
include(fileextensions.qdocconf)
+
include(qt-html-templates-offline.qdocconf)
#extra configuration data such as file extensions
diff --git a/doc/global/template/style/offline-simple.css b/doc/global/template/style/offline-simple.css
new file mode 100644
index 0000000000..3e1c527761
--- /dev/null
+++ b/doc/global/template/style/offline-simple.css
@@ -0,0 +1,176 @@
+body {
+ font-size: 14px;
+}
+
+pre {
+ background-color: #f0f0f0;
+ font-family: Courier, monospace;
+ font-size: 15px;
+ font-weight: 600;
+ vertical-align: top;
+ margin: 15px 85px 15px 35px;
+ padding: 25px;
+ width: 90%;
+ overflow-x:auto;
+}
+
+pre a[href] {
+ color: #5caa15;
+}
+
+p {
+ width: 70%;
+ margin: 15px 0px 10px 15px;
+}
+
+table p {
+ margin: 0px;
+ padding: 0px;
+}
+
+a[href] {
+ color: #007330;
+ text-decoration: none;
+}
+
+/* Different color for ext. links */
+a[href|="http://"], a[href|="https://"] {
+ color: #6bb8db;
+}
+
+h1.title {
+ margin-top: 30px;
+ margin-left: 6px;
+ font-size: 32px;
+ padding: 6px;
+}
+
+h2, p.h2 {
+ background-color: #F2F3F4;
+ padding: 4px;
+ margin: 30px 0px 20px 10px;
+}
+
+h3 {
+ font-size: 16px;
+ margin: 30px 0px 30px 6px;
+}
+
+ul, ol {
+ margin-top: 4px;
+ margin-bottom: 0px;
+}
+
+ul li, ol li {
+ margin-bottom: 8px;
+}
+
+.mainContent li.level2 {
+ margin-left: 16px;
+}
+
+.rightAlign {
+ text-align: right;
+}
+
+h3.fn, span.fn {
+ border-width: 3px;
+ border-style: solid;
+ border-color: #aaaaaa;
+ background-color: #eeeeee;
+ word-spacing: 3px;
+ padding: 5px;
+ text-decoration: none;
+ font-weight: 400;
+ font-size: 16px;
+ margin: 45px 0px 0px 6px;
+}
+
+table {
+ max-width: 80%;
+ padding: 15px 45px 15px 15px;
+}
+
+table th {
+ text-align: left;
+ padding: 8px;
+}
+
+table td {
+ padding: 6px 10px 6px 10px;
+}
+
+table tr.odd {
+ background-color: #eeeeee;
+}
+
+table.qmlname td {
+ padding: 0px;
+ margin-left: 6px;
+ font-size: 16px;
+}
+
+table.qmlname p .name,
+h3.fn .name, h3.fn .type {
+ font-weight: bold;
+}
+
+.context h3.fn {
+ font-weight: 400;
+}
+
+.qmlreadonly, .qmldefault {
+ font-family: Courier, monospace;
+ margin-right: 6px;
+}
+
+tr > td > pre {
+ font-size: 14px;
+}
+
+code {
+ font-family: Courier, monospace;
+ font-size: 16px;
+ font-weight: 400;
+}
+
+p.naviNextPrevious {
+ text-align: right;
+ margin-right: 40px;
+}
+
+q.prevPage, a.nextPage {
+ margin-left: 30px;
+ }
+
+.toc h3 {
+ margin: 0px 0px 10px 6px;
+}
+
+.toc ul {
+ list-style-type: none;
+}
+
+.navigationbar table {
+ padding: 0;
+ margin: 0;
+}
+
+.navigationbar table tr {
+ background-color: #eeeeee;
+}
+
+td#buildversion {
+ background-color: #ffffff;
+}
+
+.footer, .footer p {
+ padding: 5px 0px 5px 0px;
+ margin: 45px 15px 5px 15px;
+ font-size: 10px;
+ background-color: #cccccc;
+}
+
+.footer p {
+ margin: 0px;
+}
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;