Index: twocol_stacked.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/layouts/twocol_stacked.inc,v
retrieving revision 1.5
diff -u -r1.5 twocol_stacked.inc
--- twocol_stacked.inc	22 Aug 2006 23:54:20 -0000	1.5
+++ twocol_stacked.inc	15 May 2007 07:04:12 -0000
@@ -2,7 +2,7 @@
 // $Id: twocol_stacked.inc,v 1.5 2006/08/22 23:54:20 merlinofchaos Exp $
 
 /**
- * implementation of hook_panels_layouts
+ * Implementation of hook_panels_layouts().
  */
 function panels_twocol_stacked_panels_layouts() {
   $items['twocol_stacked'] = array(
@@ -27,22 +27,21 @@
   }
 
   $output = <<<EOT
-<div class="panel-2col-stacked" $idstr>
-  <div class="panel-col-top">
-    <div>$content[top]</div>
+<div class="panel-2col-stacked clear-block"$idstr>
+  <div class="panel-col panel-col-top">
+    <div class="panel-content">$content[top]</div>
   </div>
-  <div class="panel-col-first">
-    <div>$content[left]</div>
+  <div class="panel-col panel-col-first">
+    <div class="panel-content">$content[left]</div>
   </div>
 
-  <div class="panel-col-last">
-    <div>$content[right]</div>
+  <div class="panel-col panel-col-last">
+    <div class="panel-content">$content[right]</div>
   </div>
-  <div class="panel-col-bottom">
-    <div>$content[bottom]</div>
+  <div class="panel-col panel-col-bottom">
+    <div class="panel-content">$content[bottom]</div>
   </div>
 </div>
-<br class="panel-clearer" />
 EOT;
   return $output;
 }
Index: threecol_25_50_25.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/layouts/threecol_25_50_25.inc,v
retrieving revision 1.4
diff -u -r1.4 threecol_25_50_25.inc
--- threecol_25_50_25.inc	22 Aug 2006 23:54:20 -0000	1.4
+++ threecol_25_50_25.inc	15 May 2007 07:04:12 -0000
@@ -1,6 +1,8 @@
 <?php
+// $Id$
+
 /**
- * implementation of hook_panels_layouts
+ * Implementation of hook_panels_layouts().
  */
 function panels_threecol_25_50_25_panels_layouts() {
   $items['threecol_25_50_25'] = array(
@@ -25,20 +27,19 @@
   }
 
   $output = <<<EOT
-<div class="panel-3col" $idstr>
-  <div class="panel-col-first">
-    <div>$content[left]</div>
+<div class="panel-3col clear-block"$idstr>
+  <div class="panel-col panel-col-first">
+    <div class="panel-content">$content[left]</div>
   </div>
 
-  <div class="panel-col">
-    <div>$content[middle]</div>
+  <div class="panel-col panel-col-middle">
+    <div class="panel-content">$content[middle]</div>
   </div>
 
-  <div class="panel-col-last">
-    <div>$content[right]</div>
+  <div class="panel-col panel-col-last">
+    <div class="panel-content">$content[right]</div>
   </div>
 </div>
-<br class="panel-clearer" />
 EOT;
   return $output;
 }
