diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-07 10:47:20 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-07 10:47:20 +0200 |
commit | ee0951d69b38f766e67262487be95b88501aa4a5 (patch) | |
tree | 116c334060500be340d4d61c99026316b0df3ce9 /doc | |
parent | 0bb645b1ccc5a9d57b21cf0b2c4306b8e48c611c (diff) | |
parent | d37239aa419ee4adff4b0a8d5c1403cadff72319 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/network/access/qftp.cpp
src/widgets/itemviews/qheaderview.cpp
src/widgets/itemviews/qlistview.cpp
tests/auto/network/access/qftp/tst_qftp.cpp
Change-Id: I9f928f25d45d8944dd60bb583f649fc1615bc5d9
Diffstat (limited to 'doc')
-rw-r--r-- | doc/global/template/style/offline-simple.css | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/doc/global/template/style/offline-simple.css b/doc/global/template/style/offline-simple.css index 5d8ce5c37f..84d206b2d0 100644 --- a/doc/global/template/style/offline-simple.css +++ b/doc/global/template/style/offline-simple.css @@ -1,11 +1,6 @@ -body { - font-size: 10.5pt; -} - pre { background-color: #f0f0f0; font-family: Courier, monospace; - font-size: 11pt; font-weight: 600; vertical-align: top; margin: 15px 85px 15px 35px; @@ -41,7 +36,6 @@ a[href|="http://"], a[href|="https://"] { h1.title { margin-top: 30px; margin-left: 6px; - font-size: 24pt; padding: 6px; } @@ -52,7 +46,6 @@ h2, p.h2 { } h3 { - font-size: 12pt; margin: 30px 0px 30px 6px; } @@ -82,7 +75,6 @@ h3.fn, span.fn { padding: 5px; text-decoration: none; font-weight: 400; - font-size: 12pt; margin: 45px 0px 0px 6px; } @@ -107,7 +99,6 @@ table tr.odd { table.qmlname td { padding: 0px; margin-left: 6px; - font-size: 12pt; } table.qmlname p .name, @@ -124,13 +115,8 @@ h3.fn .name, h3.fn .type { margin-right: 6px; } -tr > td > pre { - font-size: 10.5pt; -} - code { font-family: Courier, monospace; - font-size: 12pt; font-weight: 400; } @@ -167,7 +153,7 @@ td#buildversion { .footer, .footer p { padding: 5px 0px 5px 0px; margin: 45px 15px 5px 15px; - font-size: 7.5pt; + font-size: 8.5pt; background-color: #cccccc; } |