diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-18 08:37:31 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-18 08:37:31 +0100 |
commit | beb65dcd79f8c354dab7bb4a8d08157bd9d69329 (patch) | |
tree | 4632a0ff0df8462f8913f347042cf8378de03268 /doc | |
parent | 3fc1002489d5861d4f7cc2e1e8800881d6593c9d (diff) | |
parent | e3288f246b44ba2b6d90b90eb99ab61f496d8d57 (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/gui/painting/painting.pri
src/plugins/platforms/xcb/qxcbconnection.cpp
tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro
tests/auto/corelib/tools/qlocale/test/test.pro
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
tools/configure/environment.cpp
Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495
Diffstat (limited to 'doc')
-rw-r--r-- | doc/global/html-header-online.qdocconf | 1 | ||||
-rw-r--r-- | doc/global/template/style/online.css | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/global/html-header-online.qdocconf b/doc/global/html-header-online.qdocconf index 450eb1120b..02b7375d32 100644 --- a/doc/global/html-header-online.qdocconf +++ b/doc/global/html-header-online.qdocconf @@ -36,6 +36,7 @@ HTML.headerscripts = \ " <script type=\"text/javascript\" src=\"scripts/extras.js\"></script>\n" \ " <script type=\"text/javascript\">\n" \ " \$(function(){\n" \ + " \$(\"#footer\").load(\"/style/qt-footer.html\");\n" \ " \$(\"#sidebar-content\").load(\"style/qt5-sidebar.html\");\n" \ " });\n" \ " </script>\n" \ diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css index c7758d0ca8..be278a27da 100644 --- a/doc/global/template/style/online.css +++ b/doc/global/template/style/online.css @@ -1260,13 +1260,13 @@ li a.active { } .mainContent table p { margin:0px; - padding:0px -} -.mainContent table p { - margin:0px; padding:0px; + max-width:initial; min-height:2em } +.mainContent table p.centerAlign { + text-align:center +} .context h2 { font-size:2.1875em } |