Index: threecol_25_50_25.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/layouts/threecol_25_50_25.css,v
retrieving revision 1.3
diff -u -r1.3 threecol_25_50_25.css
--- threecol_25_50_25.css	22 Aug 2006 23:54:20 -0000	1.3
+++ threecol_25_50_25.css	15 May 2007 07:04:12 -0000
@@ -1,22 +1,20 @@
-.panel-3col { 
-  /* border: 1px solid red; */ 
-  overflow: hidden; 
-}
-.panel-3col div div { 
-  margin: .5em;
-}
-.panel-3col .panel-col-first { 
-  float: left; 
-  width: 25%; 
-}
-.panel-3col .panel-col { 
-  float: left; 
-  width: 50%; 
-}
-.panel-3col .panel-col-last { 
-  float: left; 
-  width: 25%; 
-}
-.panel-clearer {
-  clear: both;
-}
+/* $Id$ */
+
+.panel-3col {
+  overflow: hidden;
+}
+.panel-3col .panel-col .panel-content {
+  margin: .5em;
+}
+.panel-3col .panel-col-first {
+  float: left;
+  width: 25%;
+}
+.panel-3col .panel-col-middle {
+  float: left;
+  width: 50%;
+}
+.panel-3col .panel-col-last {
+  float: left;
+  width: 25%;
+}
Index: threecol_33_34_33.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/layouts/threecol_33_34_33.css,v
retrieving revision 1.4
diff -u -r1.4 threecol_33_34_33.css
--- threecol_33_34_33.css	22 Aug 2006 23:54:20 -0000	1.4
+++ threecol_33_34_33.css	15 May 2007 07:04:12 -0000
@@ -1,24 +1,20 @@
-/* $Id: threecol_33_34_33.css,v 1.4 2006/08/22 23:54:20 merlinofchaos Exp $ */
-
-.panel-3col-33 { 
-  /* border: 1px solid red; */ 
-  overflow: hidden; 
-}
-.panel-3col-33 div div { 
-  margin: .5em;
-}
-.panel-3col-33 .panel-col-first { 
-  float: left; 
-  width: 33%; 
-}
-.panel-3col-33 .panel-col { 
-  float: left; 
-  width: 34%; 
-}
-.panel-3col-33 .panel-col-last { 
-  float: left; 
-  width: 33%; 
-}
-.panel-clearer {
-  clear: both;
-}
+/* $Id: threecol_33_34_33.css,v 1.4 2006/08/22 23:54:20 merlinofchaos Exp $ */
+
+.panel-3col-33 {
+  overflow: hidden;
+}
+.panel-3col-33 .panel-col .panel-content {
+  margin: .5em;
+}
+.panel-3col-33 .panel-col-first {
+  float: left;
+  width: 33%;
+}
+.panel-3col-33 .panel-col-middle {
+  float: left;
+  width: 34%;
+}
+.panel-3col-33 .panel-col-last {
+  float: left;
+  width: 33%;
+}
Index: threecol_25_50_25_stacked.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/layouts/threecol_25_50_25_stacked.inc,v
retrieving revision 1.5
diff -u -r1.5 threecol_25_50_25_stacked.inc
--- threecol_25_50_25_stacked.inc	22 Aug 2006 23:54:20 -0000	1.5
+++ threecol_25_50_25_stacked.inc	15 May 2007 07:04:12 -0000
@@ -2,7 +2,7 @@
 // $Id: threecol_25_50_25_stacked.inc,v 1.5 2006/08/22 23:54:20 merlinofchaos Exp $
 
 /**
- * implementation of hook_panels_layouts
+ * Implementation of hook_panels_layouts().
  */
 function panels_threecol_25_50_25_stacked_panels_layouts() {
   $items['threecol_25_50_25_stacked'] = array(
@@ -27,26 +27,25 @@
   }
 
   $output = <<<EOT
-<div class="panel-3col-stacked" $idstr>
-  <div class="panel-col-top">
-    <div>$content[top]</div>
+<div class="panel-3col-stacked clear-block"$idstr>
+  <div class="panel-col panel-col-top clear-block">
+    <div class="panel-content">$content[top]</div>
   </div>
-  <div class="panel-col-first">
-    <div>$content[left]</div>
+  <div class="panel-col panel-col-first">
+    <div class="panel-content">$content[left]</div>
   </div>
 
-  <div class="panel-col">
-    <div>$content[middle]</div>
+  <div class="panel-col panel-col-middle">
+    <div class="panel-content">$content[middle]</div>
   </div>
 
-  <div class="panel-col-last">
-    <div>$content[right]</div>
+  <div class="panel-col panel-col-last">
+    <div class="panel-content">$content[right]</div>
   </div>
-  <div class="panel-col-bottom">
-    <div>$content[bottom]</div>
+  <div class="panel-col panel-col-bottom clear-block">
+    <div class="panel-content">$content[bottom]</div>
   </div>
 </div>
-<br class="panel-clearer" />
 EOT;
   return $output;
 }
