Doc: Update online documentation template

    - Online CSS tweaks: Max-width, font-sizes,
      font-weights to improve readability, other
      minor fixes
    - Remove duplicate include statement and unnecessary
      definitions for online template

Change-Id: I713bddd0e175235668c4d9790d0df58b4131d19f
Reviewed-by: Martin Smith <martin.smith@digia.com>

3 files changed, 26 insertions, 9 deletions

diff --git a/doc/global/qt-html-templates-online.qdocconf b/doc/global/qt-html-templates-online.qdocconf
index 78d0d497c8..69c399d05a 100644
--- a/doc/global/qt-html-templates-online.qdocconf
+++ b/doc/global/qt-html-templates-online.qdocconf
@@ -1,5 +1,6 @@
 #include standard set of HTML header and footer.
-include(html-config.qdocconf)
+HTML.nonavigationbar      = "false"
+HTML.tocdepth             = 2
 include(html-header-online.qdocconf)
 include(html-footer-online.qdocconf)
 
diff --git a/doc/global/qt-module-defaults-online-commercial.qdocconf b/doc/global/qt-module-defaults-online-commercial.qdocconf
index 23b0998ccb..c5bce13609 100644
--- a/doc/global/qt-module-defaults-online-commercial.qdocconf
+++ b/doc/global/qt-module-defaults-online-commercial.qdocconf
@@ -25,5 +25,3 @@ HTML.nosubdirs = "false"
 
 # Set navigation homepage
 navigation.homepage = "Qt Documentation"
-
-sourcedirs += includes-online
diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css
index d558137e2e..97498f16d7 100644
--- a/doc/global/template/style/online.css
+++ b/doc/global/template/style/online.css
@@ -860,7 +860,7 @@ html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abb
 body {
   font-family:“Open Sans”, Arial, Helvetica, sans-serif;
   line-height:1.5;
-  font-weight:300
+  font-weight:400
 }
 h1,h2,h3,h4,h5,h6 {
   font-weight:300
@@ -959,7 +959,7 @@ a:hover {
   color:#46a2da
 }
 .main,.navbar-header,#footerbar>div {
-  max-width:1500px;
+  max-width:1280px;
   width:95%;
   margin:0 auto
 }
@@ -1083,9 +1083,15 @@ dd {
   margin-bottom:1.56em
 }
 .mainContent li {
-  margin-bottom:0.8em;
+  margin-top:0.8em;
   line-height:1.25em
 }
+.mainContent li.level2 {
+  margin-left:10px;
+  margin-top:0.4em;
+  font-size:0.9375em;
+  line-height:1.15em;
+}
 .mainContent p {
   line-height:1.56em;
   margin-bottom:1.5em;
@@ -1093,7 +1099,7 @@ dd {
   max-width:85%
 }
 .mainContent b {
-  font-weight:400
+  font-weight:600
 }
 .context ul {
   margin-bottom:1.5em
@@ -1180,9 +1186,15 @@ li a.active {
   padding:0px;
   min-height:2em
 }
-.context h4,.context h3,.context h2 {
+.context h2 {
   font-size:2.1875em
 }
+.context h3 {
+  font-size:1.75em
+}
+.context h4 {
+  font-size:1.375em
+}
 .context p img {
   margin-top:0.75em;
   max-width:100%
@@ -1207,7 +1219,7 @@ table td,table th {
 table.alignedsummary,table.propsummary {
   width:initial
 }
-div.main_index .row:first-child {
+div.main_index .row {
   border-bottom:1px solid #eee
 }
 div.main_index .row {
@@ -1556,6 +1568,11 @@ input.gsc-search-button:hover {
   cursor: pointer;
 }
 
+input.gsc-search-button:focus {
+  outline: none;
+  box-shadow: none;
+}
+
 .gsc-search-box-tools .gsc-clear-button {
   display: none !important;
   visibility: none !important;
@@ -1570,6 +1587,7 @@ input.gsc-input {
   border: 1px solid #d6d6d6 !important;
   border-radius: 5px !important;
   box-sizing: border-box !important;
+  -moz-box-sizing: border-box !important;
   color: #868482 !important;
   outline: 0 none !important;
   padding: 9px 10px 10px !important;