diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-22 07:24:57 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-22 07:28:42 +0100 |
commit | a02863234d76abb6c9f289026ae4ea3145924f30 (patch) | |
tree | aef6381d0000a78ba69ac80eb03739b1c8ca5fc3 /doc/global | |
parent | e77b13621f0057374d83a2b884f03dd2e5b7b88c (diff) | |
parent | e4d79e1fdeb6b26ba0b12b578daacf7cd672b960 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
configure
mkspecs/common/wince/qplatformdefs.h
src/plugins/platforms/directfb/qdirectfbbackingstore.cpp
src/plugins/platforms/xcb/qxcbbackingstore.cpp
Change-Id: Ied4d31264a9afca9514b51a7eb1494c28712793c
Diffstat (limited to 'doc/global')
-rw-r--r-- | doc/global/manifest-meta.qdocconf | 4 | ||||
-rw-r--r-- | doc/global/template/style/offline-simple.css | 18 |
2 files changed, 10 insertions, 12 deletions
diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf index c45470838a..f535f5e290 100644 --- a/doc/global/manifest-meta.qdocconf +++ b/doc/global/manifest-meta.qdocconf @@ -55,9 +55,7 @@ manifestmeta.highlighted.names = "QtQuick/Qt Quick Demo - Same Game" \ "QtMultimedia/QML Video Shader Effects Example" \ "QtCanvas3D/Planets Example" \ "QtCanvas3D/Interactive Mobile Phone Example" \ - "QtLocation/Map Viewer (QML)" \ - "QtWebEngine/WebEngine Quick Nano Browser" \ - "QtWebEngine/Markdown Editor Example" + "QtLocation/Map Viewer (QML)" manifestmeta.highlighted.attributes = isHighlighted:true diff --git a/doc/global/template/style/offline-simple.css b/doc/global/template/style/offline-simple.css index b11cb6a137..5d8ce5c37f 100644 --- a/doc/global/template/style/offline-simple.css +++ b/doc/global/template/style/offline-simple.css @@ -1,11 +1,11 @@ body { - font-size: 14px; + font-size: 10.5pt; } pre { background-color: #f0f0f0; font-family: Courier, monospace; - font-size: 15px; + font-size: 11pt; font-weight: 600; vertical-align: top; margin: 15px 85px 15px 35px; @@ -41,7 +41,7 @@ a[href|="http://"], a[href|="https://"] { h1.title { margin-top: 30px; margin-left: 6px; - font-size: 32px; + font-size: 24pt; padding: 6px; } @@ -52,7 +52,7 @@ h2, p.h2 { } h3 { - font-size: 16px; + font-size: 12pt; margin: 30px 0px 30px 6px; } @@ -82,7 +82,7 @@ h3.fn, span.fn { padding: 5px; text-decoration: none; font-weight: 400; - font-size: 16px; + font-size: 12pt; margin: 45px 0px 0px 6px; } @@ -107,7 +107,7 @@ table tr.odd { table.qmlname td { padding: 0px; margin-left: 6px; - font-size: 16px; + font-size: 12pt; } table.qmlname p .name, @@ -125,12 +125,12 @@ h3.fn .name, h3.fn .type { } tr > td > pre { - font-size: 14px; + font-size: 10.5pt; } code { font-family: Courier, monospace; - font-size: 16px; + font-size: 12pt; font-weight: 400; } @@ -167,7 +167,7 @@ td#buildversion { .footer, .footer p { padding: 5px 0px 5px 0px; margin: 45px 15px 5px 15px; - font-size: 10px; + font-size: 7.5pt; background-color: #cccccc; } |