Index: twocol.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/layouts/twocol.css,v
retrieving revision 1.4
diff -u -r1.4 twocol.css
--- twocol.css	22 Aug 2006 23:54:20 -0000	1.4
+++ twocol.css	15 May 2007 07:04:12 -0000
@@ -1,22 +1,19 @@
-/* $Id: twocol.css,v 1.4 2006/08/22 23:54:20 merlinofchaos Exp $ */
-
-.panel-2col { 
-  /* border: 1px solid red; */ 
-  overflow: hidden; 
-}
-
-.panel-2col div div { 
-  margin: .5em;
-}
-
-.panel-2col .panel-col-first { 
-  float: left; 
-  width: 50%; 
-}
-.panel-2col .panel-col-last { 
-  float: left; 
-  width: 50%; 
-}
-.panel-clearer {
-  clear: both;
-}
+/* $Id: twocol.css,v 1.4 2006/08/22 23:54:20 merlinofchaos Exp $ */
+
+.panel-2col {
+  overflow: hidden;
+}
+.panel-2col .panel-col-first {
+  float: left;
+  width: 50%;
+}
+.panel-2col .panel-col-last {
+  float: left;
+  width: 50%;
+}
+.panel-2col .panel-col-first .panel-content {
+  margin-right: 0.5em;
+}
+.panel-2col .panel-col-last .panel-content {
+  margin-left: 0.5em;
+}
\ No newline at end of file
Index: threecol_33_34_33_stacked.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/layouts/threecol_33_34_33_stacked.css,v
retrieving revision 1.4
diff -u -r1.4 threecol_33_34_33_stacked.css
--- threecol_33_34_33_stacked.css	22 Aug 2006 23:54:20 -0000	1.4
+++ threecol_33_34_33_stacked.css	15 May 2007 07:04:12 -0000
@@ -1,29 +1,24 @@
-/* $Id: threecol_33_34_33_stacked.css,v 1.4 2006/08/22 23:54:20 merlinofchaos Exp $ */
-
-.panel-3col-33-stacked { 
-  /* border: 1px solid red; */ 
-  overflow: hidden; 
-}
-.panel-3col-33-stacked div div { 
-  margin: .5em;
-}
-.panel-3col-33-stacked .panel-col-top,
-.panel-3col-33-stacked .panel-col-bottom { 
-  width: 100%; 
-  clear: both;
-}
-.panel-3col-33-stacked .panel-col-first { 
-  float: left; 
-  width: 33%; 
-}
-.panel-3col-33-stacked .panel-col { 
-  float: left; 
-  width: 34%; 
-}
-.panel-3col-33-stacked .panel-col-last { 
-  float: left; 
-  width: 33%; 
-}
-.panel-clearer {
-  clear: both;
-}
+/* $Id: threecol_33_34_33_stacked.css,v 1.4 2006/08/22 23:54:20 merlinofchaos Exp $ */
+
+.panel-3col-33-stacked {
+  overflow: hidden;
+}
+.panel-3col-33-stacked .panel-col .panel-content {
+  margin: .5em;
+}
+.panel-3col-33-stacked .panel-col-top,
+.panel-3col-33-stacked .panel-col-bottom {
+  width: 100%;
+}
+.panel-3col-33-stacked .panel-col-first {
+  float: left;
+  width: 33%;
+}
+.panel-3col-33-stacked .panel-col-middle {
+  float: left;
+  width: 34%;
+}
+.panel-3col-33-stacked .panel-col-last {
+  float: left;
+  width: 33%;
+}
Index: threecol_25_50_25_stacked.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/layouts/threecol_25_50_25_stacked.css,v
retrieving revision 1.3
diff -u -r1.3 threecol_25_50_25_stacked.css
--- threecol_25_50_25_stacked.css	24 Jul 2006 23:56:08 -0000	1.3
+++ threecol_25_50_25_stacked.css	15 May 2007 07:04:12 -0000
@@ -1,26 +1,24 @@
-/* $Id: threecol_25_50_25_stacked.css,v 1.3 2006/07/24 23:56:08 merlinofchaos Exp $ */
-
-.panel-3col-stacked { 
-  /* border: 1px solid red; */ 
-  overflow: hidden; 
-}
-.panel-3col-stacked div div { 
-  margin: .5em;
-}
-.panel-3col-stacked .panel-col-top,
-.panel-3col-stacked .panel-col-bottom { 
-  width: 100%; 
-  clear: both;
-}
-.panel-3col-stacked .panel-col-first { 
-  float: left; 
-  width: 25%; 
-}
-.panel-3col-stacked .panel-col { 
-  float: left; 
-  width: 50%; 
-}
-.panel-3col-stacked .panel-col-last { 
-  float: left; 
-  width: 25%; 
-}
+/* $Id: threecol_25_50_25_stacked.css,v 1.3 2006/07/24 23:56:08 merlinofchaos Exp $ */
+
+.panel-3col-stacked {
+  overflow: hidden; 
+}
+.panel-3col-stacked .panel-col .panel-content {
+  margin: .5em;
+}
+.panel-3col-stacked .panel-col-top,
+.panel-3col-stacked .panel-col-bottom {
+  width: 100%;
+}
+.panel-3col-stacked .panel-col-first {
+  float: left;
+  width: 25%;
+}
+.panel-3col-stacked .panel-col-middle {
+  float: left;
+  width: 50%;
+}
+.panel-3col-stacked .panel-col-last {
+  float: left;
+  width: 25%;
+}
Index: threecol_33_34_33.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/layouts/threecol_33_34_33.inc,v
retrieving revision 1.5
diff -u -r1.5 threecol_33_34_33.inc
--- threecol_33_34_33.inc	22 Aug 2006 23:54:20 -0000	1.5
+++ threecol_33_34_33.inc	15 May 2007 07:04:12 -0000
@@ -1,7 +1,8 @@
 <?php
 // $Id: threecol_33_34_33.inc,v 1.5 2006/08/22 23:54:20 merlinofchaos Exp $
