diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-01-13 14:44:04 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-01-13 14:44:04 (GMT) |
| commit | e63c88ac355f9b8b029faab599fb35756f22fb2e (patch) | |
| tree | 1819b301a7505909724f7ed34608b1d6e0aaf270 | |
| parent | 7ef25c1e7bbb8363dec6cc3dd5bc2497404be0f9 (diff) | |
| parent | fb76168df6fc73528328d2fce4f10a541af92cc2 (diff) | |
| download | Qt-e63c88ac355f9b8b029faab599fb35756f22fb2e.zip Qt-e63c88ac355f9b8b029faab599fb35756f22fb2e.tar.gz Qt-e63c88ac355f9b8b029faab599fb35756f22fb2e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
| -rw-r--r-- | doc/src/qt-webpages.qdoc | 5 | ||||
| -rwxr-xr-x | doc/src/template/style/style.css | 13 |
2 files changed, 14 insertions, 4 deletions
diff --git a/doc/src/qt-webpages.qdoc b/doc/src/qt-webpages.qdoc index 0a03157..5799d69 100644 --- a/doc/src/qt-webpages.qdoc +++ b/doc/src/qt-webpages.qdoc @@ -244,3 +244,8 @@ \externalpage http://labs.qt.nokia.com \title Qt Labs */ + +/*! + \externalpage http://qt.gitorious.org/qt/pages/QtCodingStyle + \title Qt Coding Style +*/ diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css index 451d6bf..aa98af8 100755 --- a/doc/src/template/style/style.css +++ b/doc/src/template/style/style.css @@ -226,10 +226,15 @@ { font-size: 13px; } - .red - { - color:red; - } + .red + { + color:red; + } + .figCaption{ + color:#363534; + font:italic 11px/1.2 Verdana; + padding-top:0; + } /* end font style elements */ /* global settings*/ |