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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors"
  Fix margins for placeholdertext in QLineEdit
  qdoc: Added TOC to module pages.
  Doc: Updating design files.
  Doc: Fixing design bugs. Updating the index page and script/style files. Adding some image files.
  qdoc: Changed <ul> elements in TOC.
  Fix QTextDocument::undo() cursor positioning

6 files changed, 314 insertions, 512 deletions

diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 71060f8..fe76435 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
@@ -43,8 +43,6 @@
     \page index.html
     \keyword Qt Reference Documentation
 
-    \title Qt Reference Documentation
-
     \raw HTML
           <div class="indexbox" >
             <div class="heading">
diff --git a/doc/src/template/images/bullet_dn.png b/doc/src/template/images/bullet_dn.png
new file mode 100644
index 0000000..f776247
--- /dev/null
+++ b/doc/src/template/images/bullet_dn.png
diff --git a/doc/src/template/images/bullet_up.png b/doc/src/template/images/bullet_up.png
new file mode 100644
index 0000000..285e741
--- /dev/null
+++ b/doc/src/template/images/bullet_up.png
diff --git a/doc/src/template/images/header.png b/doc/src/template/images/header.png
new file mode 100644
index 0000000..141488b
--- /dev/null
+++ b/doc/src/template/images/header.png
diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index c510410..329b910 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -1,7 +1,7 @@
 
 /* START non link areas where cursor should change to pointing hand */
 $('.t_button').mouseover(function() {
-    $(this).css('cursor','pointer');
+    $('.t_button').css('cursor','pointer');
 		/*document.getElementById(this.id).style.cursor='pointer';*/
 });
 
@@ -17,17 +17,20 @@ $('#medA').click(function() {
 		$('.content h1').css('font','600 18px/1.2 Arial');
 		$('.content h2').css('font','600 16px/1.2 Arial');
 		$('.content h3').css('font','600 14px/1.2 Arial');
-		$('.content p').css('font','13px/1.2 Verdana');
-		$('.content li').css('font','600 10pt/1 Verdana');
+		$('.content p').css('font','13px/20px Verdana');
+		$('.content li').css('font','400 13px/1 Verdana');
 		$('.content li').css('line-height','14px');
+		$('.content .toc li').css('font', 'normal 10px/1.2 Verdana');
 		$('.content table').css('font','13px/1.2 Verdana');
+		$('.content .heading').css('font','600 16px/1 Arial');
+		$('.content .indexboxcont li').css('font','600 13px/1 Verdana');
 		$('.t_button').removeClass('active')
 		$(this).addClass('active')
 });
 
 $('#bigA').click(function() {
 		$('.content .heading,.content h1, .content h2, .content h3, .content p, .content li, .content table').css('font-size','large');
-		$('.content li').css('line-height','14px');
+		$('.content .heading,.content h1, .content h2, .content h3, .content p, .content li, .content table').css('line-height','25px');
 		$('.t_button').removeClass('active')
 		$(this).addClass('active')
 });
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 4668c23..c46e875 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -73,6 +73,7 @@
     {
         font-size: 100%;
     }
