Merge remote-tracking branch 'origin/QA_4_1'

2 files changed, 20 insertions, 5 deletions

diff --git a/setup/scripts.js b/setup/scripts.js
index c7e2fd1725..a5a19d827d 100644
--- a/setup/scripts.js
+++ b/setup/scripts.js
@@ -34,6 +34,19 @@ $(function () {
     }
 });
 
+//set document width
+$(document).ready(function(){
+    width = 0;
+    $('ul.tabs li').each(function(){
+        tabWidth = $(this).width() + 10;
+        width += tabWidth;
+     });
+     contentWidth = width;
+     width += 250;
+     $('body').css('min-width', width);
+     $('.tabs_contents').css('min-width', contentWidth);
+});
+ 
 //
 // END: Messages
 // ------------------------------------------------------------------
diff --git a/setup/styles.css b/setup/styles.css
index 4edec3d513..6bc45f8ab5 100644
--- a/setup/styles.css
+++ b/setup/styles.css
@@ -1,6 +1,8 @@
 /* global styles */
 
 body {
+    margin-right: auto;
+    min-width: 960px;
     padding-bottom: 1em;
     color: #444;
     font: .8em sans-serif;
@@ -79,6 +81,7 @@ h1 {
 
 #page {
     margin-left: 220px;
+    margin-right: 25px;
 }
 
 #footer {
@@ -205,8 +208,8 @@ div.notice[id^=version_check] h4 {
 /* form tabs */
 
 ul.tabs {
-    margin: 1.1em .2em 0;
-    padding: 0 0 .3em 0;
+    margin: 1.1em 2px 0;
+    padding: 0 0 3px 0;
     list-style: none;
     font-weight: bold;
 }
@@ -218,7 +221,7 @@ ul.tabs li {
 
 ul.tabs li a {
     display: block;
-    margin: .1em .2em 0;
+    margin: 1px .2em 0;
     white-space: nowrap;
     text-decoration: none;
     border: 1px solid #D5D5D5;
@@ -250,8 +253,7 @@ ul.tabs li.active a {
 }
 
 .tabs_contents {
-    margin-top: 1em;
-    float: left;
+    margin-top: 13px;
 }
 
 .tabs_contents fieldset {