From b4cdd016dc97f2df608bb14d2088cb4ddbd32c35 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 24 Apr 2011 11:53:29 -0400
Subject: Third times the charm. Rethink unordered lists and bullets. Revert to
 turning them off by default and provide a new class, g-text, to define a list
 or a section of text as needing to display bullets.

---
 modules/g2_import/views/admin_g2_import.html.php   |  4 ++--
 modules/gallery/views/admin_block_welcome.html.php |  2 +-
 themes/admin_wind/css/screen.css                   | 17 ++---------------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index cf5e4755..2f4a1b28 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -112,8 +112,8 @@ $("document").ready(function() {
       </p>
       <? endif ?>
     </div>
-    <div id="g-admin-g2-import-notes">
-      <ul class="enumeration">
+    <div id="g-admin-g2-import-notes" class="g-text">
+      <ul>
         <li>
           <?= t("Gallery 3 does not support per-user / per-item permissions.  <b>Review permissions!</b>") ?>
         </li>
diff --git a/modules/gallery/views/admin_block_welcome.html.php b/modules/gallery/views/admin_block_welcome.html.php
index d8c96187..d3765d19 100644
--- a/modules/gallery/views/admin_block_welcome.html.php
+++ b/modules/gallery/views/admin_block_welcome.html.php
@@ -2,7 +2,7 @@
 <p>
   <?= t("This is your administration dashboard and it provides a quick overview of status messages, recent updates, and frequently used options. Add or remove blocks and rearrange them to tailor to your needs. The admin menu provides quick access to all of Gallery 3's options and settings. Here are a few of the most used options to get you started.") ?>
 </p>
-<ul>
+<ul class="g-text">
   <li>
     <?= t("General Settings - choose your <a href=\"%graphics_url\">graphics</a> and <a href=\"%language_url\">language</a> settings.",
           array("graphics_url" => html::mark_clean(url::site("admin/graphics")),
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index f01c2a94..6f1c0962 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -92,25 +92,12 @@ a:hover,
 
 /* Lists ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#g-content ul li {
+ul.g-text li,
+.g-text ul li {
   list-style-type: disc;
   margin-left: 1em;
 }
 
-form ul li,
-#g-action-status li,
-#g-log-entries li,
-#g-tag-admin 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 {
-- 
cgit v1.2.3


From ce5a2532ebcd5131056df908d2da831e91407e9d Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 24 Apr 2011 13:41:12 -0400
Subject: Extend .g-text list styles to ordered lists to admin_wind theme. Add
 .g-text list styles to wind theme.

---
 themes/admin_wind/css/screen.css |  9 +++++++++
 themes/wind/css/screen.css       | 17 +++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 6f1c0962..d67850ec 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -95,6 +95,15 @@ a:hover,
 ul.g-text li,
 .g-text ul li {
   list-style-type: disc;
+}
+
+ol.g-text li,
+.g-text ol li {
+  list-style-type: decimal;
+}
+
+.g-text li,
+.g-text li {
   margin-left: 1em;
 }
 
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index b470ab1c..81231426 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -111,6 +111,23 @@ a:hover,
   padding-left: 32px;
 }
 
+/* Lists ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+ul.g-text li,
+.g-text ul li {
+  list-style-type: disc;
+}
+
+ol.g-text li,
+.g-text ol li {
+  list-style-type: decimal;
+}
+
+.g-text li,
+.g-text li {
+  margin-left: 1em;
+}
+
 /* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 form {
-- 
cgit v1.2.3


From f4d76a8abe04612efe01f146617d760ffdd4b69f Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 24 Apr 2011 13:56:39 -0400
Subject: Don't put the Admin > Theme Options Save button in a fieldset.

---
 modules/gallery/controllers/admin_theme_options.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php
index a968a56d..d9323ea0 100644
--- a/modules/gallery/controllers/admin_theme_options.php
+++ b/modules/gallery/controllers/admin_theme_options.php
@@ -108,7 +108,6 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
 
     module::event("theme_edit_form", $form);
 
-    $group = $form->group("buttons");
     $group->submit("")->value(t("Save"));
     return $form;
   }
-- 
cgit v1.2.3


From 8e7a8fd2dc3245c2d236a2cd33d8c1a61ef9963c Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 24 Apr 2011 14:09:03 -0400
Subject: Add a bit of space below progress bars. Fixes #1703.

---
 themes/admin_wind/css/screen.css | 2 +-
 themes/wind/css/screen.css       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index d67850ec..a26bf6d2 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -896,7 +896,7 @@ button {
 .g-progress-bar {
   height: 1em;
   width: 100%;
-  margin-top: .5em;
+  margin: .5em 0;
   display: inline-block;
 }
 
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 81231426..d6909364 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -945,7 +945,7 @@ button {
 .g-progress-bar {
   height: 1em;
   width: 100%;
-  margin-top: .5em;
+  margin: .5em 0;
   display: inline-block;
 }
 
-- 
cgit v1.2.3