+
 /**
- * implementation of hook_panels_layouts
+ * Implementation of hook_panels_layouts().
  */
 function panels_threecol_33_34_33_panels_layouts() {
   $items['threecol_33_34_33'] = array(
@@ -26,20 +27,19 @@
   }
 
   $output = <<<EOT
-<div class="panel-3col-33" $idstr>
-  <div class="panel-col-first">
-    <div>$content[left]</div>
+<div class="panel-3col-33 clear-block"$idstr>
+  <div class="panel-col panel-col-first">
+    <div class="panel-content">$content[left]</div>
   </div>
 
-  <div class="panel-col">
-    <div>$content[middle]</div>
+  <div class="panel-col panel-col-middle">
+    <div class="panel-content">$content[middle]</div>
   </div>
 
-  <div class="panel-col-last">
-    <div>$content[right]</div>
+  <div class="panel-col panel-col-last">
+    <div class="panel-content">$content[right]</div>
   </div>
 </div>
-<br class="panel-clearer" />
 EOT;
   return $output;
 }
Index: twocol.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/layouts/twocol.inc,v
retrieving revision 1.6
diff -u -r1.6 twocol.inc
--- twocol.inc	22 Aug 2006 23:54:20 -0000	1.6
+++ twocol.inc	15 May 2007 07:04:12 -0000
@@ -1,7 +1,8 @@
 <?php
 // $Id: twocol.inc,v 1.6 2006/08/22 23:54:20 merlinofchaos Exp $
+
 /**
- * implementation of hook_panels_layouts
+ * Implementation of hook_panels_layouts().
  */
 function panels_twocol_panels_layouts() {
   $items['twocol'] = array(
@@ -26,16 +27,15 @@
   }
 
   $output = <<<EOT
-<div class="panel-2col" $idstr>
-  <div class="panel-col-first">
-    <div>$content[left]</div>
+<div class="panel-2col clear-block"$idstr>
+  <div class="panel-col panel-col-first">
+    <div class="panel-content">$content[left]</div>
   </div>
 
-  <div class="panel-col-last">
-    <div>$content[right]</div>
+  <div class="panel-col panel-col-last">
+    <div class="panel-content">$content[right]</div>
   </div>
 </div>
-<br class="panel-clearer" />
 EOT;
   return $output;
 }
