3 files changed, 45 insertions, 40 deletions
diff --git a/doc/global/qt-cpp-ignore.qdocconf b/doc/global/qt-cpp-ignore.qdocconf
index 6dd1536c1f..89d24152a2 100644
--- a/doc/global/qt-cpp-ignore.qdocconf
+++ b/doc/global/qt-cpp-ignore.qdocconf
@@ -75,12 +75,10 @@ Cpp.ignoretokens        += \
                           QM_EXPORT_XML \
                           QT_ASCII_CAST_WARN \
                           QT_ASCII_CAST_WARN_CONSTRUCTOR \
-                          QT_BEGIN_HEADER \
                           QT_BEGIN_INCLUDE_NAMESPACE \
                           QT_BEGIN_NAMESPACE \
                           QT_BOOTSTRAPPED \
                           QT_DESIGNER_STATIC \
-                          QT_END_HEADER \
                           QT_END_INCLUDE_NAMESPACE \
                           QT_END_NAMESPACE \
                           QT_FASTCALL \
diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css
index 40257730ff..0e4dd5e9a4 100644
--- a/doc/global/template/style/offline.css
+++ b/doc/global/template/style/offline.css
@@ -66,6 +66,11 @@ color: #44a51c;
 text-align:left;
 }
 
+/*
+-----------
+offline viewing: HTML links display an icon
+-----------
+*/
 a[href*="http://"], a[href*="ftp://"],a[href*="https://"]
 {
 text-decoration: none;
@@ -127,7 +132,6 @@ Top navigation
 .qtref{
 display: block;
 position: relative;
-top: -76px;
 height:15px;
 z-index: 1;
 font-size:11px;
@@ -136,10 +140,11 @@ float:right;
 }
 
 .naviNextPrevious{
+clear: both;
 display: block;
 position: relative;
 text-align: right;
-top: -53px;
+top: -47px;
 float:right;
 height:20px;
 z-index:1;
@@ -167,6 +172,14 @@ padding-right:20px;
 height:20px;
 margin-left:30px;
 }
+/*
+-----------
+footer and license
+-----------
+*/
+.footer{
+text-align:center
+}
 
 /* table of content
 no display
@@ -390,10 +403,15 @@ text-align: left;
 
 .cpp{
 display: block;
-margin: 10;
-overflow: hidden;
-overflow-x: hidden;
-overflow-y: hidden;
+margin: 10px;
+overflow: auto;
+padding: 20px 20px 20px 20px;
+}
+
+.js{
+display: block;
+margin: 10px;
+overflow: auto;
 padding: 20px 20px 20px 20px;
 }
 
@@ -424,9 +442,7 @@ padding: 3px 15px 3px 0;
 .qml{
 display: block;
 margin: 10;
-overflow: hidden;
-overflow-x: hidden;
-overflow-y: hidden;
+overflow: auto;
 padding: 20px 20px 20px 20px;
 }
 
@@ -459,6 +475,7 @@ Content table
 @media print{
 .toc {
 float: right;
+clear: right;
 padding-bottom: 10px;
 padding-top: 50px;
 width: 100%;
@@ -470,8 +487,8 @@ background-repeat:no-repeat;
 
 @media screen{
 .toc{
-clear:both;
 float:right;
+clear: right;
 vertical-align:top;
 -moz-border-radius: 7px 7px 7px 7px;
 -webkit-border-radius: 7px 7px 7px 7px;
@@ -485,11 +502,7 @@ padding-bottom:10px;
 height: auto;
 width: 200px;
 text-align:left;
-z-index:2;
 margin-left:20px;
-margin-right:20px;
-margin-top:0px;
-padding-top:0px;
 }
 }
 
diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css
index 9dff745358..7809783fa7 100644
--- a/doc/global/template/style/online.css
+++ b/doc/global/template/style/online.css
@@ -127,7 +127,6 @@ margin-left: 20px;
 text-align:left
 }
 .nav-main-content{
-font-weight:bold;
 margin-right: 20px;
 display:inline-block;
 }
@@ -156,9 +155,7 @@ left: 30px;
 }
 .qtref{
 display: block;
-position: relative;
 top: -76px;
-height:15px;
 z-index: 1;
 font-size:11px;
 padding-right:10px;
@@ -171,7 +168,7 @@ text-align: right;
 float:right;
 z-index:1;
 padding-right:10px;
-vertical-align:top;
+padding-top:4px;
 }
 
 
@@ -196,16 +193,12 @@ margin-left:30px;
 .breadcrumb{
 display: block;
 position: relative;
-top:-20px;
-/*border-top:2px solid #ffffff;*/
-border-bottom: 1px solid #cecece;
-background-color:#F2F2F2;
 z-index:1;
 height:20px;
 padding:0px;
 margin:0px;
 padding-left:10px;
-padding-top:2px;
+padding-top:12px;
 margin-left:-5px;
 margin-right:-5px;
 }
@@ -216,7 +209,6 @@ margin-right:-5px;
 }
 
 .breadcrumb ul li{
-background-color:#F2F2F2;
 list-style-type:none;
 padding:0;
 margin:0;
@@ -236,7 +228,6 @@ padding-left:20px;
 
 
 .breadcrumb li a{
-color:#2C418D;
 display:block;
 text-decoration:none;
 background:url(../images/arrow.png);
@@ -506,10 +497,15 @@ text-align: left;
 
 .cpp{
 display: block;
-margin: 10;
-overflow: hidden;
-overflow-x: hidden;
-overflow-y: hidden;
+margin: 10px;
+overflow: auto;
+padding: 20px 20px 20px 20px;
+}
+
+.js{
+display: block;
+margin: 10px;
+overflow: auto;
 padding: 20px 20px 20px 20px;
 }
 
@@ -539,10 +535,8 @@ padding: 3px 15px 3px 0;
 
 .qml{
 display: block;
-margin: 10;
-overflow: hidden;
-overflow-x: hidden;
-overflow-y: hidden;
+margin: 10px;
+overflow: auto;
 padding: 20px 20px 20px 20px;
 }
 
@@ -576,6 +570,7 @@ Content table
 @media print{
 .toc {
 float: right;
+clear: right;
 padding-bottom: 10px;
 padding-top: 50px;
 width: 100%;
@@ -587,7 +582,10 @@ background-repeat:no-repeat;
 
 @media screen{
 .toc{
-clear:both;
+clear: both;
+clear: right;
+position: relative;
+top: 83px;
 float:right;
 vertical-align:top;
 -moz-border-radius: 7px 7px 7px 7px;
@@ -602,11 +600,7 @@ padding-bottom:10px;
 height: auto;
 width: 200px;
 text-align:left;
-z-index:2;
 margin-left:20px;
-margin-right:20px;
-margin-top:0px;
-padding-top:0px;
 }
 }