+    /* Page style */
     html
     {
         background-color: #e5e5e5;
@@ -101,7 +102,6 @@
     {
         background: url(../images/bg_r.png) repeat-y 100% 0;
     }
-
     .wrapper .hd
     {
         padding-left: 216px;
@@ -109,12 +109,10 @@
         background: url(../images/bg_ul.png) no-repeat 0 0;
         overflow: hidden;
     }
-
     .offline .wrapper .hd
     {
         background: url(../images/bg_ul_blank.png) no-repeat 0 0;
     }
-
     .wrapper .hd span
     {
         height: 15px;
@@ -122,23 +120,19 @@
         background: url(../images/bg_ur.png) no-repeat 100% 0;
         overflow: hidden;
     }
-
     .offline .wrapper .hd span
     {
         /*         background: url(../images/bg_ur_blank.png) no-repeat 100% 0; */
     }
-
     .wrapper .bd
     {
         background: url(../images/bg_l.png) repeat-y 0 0;
         position: relative;
     }
-
     .offline .wrapper .bd
     {
         background: url(../images/bg_l_blank.png) repeat-y 0 0;
     }
-
     .wrapper .ft
     {
         padding-left: 216px;
@@ -146,12 +140,10 @@
         background: url(../images/bg_ll.png) no-repeat 0 0;
         overflow: hidden;
     }
-
     .offline .wrapper .ft
     {
         background: url(../images/bg_ll_blank.png) no-repeat 0 0;
     }
-
     .wrapper .ft span
     {
         height: 15px;
@@ -159,34 +151,23 @@
         background: url(../images/bg_lr.png) no-repeat 100% 0;
         overflow: hidden;
     }
-
     .header, .footer
     {
         display: block;
         clear: both;
         overflow: hidden;
     }
-
-    /*    .header
-        {
-            height: 130px;
-            position: relative;
-        }
-    */
-
     .header
     {
         height: 115px;
         position: relative;
     }
-
     .header .icon
     {
         position: absolute;
         top: 13px;
         left: 0;
     }
-
     .header .qtref
     {
         position: absolute;
@@ -195,7 +176,6 @@
         width: 302px;
         height: 22px;
     }
-
     .header .qtref span
     {
         display: block;
@@ -204,7 +184,184 @@
         text-indent: -999em;
         background: url(../images/qt_ref_doc.png) no-repeat 0 0;
     }
+    /* header elements */
+    #nav-topright
+    {
+        height: 70px;
+    }
+
+    #nav-topright ul
+    {
+        list-style-type: none;
+        float: right;
+        width: 370px;
+        margin-top: 11px;
+    }
+
+    #nav-topright li
+    {
+        display: inline-block;
+        margin-right: 20px;
+        float: left;
+    }
+
+    #nav-topright li.nav-topright-last
+    {
+        margin-right: 0;
+    }
 
+    #nav-topright li a
+    {
+        background: transparent url(../images/sprites-combined.png) no-repeat;
+        height: 18px;
+        display: block;
+        overflow: hidden;
+        text-indent: -9999px;
+    }
+
+    #nav-topright li.nav-topright-home a
+    {
+        width: 65px;
+        background-position: -2px -91px;
+    }
+
+    #nav-topright li.nav-topright-home a:hover
+    {
+        background-position: -2px -117px;
+    }
+
+
+    #nav-topright li.nav-topright-dev a
+    {
+        width: 30px;
+        background-position: -76px -91px;
+    }
+
+    #nav-topright li.nav-topright-dev a:hover
+    {
+        background-position: -76px -117px;
+    }
+
+
+    #nav-topright li.nav-topright-labs a
+    {
+        width: 40px;
+        background-position: -114px -91px;
+    }
+
+    #nav-topright li.nav-topright-labs a:hover
+    {
+        background-position: -114px -117px;
+    }
+
+    #nav-topright li.nav-topright-doc a
+    {
+        width: 32px;
+        background-position: -162px -91px;
+    }
+
+    #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a
+    {
+        background-position: -162px -117px;
+    }
+
+    #nav-topright li.nav-topright-blog a
+    {
+        width: 40px;
+        background-position: -203px -91px;
+    }
+
+    #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a
+    {
+        background-position: -203px -117px;
+    }
+
+    #nav-topright li.nav-topright-shop a
+    {
+        width: 40px;
+        background-position: -252px -91px;
+    }
+
+    #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a
+    {
+        background-position: -252px -117px;
+    }
+
+    #nav-logo
+    {
+        background: transparent url(     "../images/sprites-combined.png" ) no-repeat 0 -225px;
+        left: -3px;
+        position: absolute;
+        width: 75px;
+        height: 75px;
+        top: 13px;
+    }
+    #nav-logo a
+    {
+        width: 75px;
+        height: 75px;
+        display: block;
+        text-indent: -9999px;
+        overflow: hidden;
+    }
+    /* Clearing */
+    .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after
+    {
+        content: ".";
+        display: block;
+        height: 0;
+        clear: both;
+        visibility: hidden;
+    }
+    /* ^ Clearing */
+
+
+
+    .shortCut-topleft-inactive
+    {
+        padding-left: 3px;
+        background: transparent url(     "../images/sprites-combined.png" ) no-repeat 0px -58px;
+        height: 20px;
+        width: 93px;
+    }
+    .shortCut-topleft-inactive span
+    {
+        font-variant: normal;
+    }
+    #shortCut
+    {
+        padding-top: 10px;
+        font-weight: bolder;
+        color: #b0adab;
+    }
+    #shortCut ul
+    {
+        list-style-type: none;
+        float: left;
+        width: 347px;
+        margin-left: 100px;
+    }
+    #shortCut li
+    {
+        display: inline-block;
+        margin-right: 25px;
+        float: left;
+        white-space: nowrap;
+    }
+    #shortCut li a
+    {
+        color: #b0adab;
+        text-decoration: none;
+    }
+    #shortCut li a:hover
+    {
+        color: #44a51c;
+        text-decoration: none;
+    }
+
+    /* end of header elements */    
+    
+    /* menu element */
     .sidebar
     {
         float: left;
@@ -212,7 +369,6 @@
         width: 200px;
         font-size: 11px;
     }
-
     .sidebar a
     {
         color: #00732f;
@@ -222,19 +378,15 @@
     {
         display: none;
     }
-
     .sidebar .searchlabel
     {
         padding: 0 0 2px 17px;
         font: normal bold 11px/1.2 Verdana;
     }
-
     .sidebar .search
     {
         padding: 0 15px 0 16px;
     }
-
-
     .sidebar .search form
     {
         width: 167px;
@@ -242,7 +394,6 @@
         padding: 2px 0 0 5px;
         background: url(../images/form_bg.png) no-repeat 0 0;
     }
-
     .sidebar .search form fieldset input#searchstring
     {
         width: 158px;
@@ -252,84 +403,66 @@
         outline: none;
         font: 13px/1.2 Verdana;
     }
-
     .sidebar .box
     {
         padding: 17px 15px 5px 16px;
     }
-
     .sidebar .box .first
     {
         background-image: none;
     }
-
     .sidebar .box h2
     {
         font: normal 18px/1.2 Arial;
         padding: 15px 0 0 40px;
         min-height: 32px;
     }
-
     .sidebar .box#lookup h2
     {
         background: url(../images/api_lookup.png) no-repeat 0 0;
     }
-
     .sidebar .box#topics h2
     {
         background: url(../images/api_topics.png) no-repeat 0 0;
     }
-
     .sidebar .box#examples h2
     {
         background: url(../images/api_examples.png) no-repeat 0 0;
     }
-
     .sidebar .box .list
     {
         display: block;
     }
-
     .sidebar .box .live
     {
         display: none;
         height: 100px;
         overflow: auto;
     }
-
     .list li a:hover, .live li a:hover
     {
         text-decoration: underline;
     }
-
-
-    .sidebar .box ul
-    {
-    }
-
     .sidebar .box ul li
     {
         padding-left: 12px;
         background: url(../images/bullet_gt.png) no-repeat 0 5px;
         margin-bottom: 15px;
     }
-
     .sidebar .bottombar
     {
         background: url(../images/box_bg.png) repeat-x 0 bottom;
     }
-
+    /* content elements */
     .wrap
     {
-        /*  margin: 0 5px 0 0px;*/
         overflow: hidden;
     }
-
     .offline .wrap
     {
         margin: 0 5px 0 5px;
     }
-
+    /* tool bar */
     .wrap .toolbar
     {
         background-color: #fafafa;
@@ -339,12 +472,10 @@
         margin-right: 5px;
         position: relative;
     }
-
     .wrap .toolbar .toolblock
     {
         position: absolute;
     }
-
     .wrap .toolbar .breadcrumb
     {
         font-size: 11px;
@@ -359,12 +490,10 @@
         vertical-align: top;
         overflow: hidden;
     }
-
     .wrap .toolbar .toolbuttons .active
     {
         color: #00732F;
     }
-
     .wrap .toolbar .toolbuttons ul
     {
         float: right;
@@ -378,7 +507,6 @@
         font-weight: bold;
         color: #B0ADAB;
     }
-
     #smallA
     {
         font-size: 10pt;
@@ -391,31 +519,20 @@
     {
         font-size: 14pt;
     }
-
     #smallA:hover, #medA:hover, #bigA:hover
     {
         color: #00732F;
     }
-
     #print
     {
         font-size: 14pt;
         line-height: 20pt;
     }
-
     #printIcon
     {
         margin-left: 5px;
     }
-
-    .offline .wrap .breadcrumb
-    {
-    }
-
-    .wrap .breadcrumb ul
-    {
-    }
-
+    /* bread crumbs */
     .wrap .breadcrumb ul li
     {
         float: left;
@@ -424,105 +541,87 @@
         margin-left: 15px;
         font-weight: bold;
     }
-
     .wrap .breadcrumb ul li.last
     {
         font-weight: normal;
     }
-
-    .wrap .breadcrumb ul li a
-    {
-    }
-
     .wrap .breadcrumb ul li.first
     {
         background-image: none;
         padding-left: 0;
         margin-left: 0;
     }
-
     .wrap .content
     {
-        /* left 30 top 27*/
         padding: 30px;
         position: relative;
     }
-
+    /* text elements */
     .heading
     {
         font: normal 600 16px/1.0 Arial;
         padding-bottom: 15px;
     }
 
+    .subtitle
+    {
+        font-size: 13px;
+    }
+
+    .small-subtitle
+    {
+        font-size: 13px;
+    }
+    
     .wrap .content h1
     {
         font: 600 18px/1.2 Arial;
         padding-bottom: 15px;
     }
-
     .wrap .content h2
     {
         font: 600 16px/1.2 Arial;
     }
-
     .wrap .content h3
     {
         font: 600 14px/1.2 Arial;
     }
-
-
-
     .wrap .content p
     {
-        padding-bottom: 10px;
+        line-height:20px;
+        padding:10px 5px 10px 5px;
     }
-
     .wrap .content ul
     {
-        padding-left: 15px;
+        padding-left: 25px;
     }
     .wrap .content li
     {
         padding-left: 12px;
         background: url(../images/bullet_sq.png) no-repeat 0 5px;
-        font: normal 600 10pt/1 Verdana;
+        font: normal 400 10pt/1 Verdana;
         margin-bottom: 10px;
         line-height: 14px;
     }
-
-    .content li:hover
-    {
-        text-decoration: none;
-    }
-
-    .content li
-    {
-        text-decoration: none;
-    }
-
-    /*.content*/    a
+    a
     {
         color: #00732F;
         text-decoration: none;
     }
-
-    .content a:hover
+    a:hover
     {
         color: #4c0033;
         text-decoration: underline;
     }
-
     .content a:visited
     {
         color: #4c0033;
+        text-decoration: none;
     }
-
     .offline .wrap .content
     {
         padding-top: 15px;
     }
-
-
     .footer
     {
         min-height: 100px;
@@ -531,7 +630,6 @@
         text-align: center;
         padding-top: 40px;
     }
-
     .feedback
     {
         float: right;
@@ -539,7 +637,6 @@
         font: normal 8px/1 Verdana;
         color: #B0ADAB;
     }
-
     .feedback:hover
     {
         float: right;
@@ -547,196 +644,6 @@
         color: #00732F;
         text-decoration: underline;
     }
-
-
-
-    /* Clearing */
-    .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after
-    {
-        content: ".";
-        display: block;
-        height: 0;
-        clear: both;
-        visibility: hidden;
-    }
-    /* ^ Clearing */
-
-
-    /* header elements */
-
-
-    #nav-topright
-    {
-        height: 70px;
-    }
-
-    #nav-topright ul
-    {
-        list-style-type: none;
-        float: right;
-        width: 347px;
-        margin-top: 11px;
-    }
-
-    #nav-topright li
-    {
-        display: inline-block;
-        margin-right: 20px;
-        float: left;
-    }
-
-    #nav-topright li.nav-topright-last
-    {
-        margin-right: 0;
-    }
-
-    #nav-topright li a
-    {
-        background: transparent url(../images/sprites-combined.png) no-repeat;
-        height: 18px;
-        display: block;
-        overflow: hidden;
-        text-indent: -9999px;
-    }
-
-    #nav-topright li.nav-topright-home a
-    {
-        width: 65px;
-        background-position: -2px -91px;
-    }
-
-    #nav-topright li.nav-topright-home a:hover
-    {
-        background-position: -2px -117px;
-    }
-
-
-    #nav-topright li.nav-topright-dev a
-    {
-        width: 30px;
-        background-position: -76px -91px;
-    }
-
-    #nav-topright li.nav-topright-dev a:hover
-    {
-        background-position: -76px -117px;
-    }
-
-
-    #nav-topright li.nav-topright-labs a
-    {
-        width: 40px;
-        background-position: -114px -91px;
-    }
-
-    #nav-topright li.nav-topright-labs a:hover
-    {
-        background-position: -114px -117px;
-    }
-
-    #nav-topright li.nav-topright-doc a
-    {
-        width: 32px;
-        background-position: -162px -91px;
-    }
-
-    #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a
-    {
-        background-position: -162px -117px;
-    }
-
-    #nav-topright li.nav-topright-blog a
-    {
-        width: 40px;
-        background-position: -203px -91px;
-    }
-
-    #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a
-    {
-        background-position: -203px -117px;
-    }
-
-    #nav-topright li.nav-topright-shop a
-    {
-        width: 40px;
-        background-position: -252px -91px;
-    }
-
-    #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a
-    {
-        background-position: -252px -117px;
-    }
-
-    #nav-logo
-    {
-        background: transparent url(    "../images/sprites-combined.png" ) no-repeat 0 -225px;
-        left: -3px;
-        position: absolute;
-        width: 75px;
-        height: 75px;
-        top: 13px;
-    }
-    #nav-logo a
-    {
-        width: 75px;
-        height: 75px;
-        display: block;
-        text-indent: -9999px;
-        overflow: hidden;
-    }
-
-
-    .shortCut-topleft-inactive
-    {
-        padding-left: 3px;
-        background: transparent url(    "../images/sprites-combined.png" ) no-repeat 0px -58px;
-        height: 20px;
-        width: 93px;
-    }
-
-    .shortCut-topleft-inactive span
-    {
-        font-variant: normal;
-    }
-
-    #shortCut
-    {
-        padding-top: 10px;
-        font-weight: bolder;
-        color: #b0adab;
-    }
-
-    #shortCut ul
-    {
-        list-style-type: none;
-        float: left;
-        width: 347px;
-        margin-left: 100px;
-    }
-
-    #shortCut li
-    {
-        display: inline-block;
-        margin-right: 25px;
-        float: left;
-        white-space: nowrap;
-    }
-
-    #shortCut li a
-    {
-        color: #b0adab;
-        text-decoration: none;
-    }
-
-    #shortCut li a:hover
-    {
-        color: #44a51c;
-        text-decoration: none;
-    }
-
-
-    /* end of header elements */
-
     hr
     {
         background-color: #e0e0e0;
@@ -745,228 +652,111 @@
         text-align: left;
         margin: 15px 0px 15px 0px;
     }
+    
     .content .alignedsummary
     {
         margin: 15px;
     }
-
-    table.valuelist
+    /* tables */
+    table, pre
     {
-        border-width: 0px 0px 1px 0px;
-        border-style: solid;
-        border-color: #b0adab;
-        border-collapse: collapse;
-        background-color: #f0f0f0; /*  border-bottom: solid 1px #b0adab;*/
-    }
-
-    table.valuelist th
-    {
-        border-width: 0px 0px 0px 0px;
-        padding: 4px;
-        color: #00732F;
-        font: 600 10pt/1 Verdana;
-    }
-
-    table.generic, table.annotated
-    {
-        border: none;
-        padding-left: 15px;
-        padding-right: 15px;
-        margin-bottom: 15px;
-    }
-
-
-    table td.memItemLeft
-    {
-        width: 180px;
-        padding: 2px 0px 0px 8px;
-        margin: 4px;
-        border-width: 1px;
-        border-color: #b0adab;
-        border-style: none;
-        font-size: 100%;
-        white-space: nowrap;
-    }
-
-    table td.memItemRight
-    {
-        padding: 2px 8px 0px 8px;
-        margin: 4px;
-        border-width: 1px;
-        border-color: #b0adab;
-        border-style: none;
-        font-size: 100%;
+        -moz-border-radius: 7px 7px 7px 7px;
+        background-color: #F6F6F6;
+        border: 1px solid #E6E6E6;
+        border-collapse: separate;
+        font-size: 11px; 
+        min-width: 395px; 
+        margin-bottom: 25px;
     }
-
+    thead{margin-top: 5px;}
+    th{ padding: 3px 15px 3px 15px;}
+    td{padding: 3px 15px 3px 20px;}
     table tr.odd
     {
-        background: #EBEBEB;
+        border-left: 1px solid #E6E6E6;
+        background-color: #F6F6F6; 
         color: #66666E;
     }
-
     table tr.even
     {
-        background: #F4F4F4;
+        border-left: 1px solid #E6E6E6;
+        background-color: #ffffff;
         color: #66666E;
     }
-
-    table.annotated th
-    {
-        padding: 3px;
-        text-align: left;
-    }
-
-    table td, table th
-    {
-        padding: 3px; /*  border:solid 1px #FFFFFF;*/
-    }
-
-    table tr pre
-    {
-        padding-top: 0px;
-        padding-bottom: 0px;
-        padding-left: 0px;
-        padding-right: 0px;
-        border: none;
-        background: none;
-    }
-
-    tr.qt-style /* change me - widgets-sliders.html*/
+    table tr.odd:hover
     {
-        background: #BCBCBC;
-        border-bottom: solid 1px #b0adab;
+        background-color: #E6E6E6; 
     }
-
-    table tr.qt-code pre /* investigate */
-    {
-        padding: 0.2em;
-        border: #e7e7e7 1px solid;
-        background: #f1f1f1;
-        color: black;
-    }
-
-    span.preprocessor, span.preprocessor a
+    table tr.even:hover
     {
-        color: darkblue;
+        background-color: #E6E6E6;
     }
-
     span.comment
     {
-        color: darkred;
+        color: #8B0000;
         font-style: italic;
     }
-
     span.string, span.char
     {
-        color: darkgreen;
-    }
-
-    .subtitle
-    {
-        font-size: 13px;
-    }
-
-    .small-subtitle
-    {
-        font-size: 13px;
-    }
-
-    .qmlitem
-    {
-        padding: 0;
+        color: #254117;
     }
-
-    .qmlname
+    pre
     {
-        white-space: nowrap;
+        -moz-border-radius:7px 7px 7px 7px;
+        background-color:#F6F6F6;
+        border:1px solid #DDDDDD;
+        margin:0 20px 10px 10px;
+        padding:20px 15px 20px 20px;
+        overflow-x:auto;
     }
-
     .qmltype
     {
         text-align: center;
         font-size: 160%;
     }
-
-    .qmlproto
-    {
-        background-color: #eee;
-        border-width: 1px;
-        border-style: solid;
-        border-color: #ddd;
-        font-weight: bold;
-        padding: 6px 10px 6px 10px;
-        margin: 42px 0px 0px 0px;
-    }
-
     .qmlreadonly
     {
         float: right;
-        color: red;
-    }
-
-    .qmldoc
-    {
-    }
-
-    *.qmlitem p
-    {
+        color: #254117;
     }
-
-
-    thead
-    {
-        margin-top: 5px;
-    }
-
-    td
-    {
-        padding: 5px;
-    }
-    th
-    {
-        padding: 5px;
-    }
-
-
     #feedbackBox
     {
-        display: none;
-        position: fixed;
+        display:none;
+        -moz-border-radius:7px 7px 7px 7px;
+        border:1px solid #DDDDDD;
+        position:fixed;
+        top:100px;
         left: 33%;
-        bottom: 200px;
         height: 190px;
         width: 400px;
         padding: 5px;
         background-color: #e6e7e8;
         z-index: 4;
     }
-
     #feedcloseX a
     {
-        padding-top: 5px;
-        padding-right: 5px;
-        color: #333333;
+        display:inline;
+        padding: 5px 5px 0 0;
+        margin-bottom:3px;
+        color: #363534;
+        font-weight:600;
         float: right;
         text-decoration: none;
     }
-
     #feedbox
+    /* here */
     {
-        float: none;
-        width: 350px;
+        display:inline;
+        width: 370px;
         height: 120px;
-        margin-top: 5px;
-        margin-left: 25px;
-        margin-right: 25px;
+        margin:0px 25px 10px 15px;
     }
-
     #feedsubmit
     {
-        float: right;
-        margin-top: 4px;
-        margin-right: 22px;
+        display:inline;
+        float:right;
+        margin:4px 32px 0 0;
     }
-
     #blurpage
     {
         display: none;
@@ -979,74 +769,83 @@
         background: transparent url(../images/feedbackground.png) 0 0;
         z-index: 3;
     }
-    /* page elements */
     .toc
     {
-        float: right;
-        border: solid 1px #666600;
-        background-color: #FFFFCC;
-        margin: 15px;
+        float: right; 
+        -moz-border-radius:7px 7px 7px 7px;
+        background-color:#F6F6F6;
+        border:1px solid #DDDDDD;
+        margin:0 20px 10px 10px;
+        padding:20px 15px 20px 20px;
         height: auto;
         width: 200px;
     }
 
+    .toc h3
+    {
+		font:600 12px/1.2 Arial;
+    }
+	
     .toc ul
     {
         float: left;
         padding: 15px;
+        
     }
+  
 
     .content .toc li
     {
-        font: normal 13px/1.2 Verdana;
+        font: normal 10px/1.2 Verdana;
+        background: url(../images/bullet_dn.png) no-repeat 0 5px;
     }
-    
-    .relpage /* edit */
+
+    .relpage 
     {
+        -moz-border-radius: 7px 7px 7px 7px;
+        border: 1px solid #DDDDDD;
+        padding: 25px 25px;
         clear:both;
-        border: solid 1px #666600;
-        background-color: #FFFFCC;
-        height: auto;
-        width: 100%;                
-        }
-     .relpage ul
-     {
-        float:none;
+    }
+    .relpage ul
+    {
+        float: none;
         padding: 15px;
-
-        }
-     .relpage li
-     {
-                font: normal 13px/1.2 Verdana;
-
-        }
-/* edit */
+    }
+    .content .relpage li 
+    {
+        font: normal 11px/1.2 Verdana;
+    }
+    /* edit */
     h3.fn, span.fn
     {
-        background-color: #eee;
+        background-color: #F6F6F6;
         border-width: 1px;
         border-style: solid;
-        border-color: #ddd;
-        font-weight: bold;
-      /*  padding: 6px 0px 6px 10px;*/
-   /*     margin: 42px 0px 0px 0px;*/
+        border-color: #E6E6E6;
+        font-weight: bold; 
+        /*  padding: 6px 0px 6px 10px;*/
+         /*     margin: 42px 0px 0px 0px;*/
     }
     /* edit */
 
     .indexbox
     {
-        /*   max-width:785px;*/
-        width: 100%; /*  margin-bottom: 30px;*/
+        width: 100%; 
+    }
+    .content .indexboxcont li
+    {
+        font: normal 600 13px/1 Verdana;
     }
 
-    .indexbox a
+ /*   .indexbox a
     {
         color: #00732f;
         text-decoration: none;
-    }
-        .indexbox a:hover
+    }*/
+    .indexbox a:hover, .indexbox a:visited:hover
     {
-        color: #00732f;
+        color: #4c0033;
         text-decoration: underline;
     }
     .indexbox a:visited
@@ -1062,14 +861,14 @@
 
     .indexboxbar
     {
-        background: transparent url(    "../images/horBar.png" ) repeat-x left bottom;
+        background: transparent url(     "../images/horBar.png" ) repeat-x left bottom;
         margin-bottom: 25px;
     }
 
     .indexboxcont .section
     {
-        display: inline-block; /*Pål         padding-right: 20px;         padding-left: 10px; */
-        width: 49%;
+        display: inline-block; 
+        width: 49%; 
         *width:42%;
         _width:42%;
         padding:0 2% 0 1%;
@@ -1078,14 +877,13 @@
 
     .indexboxcont .indexIcon
     { 
-        /*PÅL        width: 115px;*/
-        width: 13%;
+        width: 11%; 
         *width:18%;
         _width:18%;
         overflow:hidden;
 }
     .indexboxcont .section p
-    { /*PÅL        max-width: 350px;*/
+    { 
         padding-top: 20px;
         padding-bottom: 20px;
     }
@@ -1093,37 +891,40 @@
     .indexboxcont .sectionlist
     {
         display: inline-block;
-        width: 34%;
-        margin-right:-2px;
-        vertical-align:top;
+        width: 33%;
+        margin-right: -2px;
+        vertical-align: top;
         padding: 0;
     }
     .tricol
     {
-      /*  margin-left: 10px; *//*PÅL        padding-right:76px;*/
+       
     }
     .indexboxcont .sectionlist ul
     {
+        padding-left: 15px;
         margin-bottom: 20px;
     }
-
+/*
     .indexboxcont .sectionlist ul li
     {
         line-height: 12px;
     }
-
+*/
     .lastcol
     {
         display: inline-block;
-        vertical-align:top;
+        vertical-align: top;
         padding: 0;
         max-width: 25%;
     }
 
     .tricol .lastcol
     {
+        margin-left:-6px;
     }
 
+    /*.toc ul*/
 
     /* end page elements */
 }