5 files changed, 8 insertions, 22 deletions
diff --git a/modules/system/system-behavior.css b/modules/system/system-behavior.css
index 1dcb4221f..93cd5ab98 100644
--- a/modules/system/system-behavior.css
+++ b/modules/system/system-behavior.css
@@ -43,14 +43,18 @@ html.js fieldset.collapsed {
   border-bottom-width: 0;
   border-left-width: 0;
   border-right-width: 0;
-  margin-bottom: 0;
   height: 1em;
 }
 html.js fieldset.collapsed .fieldset-wrapper {
   display: none;
 }
-html.js fieldset.collapsible .fieldset-legend {
+fieldset.collapsible {
+  position: relative;
+}
+fieldset.collapsible .fieldset-legend {
   display: block;
+}
+html.js fieldset.collapsible .fieldset-legend {
   padding-left: 15px; /* LTR */
   background: url(../../misc/menu-expanded.png) 5px 75% no-repeat; /* LTR */
 }
@@ -58,23 +62,11 @@ html.js fieldset.collapsed .fieldset-legend {
   background-image: url(../../misc/menu-collapsed.png); /* LTR */
   background-position: 5px 50%; /* LTR */
 }
-html.js fieldset.collapsible legend span.summary {
+.fieldset-legend span.summary {
   font-size: 0.9em;
   color: #999;
   margin-left: 0.5em;
 }
-/* IE6: Fix due to '* html' (breaks Konqueror otherwise). */
-* html.js fieldset.collapsed table * {
-  display: inline;
-}
-/* Safari 2: Tables in collapsible fieldsets disappear due to tableheader.js. */
-html.js fieldset.collapsible {
-  position: relative;
-}
-/* Avoid jumping around due to margins collapsing into collapsible fieldset border */
-html.js fieldset.collapsible .fieldset-wrapper {
-  overflow: auto;
-}
 
 /**
  * Resizable textareas
diff --git a/themes/garland/fix-ie-rtl.css b/themes/garland/fix-ie-rtl.css
index 0f7a409cb..8ff6412f9 100644
--- a/themes/garland/fix-ie-rtl.css
+++ b/themes/garland/fix-ie-rtl.css
@@ -36,7 +36,6 @@ fieldset {
 
 /* Prevent fieldsets from shifting when changing collapsed state. */
 html.js fieldset.collapsible {
-  position: relative;
   top: -1em;
 }
 
diff --git a/themes/garland/fix-ie.css b/themes/garland/fix-ie.css
index 03fbedb15..d38a6f8af 100644
--- a/themes/garland/fix-ie.css
+++ b/themes/garland/fix-ie.css
@@ -37,7 +37,6 @@ ul.primary {
 
 /* Prevent fieldsets from shifting when changing collapsed state. */
 html.js fieldset.collapsible {
-  position: relative;
   top: -1em;
 }
 html.js fieldset.collapsed {
diff --git a/themes/garland/style.css b/themes/garland/style.css
index 9f547053c..611512584 100644
--- a/themes/garland/style.css
+++ b/themes/garland/style.css
@@ -910,7 +910,7 @@ html.js fieldset.collapsed .fieldset-legend {
   background: url(images/menu-collapsed.gif) no-repeat 0% 50%; /* LTR */
 }
 
-html.js fieldset.collapsible legend span.summary {
+.fieldset-legend span.summary {
   color: #898989;
 }
 
diff --git a/themes/seven/style.css b/themes/seven/style.css
index 9cdacd412..536c0f525 100644
--- a/themes/seven/style.css
+++ b/themes/seven/style.css
@@ -558,7 +558,6 @@ fieldset.collapsed {
 html.js fieldset.collapsed {
   border-width: 1px;
   height: auto;
-  margin-bottom: 10px;
 }
 fieldset fieldset {
   background-color: #fff;
@@ -566,9 +565,6 @@ fieldset fieldset {
 fieldset fieldset fieldset {
   background-color: #f8f8f8;
 }
-html.js fieldset.collapsible .fieldset-wrapper {
-  overflow: visible;
-}
 
 /**
  * Form elements.