summaryrefslogtreecommitdiffstats
path: root/doc/src/template/style
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2011-01-21 15:33:57 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2011-01-21 15:33:57 (GMT)
commit226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22 (patch)
tree491c25c4c9f08b6ef732a9179d2e64776a9e8446 /doc/src/template/style
parent84a1df764bf2e29e9e6e43f4f0e1a69201199fbc (diff)
parent59a35a794e433f9526aff72025c0899e76ef362e (diff)
downloadQt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.zip
Qt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.tar.gz
Qt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.tar.bz2
Merge branch '4.7' into qdoc-simplified
Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/util/qdeclarativeanimation.cpp
Diffstat (limited to 'doc/src/template/style')
-rwxr-xr-xdoc/src/template/style/style.css13
1 files changed, 9 insertions, 4 deletions
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index fbad0fd..c35acac 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -230,10 +230,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*/