summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test
diff options
context:
space:
mode:
authorBjørn Erik Nilsen <bjorn.nilsen@nokia.com>2009-06-10 14:58:17 (GMT)
committerBjørn Erik Nilsen <bjorn.nilsen@nokia.com>2009-06-10 14:58:17 (GMT)
commitc3d2c4a7d103ec1289c27425f49f8565a7f4413c (patch)
treeab77725bf74da5632bc5e9f7492a12759c1dfeaa /tools/qdoc3/test
parent0141b9b410278e064f3455d20cb21a50c926a2c8 (diff)
parent32f32ee3e752a6cc03505ddaa48d2849eaedc2a6 (diff)
downloadQt-c3d2c4a7d103ec1289c27425f49f8565a7f4413c.zip
Qt-c3d2c4a7d103ec1289c27425f49f8565a7f4413c.tar.gz
Qt-c3d2c4a7d103ec1289c27425f49f8565a7f4413c.tar.bz2
Merge commit 'qt/master' into kinetic-declarativeui
Conflicts: src/corelib/kernel/qabstractitemmodel.cpp src/corelib/kernel/qobject.cpp tools/qdoc3/htmlgenerator.cpp
Diffstat (limited to 'tools/qdoc3/test')
-rw-r--r--tools/qdoc3/test/classic.css49
1 files changed, 43 insertions, 6 deletions
diff --git a/tools/qdoc3/test/classic.css b/tools/qdoc3/test/classic.css
index 45d63db..d8c3d33 100644
--- a/tools/qdoc3/test/classic.css
+++ b/tools/qdoc3/test/classic.css
@@ -14,12 +14,49 @@ H3 {
h3.fn,span.fn
{
- background-color: #e0eff6;
+ background-color: #eee;
border-width: 1px;
border-style: solid;
- border-color: #3388be #e0eff6 #e9f8ff #e0eff6;
+ border-color: #ddd #ddd #ddd #ddd ;
font-weight: bold;
padding: 6px 0px 6px 10px;
+ margin: 42px 0px 0px 0px;
+}
+
+hr {
+ border: 0;
+ color: #9E9E9E;
+ background-color: #ccc;
+ height: 1px;
+ width: 100%;
+ text-align: left;
+ margin: 34px 0px 34px 0px;
+}
+
+table {
+ border-width: 1px 1px 1px 1px;
+ border-style: solid;
+ border-color: #dddddd;
+ border-collapse: collapse;
+ background-color: #f0f0f0;
+ margin-left: 1.5%;
+ width: 97%
+}
+
+table th {
+ border-width: 1px 1px 1px 2px;
+ padding: 4px;
+ border-style: solid;
+ border-color: #444;
+ color:white;
+ background-color:#444;
+}
+
+p {
+ margin-left: 1.5%;
+ margin-top: 8px;
+ width: 97%
+ margin-bottom: 8px;
}
a:link
@@ -66,7 +103,7 @@ body
table td.memItemLeft {
width: 200px;
- padding: 1px 0px 0px 8px;
+ padding: 2px 0px 0px 8px;
margin: 4px;
border-top-width: 1px;
border-right-width: 1px;
@@ -76,7 +113,7 @@ table td.memItemLeft {
border-right-color: #E0E0E0;
border-bottom-color: #E0E0E0;
border-left-color: #E0E0E0;
- border-top-style: solid;
+ border-top-style: none;
border-right-style: none;
border-bottom-style: none;
border-left-style: none;
@@ -85,7 +122,7 @@ table td.memItemLeft {
white-space: nowrap
}
table td.memItemRight {
- padding: 1px 8px 0px 8px;
+ padding: 2px 8px 0px 8px;
margin: 4px;
border-top-width: 1px;
border-right-width: 1px;
@@ -95,7 +132,7 @@ table td.memItemRight {
border-right-color: #E0E0E0;
border-bottom-color: #E0E0E0;
border-left-color: #E0E0E0;
- border-top-style: solid;
+ border-top-style: none;
border-right-style: none;
border-bottom-style: none;
border-left-style: none;