summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-08-13 13:52:57 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-08-13 13:52:57 (GMT)
commit2a2aa1b0581911de907f7b950b5cf4acda914170 (patch)
tree09139b60b33bfed5932337ae05221b7c1c510e64 /doc
parent9878c1765332d9a68a8371b90888fe09e272c7a8 (diff)
parent8b7d63d3c537c481ed3ad134a7ed75af8ed1e6b4 (diff)
downloadQt-2a2aa1b0581911de907f7b950b5cf4acda914170.zip
Qt-2a2aa1b0581911de907f7b950b5cf4acda914170.tar.gz
Qt-2a2aa1b0581911de907f7b950b5cf4acda914170.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc')
-rw-r--r--doc/src/template/style/narrow.css4
-rwxr-xr-xdoc/src/template/style/style.css41
2 files changed, 4 insertions, 41 deletions
diff --git a/doc/src/template/style/narrow.css b/doc/src/template/style/narrow.css
index e4ad135..349048f 100644
--- a/doc/src/template/style/narrow.css
+++ b/doc/src/template/style/narrow.css
@@ -54,7 +54,7 @@
.narrow .header .qtref a
{
- color: #363534;
+ color: #00732F;
}
.narrow .header .qtref span
@@ -103,7 +103,7 @@
}
.narrow .header #shortCut ul li a
{
- color: #44a51c;
+ color: #00732F;
}
.narrow .wrapper .hd
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 6a32e53..190c60a 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -1283,43 +1283,6 @@
-/* start of offline spec*/
- .offline .wrapper .hd
- {
- background: url(../images/page.png) no-repeat 0 -15px;
- }
- .offline .wrapper .bd
- {
- background: url(../images/bg_l_blank.png) repeat-y 0 0;
- }
- .offline .wrapper .ft
- {
- background: url(../images/page.png) no-repeat 0 -90px;
- }
- .offline .sidebar,
- .offline .feedback,
- .offline .t_button,
- .offline #narrowsearch,
- .offline #narrowmenu
- {
- display: none;
- }
- .offline .wrap
- {
- margin: 0 5px 0 5px;
- }
- .offline .wrap .breadcrumb
- {
- }
-
- .offline .wrap .content
- {
- padding-top: 15px;
- }
-
-
-/* end of offline spec*/
-
/* start of creator spec*/
.creator
{
@@ -1339,9 +1302,9 @@
.creator #feedbackBox,
.creator #feedback,
.creator #blurpage,
- .creator .indexbox .indexIcon span,
+ /*.creator .indexbox .indexIcon span,*/
.creator .wrapper .hd,
- .creator .indexbox .indexIcon,
+/* .creator .indexbox .indexIcon,*/
.creator .header #nav-logo,
.creator #offlinemenu,
.creator #offlinesearch,