Index: threecol_33_34_33_stacked.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/layouts/threecol_33_34_33_stacked.inc,v
retrieving revision 1.5
diff -u -r1.5 threecol_33_34_33_stacked.inc
--- threecol_33_34_33_stacked.inc	22 Aug 2006 23:54:20 -0000	1.5
+++ threecol_33_34_33_stacked.inc	15 May 2007 07:04:12 -0000
@@ -2,7 +2,7 @@
 // $Id: threecol_33_34_33_stacked.inc,v 1.5 2006/08/22 23:54:20 merlinofchaos Exp $
 
 /**
- * implementation of hook_panels_layouts
+ * Implementation of hook_panels_layouts().
  */
 function panels_threecol_33_34_33_stacked_panels_layouts() {
   $items['threecol_33_34_33_stacked'] = array(
@@ -27,26 +27,25 @@
   }
 
   $output = <<<EOT
-<div class="panel-3col-33-stacked" $idstr>
-  <div class="panel-col-top">
-    <div>$content[top]</div>
+<div class="panel-3col-33-stacked clear-block"$idstr>
+  <div class="panel-col panel-col-top clear-block">
+    <div class="panel-content">$content[top]</div>
   </div>
-  <div class="panel-col-first">
-    <div>$content[left]</div>
+  <div class="panel-col panel-col-first">
+    <div class="panel-content">$content[left]</div>
   </div>
 
-  <div class="panel-col">
-    <div>$content[middle]</div>
+  <div class="panel-col panel-col-middle">
+    <div class="panel-content">$content[middle]</div>
   </div>
 
-  <div class="panel-col-last">
-    <div>$content[right]</div>
+  <div class="panel-col panel-col-last">
+    <div class="panel-content">$content[right]</div>
   </div>
-  <div class="panel-col-bottom">
-    <div>$content[bottom]</div>
+  <div class="panel-col panel-col-bottom clear-block">
+    <div class="panel-content">$content[bottom]</div>
   </div>
 </div>
-<br class="panel-clearer" />
 EOT;
   return $output;
 }
Index: twocol_stacked.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/layouts/twocol_stacked.css,v
retrieving revision 1.4.4.1
diff -u -r1.4.4.1 twocol_stacked.css
--- twocol_stacked.css	15 Mar 2007 20:16:53 -0000	1.4.4.1
+++ twocol_stacked.css	15 May 2007 07:04:12 -0000
@@ -1,27 +1,20 @@
-/* $Id: twocol_stacked.css,v 1.4.4.1 2007/03/15 20:16:53 merlinofchaos Exp $ */
-
-.panel-2col-stacked { 
-  /* border: 1px solid red; */ 
-  overflow: hidden; 
-}
-
-.panel-2col-stacked div > div {
-  margin: .5px;
-}
-
-.panel-2col-stacked .panel-col-top,
-.panel-2col-stacked .panel-col-bottom {
-  width: 99.9%;
-  clear: both;
-}
-.panel-2col-stacked .panel-col-first {
-  float: left;
-  width: 47%;
-}
-.panel-2col-stacked .panel-col-last {
-  float: right;
-  width: 47%;
-}
-.panel-clearer {
-  clear: both;
-}
+/* $Id: twocol_stacked.css,v 1.4.4.1 2007/03/15 20:16:53 merlinofchaos Exp $ */
+.panel-2col-stacked { 
+  overflow: hidden; 
+}
+.panel-2col-stacked .panel-content {
+  margin: .5em;
+}
+.panel-2col-stacked .panel-col-top,
+.panel-2col-stacked .panel-col-bottom {
+  width: 99.9%;
+  clear: both;
+}
+.panel-2col-stacked .panel-col-first {
+  float: left;
+  width: 47%;
+}
+.panel-2col-stacked .panel-col-last {
+  float: right;
+  width: 47%;
+}