Tidy up stray div elements

5 files changed, 9 insertions, 8 deletions

diff --git a/themes/clouds/header.php b/themes/clouds/header.php
index 6afbbc3dcb..9fbd1228c8 100644
--- a/themes/clouds/header.php
+++ b/themes/clouds/header.php
@@ -133,5 +133,6 @@ if  ($view!='simple') { // Use "simple" headers for popup windows
 	foreach (Zend_Controller_Action_HelperBroker::getStaticHelper('FlashMessenger')->getMessages() as $message) {
 		echo '<p class="ui-state-highlight">', $message, '</p>';
 	}
+	'</div>'; // <div id="clouds-container">
 }
 echo $javascript, '<div id="content">';
diff --git a/themes/clouds/style.css b/themes/clouds/style.css
index 07370c9441..4c2b233536 100644
--- a/themes/clouds/style.css
+++ b/themes/clouds/style.css
@@ -58,7 +58,7 @@ body {
 
 /* set up div container for main menu and options menu */
 
-#topMenu {clear: both; height:31px; width: 100%; background: #aaccff;}
+#topMenu {border-bottom: 1px solid #003399; clear: both; height:31px; width: 100%; background: #aaccff;}
 #menu-right {float: right;  margin-right: 20px;}
 
 /* LTR to TRL Translation */
diff --git a/themes/colors/header.php b/themes/colors/header.php
index 3d09692d3e..b8b6ea1ebd 100644
--- a/themes/colors/header.php
+++ b/themes/colors/header.php
@@ -104,8 +104,7 @@ if  ($view!='simple') { // Use "simple" headers for popup windows
 			'</form>',
 		'</li>',
 	'</ul>',
-	'</div>',
-	'</div>'; // end header
+	'</div>';
 
 	// Second Row menu and palette selection
 	// Menu
diff --git a/themes/minimal/header.php b/themes/minimal/header.php
index 7f777ddea0..bd7e60c69a 100644
--- a/themes/minimal/header.php
+++ b/themes/minimal/header.php
@@ -101,7 +101,7 @@ if ($view!='simple') {
 		'</form>';
 	print_favorite_selector();
 	echo 
-		'</div></div>';
+		'</div>';
 	
 	//  begin top links section
 	echo 
@@ -156,8 +156,7 @@ if ($view!='simple') {
 	}
 	echo 
 		'</ul>',
-		'</div>',
-		'<img src="', $WT_IMAGES['hline'], '" width="100%" height="3" alt="" />';
+		'</div>';
 	// Display feedback from asynchronous actions
 	foreach (Zend_Controller_Action_HelperBroker::getStaticHelper('FlashMessenger')->getMessages() as $message) {
 		echo '<p class="ui-state-highlight">', $message, '</p>';
diff --git a/themes/minimal/style.css b/themes/minimal/style.css
index a40019be54..319f8fdec6 100644
--- a/themes/minimal/style.css
+++ b/themes/minimal/style.css
@@ -81,11 +81,12 @@ html[dir='rtl'] .favorites_form {
 /* Layout for header menu */
 
 #topMenu { /* set up container for menu */
+	border-bottom: 1px solid;
 	clear: both;
 	float: left;
 	width: 100%;
-	margin:0;
-	padding:0;
+	margin:10px 0 0 0;
+	padding:0 0 10px 0;
 	margin-top: 18px;
 	z-index:2000;
 	position: relative;
@@ -734,6 +735,7 @@ html[dir='rtl'] .icon, html[dir='rtl'] .adminicon {
 }
 
 #content {
+	clear:both;
 	margin-left: 1px;
 }