From d238f7e0190c49c0f07c24f2f4ef9a50577c389b Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@digia.com>
Date: Tue, 7 Apr 2015 11:20:37 +0200
Subject: Doc: Update online documentation template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change brings the online template up to date with recent
changes:
    - Update links in header and footer.
    - To improve page load time and reduce load on qt.io,
      do not load images from the main site.
    - Fix auto-scroll/highlight jQuery to work on anchors
      containing full stop ('.') characters
    - Responsiveness: Fix menu issues with narrow views
    - Fix styling of subscript/superscript HTML tags
    - Make script URIs protocol-agnostic

Change-Id: I219e8ce6ff2e70f9374ad5e037ceda8f710a6a10
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
---
 doc/global/template/scripts/extras.js | 6 +++---
 doc/global/template/scripts/main.js   | 6 +++---
 doc/global/template/style/online.css  | 8 +++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'doc/global/template')

diff --git a/doc/global/template/scripts/extras.js b/doc/global/template/scripts/extras.js
index 409215f2d8..8a623a037e 100644
--- a/doc/global/template/scripts/extras.js
+++ b/doc/global/template/scripts/extras.js
@@ -4,7 +4,7 @@ $(function () {
     $('a[href*=#]:not([href=#])').on('click', function (e) {
         if (e.which == 2)
             return true;
-        var target = $(this.hash);
+        var target = $(this.hash.replace(/(\.)/g, "\\$1"));
         target = target.length ? target : $('[name=' + this.hash.slice(1) + ']');
         if (target.length) {
             setTimeout(function () {
@@ -15,10 +15,10 @@ $(function () {
 
 $(window).load(function () {
     var h = window.location.hash;
-    var re = /[^a-z0-9_\#\-]/i
+    var re = /[^a-z0-9_\.\#\-]/i
     if (h.length > 1 && !re.test(h)) {
         setTimeout(function () {
-            $(window).scrollTop($(h).offset().top - vOffset);
+            $(window).scrollTop($(h.replace(/(\.)/g, "\\$1")).offset().top - vOffset);
         }, 0);
     }
 });
diff --git a/doc/global/template/scripts/main.js b/doc/global/template/scripts/main.js
index 79de4ea5b2..823cebecf8 100644
--- a/doc/global/template/scripts/main.js
+++ b/doc/global/template/scripts/main.js
@@ -36,7 +36,7 @@ function load_sdk(s, id, src) {
     fjs.parentNode.insertBefore(js, fjs);
 }
 $(document).ready(function($) {
-    if (document.documentElement.clientWidth < 1220) {
+    if (document.documentElement.clientWidth < 1280) {
         oneQt.extraLinksToMain();
     }
 
@@ -76,7 +76,7 @@ $(document).ready(function($) {
     $(window).resize(function() {
         oneQt.stickySidebar();
         oneQt.footerPosition();
-        if (document.documentElement.clientWidth < 1220) {
+        if (document.documentElement.clientWidth < 1280) {
             oneQt.extraLinksToMain();
         } else {
             oneQt.mainLinkstoExtra();
@@ -216,7 +216,7 @@ var oneQt = {
         var extramenuLinks = $('#menuextras').find('li');
         var mainmenu = $('#mainmenu');
         var count = 0;
-        if ($(extramenuLinks).length > 3) {
+        if ($(extramenuLinks).length > 2) {
             $(extramenuLinks).each(function() {
                 if (count < 3) {
                     var newLink = $(this);
diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css
index b4f5be18b6..aa2633f26a 100644
--- a/doc/global/template/style/online.css
+++ b/doc/global/template/style/online.css
@@ -25,7 +25,9 @@
   min-width:95px;
   position:relative;
   text-align:center;
-  margin:10px 0 0 0
+  border-left:1px solid #eee;
+  border-right:1px solid #eee;
+  padding:10px 0 10px 0
 }
 #navbar .navbar-toggle:hover figure {
   background:#5caa15
@@ -873,13 +875,13 @@ body.qt-account #navbar .navbar-oneQt h2 {
 .clearfix .right {
   float:right
 }
-html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video {
+html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video {
   margin:0;
   padding:0;
   border:0;
   font-size:100%
 }
-html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,caption,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video {
+html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,caption,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video {
   vertical-align:baseline
 }
 body {
-- 
cgit v1.2.3