Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

2 files changed, 29 insertions, 7 deletions

diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index 4b3107f..306b628 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -83,9 +83,9 @@ function processNokiaData(response){
 		} 
 	}	
 	 
-	if(lookupCount == 0){$('#ul001').prepend('<li>no result</li>');$('#ul001 li').css('display','block');}
-    if(articleCount == 0){$('#ul002').prepend('<li>no result</li>');$('#ul002 li').css('display','block');}
-	if(exampleCount == 0){$('#ul003').prepend('<li>no result</li>');$('#ul003 li').css('display','block');}
+	if(lookupCount == 0){$('#ul001').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul001 li').css('display','block');}
+    if(articleCount == 0){$('#ul002').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul002 li').css('display','block');}
+	if(exampleCount == 0){$('#ul003').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul003 li').css('display','block');}
 	// reset count variables;
 	 lookupCount=0;
 	 articleCount = 0;
@@ -97,6 +97,7 @@ function processNokiaData(response){
 var blankRE=/^\s*$/;
 function CheckEmptyAndLoadList()
 {
+	$('.liveResult').remove();
 	var value = document.getElementById('pageType').value; 
 	if((blankRE.test(value)) || (value.length < 3))
 	{
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 6bcb0db..644e56b 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -460,12 +460,12 @@
         padding-left: 12px;
         background: url(../images/bullet_sq.png) no-repeat 0 5px;
         font: normal 400 10pt/1 Verdana;
-        color: #44a51c;
+       /* color: #44a51c;*/
         margin-bottom: 10px; 
     }
     .content li:hover
     {
-        text-decoration: underline;
+      /*  text-decoration: underline;*/
     }
 
     .offline .wrap .content
@@ -747,11 +747,23 @@
     th
     {
         padding: 5px 15px 5px 15px;
+        background-color: #E1E1E1;
+        border-bottom: 1px solid #E6E6E6;
+        border-left: 1px solid #E6E6E6;
+        border-right: 1px solid #E6E6E6;
     }
     td
     {
         padding: 3px 15px 3px 20px;
+        border-left: 1px solid #E6E6E6;
+        border-right: 1px solid #E6E6E6;
+    }
+    tr.odd td:hover,  tr.even td:hover
+    {
+    /*    border-right: 1px solid #C3C3C3;
+        border-left: 1px solid #C3C3C3;*/
     }
+		
 	td.rightAlign
 	{
         padding: 3px 15px 3px 10px;
@@ -879,13 +891,22 @@
         font: 600 12px/1.2 Arial;
     }
 
-	.generic{}
+	.generic{
+		max-width:100%;
+	}
+	.generic td{
+		padding:0;
+	}
+	
 	.alignedsummary{}
 	.propsummary{}
 	.memItemLeft{}
 	.memItemRight{}
 	.bottomAlign{}
-	.highlightedCode{}
+	.highlightedCode
+	{
+	margin:10px;
+	}
 	.LegaleseLeft{}
 	.valuelist{}
 	.annotated{}