diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-31 08:14:28 (GMT) |
|---|---|---|
| committer | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-31 08:14:28 (GMT) |
| commit | 9c5f08452da280a90de48d0fa3862748cc428df4 (patch) | |
| tree | 38e6d4192e6fcf4e807727e05d4508ecb9ecedde /doc/src | |
| parent | 76d680844382ea24d40caaf9e0349e7b5af69ada (diff) | |
| parent | 1e48d40597bbe12321a5a3e42b3595dc17a7f8e7 (diff) | |
| download | Qt-9c5f08452da280a90de48d0fa3862748cc428df4.zip Qt-9c5f08452da280a90de48d0fa3862748cc428df4.tar.gz Qt-9c5f08452da280a90de48d0fa3862748cc428df4.tar.bz2 | |
Merge remote branch 'mainline/4.8'
Conflicts:
tools/qdoc3/cppcodemarker.cpp
tools/qdoc3/node.cpp
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/deployment/qt-conf.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/template/style/offline.css | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/doc/src/deployment/qt-conf.qdoc b/doc/src/deployment/qt-conf.qdoc index 2f68f3d..5204cc6 100644 --- a/doc/src/deployment/qt-conf.qdoc +++ b/doc/src/deployment/qt-conf.qdoc @@ -48,7 +48,7 @@ \o \c :/qt/etc/qt.conf using the resource system - \o on Mac OS X, in the Resource directory inside the appliction + \o on Mac OS X, in the Resource directory inside the application bundle, for example \c assistant.app/Contents/Resources/qt.conf \o in the directory containing the application executable, i.e. diff --git a/doc/src/template/style/offline.css b/doc/src/template/style/offline.css index 44abb3c..d33d8e7 100644 --- a/doc/src/template/style/offline.css +++ b/doc/src/template/style/offline.css @@ -74,8 +74,7 @@ body { - margin-left: 0.5em; - margin-right: 0.5em; + margin: 0px; font-family: sans-serif; line-height: normal } @@ -238,7 +237,9 @@ .header .content { - margin-bottom: 0.5em + margin-left: 5px; + margin-top: 5px; + margin-bottom: 0.5em; } .header .breadcrumb @@ -413,6 +414,11 @@ .flowList dd a{ } + .mainContent + { + padding-left:5px; + } + .content .flowList p{ padding:0px; } |