Merge branch 'master' of git://github.com/ckieffer/gallery3 into chad

2 files changed, 25 insertions, 7 deletions

diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index 1094524f..cf5e4755 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -49,7 +49,7 @@ $("document").ready(function() {
     </div>
     <div id="g-admin-g2-import-import">
       <? if (isset($g2_version)): ?>
-      <ul class="enumeration">
+      <ul>
         <li>
           <?= t("Gallery version %version detected", array("version" => $g2_version)) ?>
         </li>
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index c96c5753..177eb1e6 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -26,7 +26,10 @@ body, html {
   font-family: 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
 }
 
-p {
+p,
+#g-content ul,
+#g-content ol,
+#g-content dl {
   margin-bottom: 1em;
 }
 
@@ -87,6 +90,26 @@ a:hover,
   text-decoration: none;
 }
 
+/* Lists ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-content ul li {
+  list-style-type: disc;
+  margin-left: 1em;
+}
+
+form ul li,
+#g-action-status li,
+#g-log-entries li,
+.g-buttonset li,
+.g-buttonset-vertical li,
+.g-paginator li,
+.ui-sortable li,
+.ui-widget-header li {
+  list-style: none !important;
+  margin-left: 0 !important;
+}
+
+
 /* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 form {
@@ -397,11 +420,6 @@ th {
   background-color: #fff;
 }
 
-ul.enumeration li {
-  list-style-type: disc;
-  margin-left: 20px;
-}
-
 /*** ******************************************************************
  * 3) Page layout containers
  *********************************************************************/