4122: removed dynamic styles settings, revised styles for contentcolumn and leftcolum...

diff --git a/docs/themes/default/include/header.tmpl.php b/docs/themes/default/include/header.tmpl.php
index 5389066..8ef7bea 100644 (file)
--- a/docs/themes/default/include/header.tmpl.php
+++ b/docs/themes/default/include/header.tmpl.php
@@ -257,7 +257,7 @@ function toggleFolder(cid)
                <?php
                 echo 'style="'.$style.'"';
                ?>>
-       <?php if ((isset($this->course_id) && $this->course_id > 0) && $system_courses[$this->course_id]['side_menu']): ?>
+       <?php if (isset($this->course_id) && $this->course_id > 0 && $system_courses[$this->course_id]['side_menu']): ?>
                <div id="leftcolumn">
             <a name="menu"></a>
             <div id="side-menu">
@@ -266,12 +266,7 @@ function toggleFolder(cid)
                </div>
        <?php endif; ?>
 
-       <div id="contentcolumn"
-               <?php if ((isset($this->course_id) && $this->course_id <= 0) && isset($this->side_menu) && !$this->side_menu): ?>
-                       style="margin-left:0.5em;width:99%;"
-               <?php endif; ?>
-               >
-
+       <div id="contentcolumn">
                <?php if (isset($this->course_id) && $this->course_id > 0 && $system_courses[$this->course_id]['side_menu']): ?>
                <div id="menutoggle">
                    <a accesskey=""><img src="" title="" alt="" /></a>

diff --git a/docs/themes/default/styles.css b/docs/themes/default/styles.css
index e1364a8..95f1597 100644 (file)
--- a/docs/themes/default/styles.css
+++ b/docs/themes/default/styles.css
@@ -1437,18 +1437,14 @@ div.social-wrapper{
        width: 100%;
 }
 #contentcolumn {
-       margin-left: 0.5em;
        padding-right: 5px;
-}
-#contentcolumn_shiftright {
-       margin-left: 19em;
+    overflow: auto;
 }
 
 #leftcolumn{
        float: left;
-       width: 19em;
-       margin-left: 5px;
-       margin-top:-10px;
+    overflow: hidden;
+    margin: -10px 5px 0;
 }
 
 #footer{
@@ -1799,8 +1795,7 @@ fieldset#toc {
         overflow:hidden; 
         width:18em;
         padding-right:.3em;
-        padding-bottom:.3em;
-        
+        padding-bottom:.3em; 
 }
 
 /* cleans up glossary question mark line spacing*/