From 7a5168238338077925dbfb82b3e541863cea35dd Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Thu, 15 Oct 2009 21:21:32 -0600
Subject: Removed final two specific clear fixes for the developer module and
 the admin theme's main menu.

---
 lib/gallery.common.css | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index cc44b663..264d3c2e 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -315,14 +315,9 @@ form .g-error {
 
 /** *******************************************************************
  * 6) Browser hacks
- *    @todo Insert .g-clearfix in context of specific selectors 
- *          listed then delete them
  *********************************************************************/
 
-.g-clearfix:after,
-#g-site-admin-menu:after,
-#g-module-create-form ul li ul:after,
-#g-developer-tools:after {
+.g-clearfix:after {
   clear: both;
   content: ".";
   display: block;
-- 
cgit v1.2.3


From 99db7e274818e4c3331cf55aba1d8a47d6ab8dde Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Fri, 16 Oct 2009 01:35:05 -0600
Subject: Remove bg icons when an <li> in a form is tagged with g-error, etc.
 Minor consistency updates for form layout styles in views and dialogs.

---
 lib/gallery.common.css     | 13 ++++++++++++-
 themes/wind/css/screen.css |  6 +++---
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 264d3c2e..b8d1eae9 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -62,7 +62,15 @@
 .g-info,
 .g-success,
 .g-warning {
-  padding: .4em .5em .4em 30px;
+  padding-left: 30px;
+}
+
+form li.g-error,
+form li.g-info,
+form li.g-success,
+form li.g-warning {
+  background-image: none;
+  padding: .3em .8em .3em 1em;
 }
 
 .g-error, 
@@ -212,6 +220,7 @@ form .g-error {
 
 #g-site-status li {
   border-bottom: 1px solid #ccc;
+  padding: .3em .3em .3em 30px;
 }
 
 .g-module-status {
@@ -290,6 +299,8 @@ form .g-error {
 
 #g-dialog fieldset {
   border: none;
+  padding: 0 !important;
+  width: 99%;
 }
 
 #g-dialog legend {
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index ab3730c7..cae472be 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -122,7 +122,7 @@ td {
 
 fieldset {
   border: 1px solid #ccc;
-  padding-bottom: .8em;
+  padding: .8em 1em !important;
 }
 
 #g-banner fieldset,
@@ -133,7 +133,7 @@ fieldset {
 
 legend {
   font-weight: bold;
-  margin-left: 1em;
+  margin-left: .8em;
 }
 
 #g-banner legend,
@@ -178,7 +178,7 @@ option:focus {
 
 form li {
   margin: 0 !important;
-  padding: .3em 1.5em .3em 1em;
+  padding: .3em 0;
 }
 
 form ul ul {
-- 
cgit v1.2.3


From f2b6ec6637c130044cc08ff186433f10ad2f3839 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 17 Oct 2009 12:48:54 -0600
Subject: Move tag css from theme to the module. Introduced generic .g-inline
 class for inline elements, including lists and forms.

---
 lib/gallery.common.css                |  4 +-
 modules/tag/helpers/tag.php           |  2 +-
 modules/tag/helpers/tag_theme.php     |  1 +
 modules/tag/js/tag.js                 | 22 +++++------
 modules/tag/views/admin_tags.html.php |  8 ++--
 themes/admin_wind/css/screen.css      | 53 +-------------------------
 themes/wind/css/screen.css            | 70 +----------------------------------
 7 files changed, 22 insertions(+), 138 deletions(-)

(limited to 'lib')

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index b8d1eae9..23262087 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -283,7 +283,9 @@ form .g-error {
   width: 40%;
 }
 
-.g-list-horizontal {
+.g-inline * {
+  float: left;
+  margin-right: .4em;
 }
 
 /* Dialogs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index a2104e9d..b1d79458 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -111,7 +111,7 @@ class tag_Core {
   }
 
   static function get_rename_form($tag) {
-    $form = new Forge("admin/tags/rename/$tag->id", "", "post", array("id" => "g-rename-tag-form"));
+    $form = new Forge("admin/tags/rename/$tag->id", "", "post", array("id" => "g-edit-tag-form", "class" => "g-short-form"));
     $group = $form->group("rename_tag")->label(t("Rename Tag"));
     $group->input("name")->label(t("Tag name"))->value($tag->name)->rules("required|length[1,64]");
     $group->inputs["name"]->error_messages("in_use", t("There is already a tag with that name"));
diff --git a/modules/tag/helpers/tag_theme.php b/modules/tag/helpers/tag_theme.php
index 4f22d2ac..e3743824 100644
--- a/modules/tag/helpers/tag_theme.php
+++ b/modules/tag/helpers/tag_theme.php
@@ -21,6 +21,7 @@ class tag_theme_Core {
   static function head($theme) {
     $theme->css("jquery.autocomplete.css");
     $theme->script("jquery.autocomplete.js");
+    $theme->css("tag.css");
     $theme->script("tag.js");
   }
 
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index e2e6b782..17845272 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -8,8 +8,8 @@ function ajaxify_tag_form() {
     success: function(data) {
       if (data.result == "success") {
         $.get($("#g-tag-cloud").attr("title"), function(data, textStatus) {
-	  $("#g-tag-cloud").html(data);
-	});
+          $("#g-tag-cloud").html(data);
+        });
       }
       $("#g-tag form").resetForm();
     }
@@ -18,10 +18,10 @@ function ajaxify_tag_form() {
 
 function closeEditInPlaceForms() {
   // closes currently open inplace edit forms
-  if ($("#g-rename-tag-form").length) {
+  if ($("#g-edit-tag-form").length) {
     $("#g-edit-error-message").remove();
-    var li = $("#g-rename-tag-form").parent();
-    $("#g-rename-tag-form").parent().html($("#g-rename-tag-form").parent().data("revert"));
+    var li = $("#g-edit-tag-form").parent();
+    $("#g-edit-tag-form").parent().html($("#g-edit-tag-form").parent().data("revert"));
     li.height("");
     $(".g-editable", li).bind("click", editInPlace);
     $(".g-dialog-link", li).gallery_dialog();
@@ -41,7 +41,7 @@ function editInPlace(element) {
   var tag_name = $(this).html();
   var tag_width = $(this).width();
   $(this).parent().data("revert", $(this).parent().html());
-  var form = '<form id="g-rename-tag-form" method="post" class="ui-helper-clearfix" ';
+  var form = '<form id="g-edit-tag-form" method="post" class="g-inline ui-helper-clearfix" ';
   form += 'action="' + TAG_RENAME_URL.replace('__ID__', tag_id) + '">';
   form += '<input name="csrf" type="hidden" value="' + csrf_token + '" />';
   form += '<input id="name" name="name" type="text" class="textbox" value="' +
@@ -52,14 +52,14 @@ function editInPlace(element) {
 
   // add edit form
   $(this).parent().html(form);
-  $("#g-rename-tag-form #name")
+  $("#g-edit-tag-form #name")
     .width(tag_width+30)
     .focus();
-  //$("#g-rename-tag-form").parent().height( $("#g-rename-tag-form").height() );
-  $("#g-rename-tag-form a").bind("click", closeEditInPlaceForms);
+  //$("#g-edit-tag-form").parent().height( $("#g-edit-tag-form").height() );
+  $("#g-edit-tag-form a").bind("click", closeEditInPlaceForms);
 
   ajaxify_editInPlaceForm = function() {
-    $("#g-rename-tag-form").ajaxForm({
+    $("#g-edit-tag-form").ajaxForm({
       dataType: "json",
       success: function(data) {
         if (data.result == "success") {
@@ -68,7 +68,7 @@ function editInPlace(element) {
           console.log(data);
           window.location.reload();
         } else if (data.result == "error") {
-          $("#g-rename-tag-form #name")
+          $("#g-edit-tag-form #name")
             .addClass("g-error")
             .focus();
           $("#g-tag-admin").before("<p id=\"g-edit-error-message\" class=\"g-error\">" + data.message + "</p>");
diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index 27813a91..edc466bb 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -3,8 +3,8 @@
   var TAG_RENAME_URL = <?= html::js_string(url::site("admin/tags/rename/__ID__")) ?>;
   $("document").ready(function() {
     // using JS for adding link titles to avoid running t() for each tag
-    $("#g-tag-admin .tag-name").attr("title", <?= t("Click to edit this tag")->for_js() ?>);
-    $("#g-tag-admin .delete-link").attr("title", $(".delete-link:first span").html());
+    $("#g-tag-admin .g-tag-name").attr("title", <?= t("Click to edit this tag")->for_js() ?>);
+    $("#g-tag-admin .g-delete-link").attr("title", $(".g-delete-link:first span").html());
 
     // In-place editing for tag admin
     $(".g-editable").bind("click", editInPlace);
@@ -47,10 +47,10 @@
           <? endif ?>
 
           <li>
-            <span id="g-tag-<?= $tag->id ?>" class="g-editable tag-name"><?= html::clean($tag->name) ?></span>
+            <span id="g-tag-<?= $tag->id ?>" class="g-editable g-tag-name"><?= html::clean($tag->name) ?></span>
             <span class="g-understate">(<?= $tag->count ?>)</span>
             <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>"
-               class="g-dialog-link delete-link g-button">
+               class="g-dialog-link g-delete-link g-button">
                 <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a>
           </li>
 
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 331f7f4c..78358e84 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -582,8 +582,7 @@ li.g-default-group h4, li.g-default-group .g-user {
  * 5) Navigation and menus
  *********************************************************************/
 
-#g-site-admin-menu,
-#g-tag-cloud ul {
+#g-site-admin-menu {
   font-size: 1.2em;
 }
 
@@ -790,27 +789,6 @@ li.g-default-group h4, li.g-default-group .g-user {
   list-style-type: disc;
 }
 
-#g-tag-admin {
-  table-layout: fixed;
-}
-
-#g-tag-admin td {
-  border: 0;
-}
-
-#g-tag-admin ul {
-  padding-bottom: .3em;
-}
-
-#g-tag-admin li {
-  padding: .1em 0 .2em .3em;
-}
-
-#g-tag-admin .g-column {
-  float: left;
-  width: 200px;
-}
-
 .g-editable {
   padding: .1em .3em .2em .3em;
 }
@@ -820,32 +798,6 @@ li.g-default-group h4, li.g-default-group .g-user {
   cursor: text;
 }
 
-#g-rename-tag-form input {
-  padding: 0 .2em 0 .2em;
-  clear: none;
-  float: left;
-  margin: 0 .2em 0 0;
-}
-
-#g-rename-tag-form input[type="text"].g-error {
-  border: 2px solid red;
-  background: none;
-}
-
-#g-rename-tag-form input[type="submit"] {
-  height: 25px;
-}
-
-#g-rename-tag-form a, #g-rename-tag-form span {
-  display: block;
-  float: left;
-  padding: .2em .2em 0 .1em;
-}
-
-#g-rename-tag-form span {
-  float: right;
-}
-
 #g-task-log-dialog h1 {
   font-size: 1.1em;
 }
@@ -964,9 +916,6 @@ li.g-default-group h4, li.g-default-group .g-user {
 .rtl .g-available .g-block img,
 .rtl #g-content #g-photo-stream .g-item,
 .rtl li.g-group,
-.rtl #g-tag-admin .g-column,
-.rtl #g-rename-tag-form input,
-.rtl #g-rename-tag-form a,
 .rtl #g-server-add-admin,
 .rtl .ui-icon-left .ui-icon {
   float: right;
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index cae472be..36231b0d 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -467,8 +467,7 @@ li.g-error select {
  * 5) Navigation and menus
  *********************************************************************/
 
-#g-site-menu,
-#g-tag-cloud ul {
+#g-site-menu {
   font-size: 1.2em;
 }
 
@@ -566,73 +565,6 @@ li.g-error select {
   background-image: url('../images/ico-print.png');
 }
 
-/* Tags and cloud ~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#g-tag-cloud ul {
-  text-align: justify;
-}
-
-#g-tag-cloud ul li {
-  display: inline;
-  line-height: 1.5em;
-  text-align: justify;
-}
-
-#g-tag-cloud ul li a {
-  text-decoration: none;
-}
-
-#g-tag-cloud ul li span {
-  display: none;
-}
-
-#g-tag-cloud ul li.size1 a {
-  color: #9cf;
-  font-size: 80%;
-  font-weight: 100;
-}
-
-#g-tag-cloud ul li.size2 a {
-  color: #69f;
-  font-size: 90%;
-  font-weight: 300;
-}
-
-#g-tag-cloud ul li.size3 a {
-  color: #69c;
-  font-size: 100%;
-  font-weight: 500;
-}
-
-#g-tag-cloud ul li.size4 a {
-  color: #369;
-  font-size: 110%;
-  font-weight: 700;
-}
-
-#g-tag-cloud ul li.size5 a {
-  color: #0e2b52;
-  font-size: 120%;
-  font-weight: 900;
-}
-
-#g-tag-cloud ul li.size6 a {
-  color: #0e2b52;
-  font-size: 130%;
-  font-weight: 900;
-}
-
-#g-tag-cloud ul li.size7 a {
-  color: #0e2b52;
-  font-size: 140%;
-  font-weight: 900;
-}
-
-#g-tag-cloud ul li a:hover {
-  color: #f30;
-  text-decoration: underline;
-}
-
 #g-welcome-message p {
   padding-bottom: 1em;
 }
-- 
cgit v1.2.3


From ad0497a8d2956a73d174445a30d9190b1f970caf Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 17 Oct 2009 12:58:31 -0600
Subject: Drop our g-clearfix in favor of using jQuery UI's ui-helper-clearfix.

---
 lib/gallery.common.css                        | 13 -------------
 modules/comment/views/admin_comments.html.php |  2 +-
 modules/gallery/views/admin_themes.html.php   |  8 ++++----
 modules/user/views/admin_users.html.php       |  2 +-
 themes/admin_wind/css/fix-ie.css              |  2 +-
 themes/admin_wind/views/admin.html.php        |  2 +-
 themes/night_wind/css/fix-ie.css              |  2 +-
 themes/night_wind/views/album.html.php        |  2 +-
 themes/night_wind/views/page.html.php         |  2 +-
 themes/night_wind/views/pager.html.php        |  2 +-
 themes/night_wind/views/photo.html.php        |  2 +-
 themes/night_wind/views/sidebar.html.php      |  2 +-
 themes/wind/css/fix-ie.css                    |  2 +-
 themes/wind/views/album.html.php              |  2 +-
 themes/wind/views/page.html.php               |  2 +-
 themes/wind/views/pager.html.php              |  2 +-
 themes/wind/views/photo.html.php              |  2 +-
 themes/wind/views/sidebar.html.php            |  2 +-
 18 files changed, 20 insertions(+), 33 deletions(-)

(limited to 'lib')

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 23262087..74a9642f 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -7,7 +7,6 @@
  *  3)  States and interactions
  *  4)  Positioning and order
  *  5)  Containers/widgets
- *  6)  Browser hacks
  */
 
 /** *******************************************************************
@@ -325,15 +324,3 @@ form .g-error {
 #g-dialog .g-cancel {
   margin: .4em 1em;
 }
-
-/** *******************************************************************
- * 6) Browser hacks
- *********************************************************************/
-
-.g-clearfix:after {
-  clear: both;
-  content: ".";
-  display: block;
-  height: 0;
-  visibility: hidden;
-}
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index e32a843f..8f719f05 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -38,7 +38,7 @@
   <h1> <?= t("Manage Comments") ?> </h1>
 
   <!-- @todo: Highlight active menu option -->
-  <div id="g-admin-comments-menu" class="g-clearfix">
+  <div id="g-admin-comments-menu" class="ui-helper-clearfix">
     <?= $menu ?>
   </div>
 
diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php
index a75d9f04..f7e77a01 100644
--- a/modules/gallery/views/admin_themes.html.php
+++ b/modules/gallery/views/admin_themes.html.php
@@ -14,7 +14,7 @@
 
 <div id="g-site-theme">
   <h2> <?= t("Gallery theme") ?> </h2>
-  <div class="g-block g-selected g-clearfix">
+  <div class="g-block g-selected ui-helper-clearfix">
     <img src="<?= url::file("themes/{$site}/thumbnail.png") ?>"
          alt="<?= html::clean_attribute($themes[$site]->name) ?>" />
     <h3> <?= $themes[$site]->name ?> </h3>
@@ -29,7 +29,7 @@
     <? foreach ($themes as $id => $info): ?>
     <? if (!$info->site) continue ?>
     <? if ($id == $site) continue ?>
-    <div class="g-block g-clearfix">
+    <div class="g-block ui-helper-clearfix">
       <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
         <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
              alt="<?= html::clean_attribute($info->name) ?>" />
@@ -52,7 +52,7 @@
 
 <div id="g-admin-theme">
   <h2> <?= t("Admin theme") ?> </h2>
-  <div class="g-block g-selected g-clearfix">
+  <div class="g-block g-selected ui-helper-clearfix">
     <img src="<?= url::file("themes/{$admin}/thumbnail.png") ?>"
          alt="<?= html::clean_attribute($themes[$admin]->name) ?>" />
     <h3> <?= $themes[$admin]->name ?> </h3>
@@ -67,7 +67,7 @@
     <? foreach ($themes as $id => $info): ?>
     <? if (!$info->admin) continue ?>
     <? if ($id == $admin) continue ?>
-    <div class="g-block g-clearfix">
+    <div class="g-block ui-helper-clearfix">
       <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
         <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
              alt="<?= html::clean_attribute($info->name) ?>" />
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index a127bc15..2f8d8673 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -103,7 +103,7 @@
   </div>
 </div>
 
-<div id="g-group-admin" class="g-block g-clearfix">
+<div id="g-group-admin" class="g-block ui-helper-clearfix">
   <a href="<?= url::site("admin/users/add_group_form") ?>"
       class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
       title="<?= t("Create a new group")->for_html_attr() ?>">
diff --git a/themes/admin_wind/css/fix-ie.css b/themes/admin_wind/css/fix-ie.css
index 106fe4a1..fe6e32ab 100644
--- a/themes/admin_wind/css/fix-ie.css
+++ b/themes/admin_wind/css/fix-ie.css
@@ -2,7 +2,7 @@
  * Fix display in IE 6 and 7
  */
 
-.g-clearfix,
+.ui-helper-clearfix,
 #g-group-admin,
 #g-developer-tools {
   zoom: 1;
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index 4ee08d95..b788eb93 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -50,7 +50,7 @@
         <a id="g-logo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
           &larr; <?= t("back to the ...") ?>
         </a>
-        <div id="g-site-admin-menu" class="g-clearfix">
+        <div id="g-site-admin-menu" class="ui-helper-clearfix">
           <?= $theme->admin_menu() ?>
         </div>
         <?= $theme->admin_header_bottom() ?>
diff --git a/themes/night_wind/css/fix-ie.css b/themes/night_wind/css/fix-ie.css
index 60abc08d..c32d2cab 100644
--- a/themes/night_wind/css/fix-ie.css
+++ b/themes/night_wind/css/fix-ie.css
@@ -2,7 +2,7 @@
  * Fix display in IE 6, 7
  */
 
-.g-clearfix {
+.ui-helper-clearfix {
   zoom: 1;
 }
 
diff --git a/themes/night_wind/views/album.html.php b/themes/night_wind/views/album.html.php
index 91646b1e..1163630d 100644
--- a/themes/night_wind/views/album.html.php
+++ b/themes/night_wind/views/album.html.php
@@ -6,7 +6,7 @@
   <div class="g-description"><?= nl2br(html::purify($item->description)) ?></div>
 </div>
 
-<ul id="g-album-grid" class="g-clearfix">
+<ul id="g-album-grid" class="ui-helper-clearfix">
 <? if (count($children)): ?>
   <? foreach ($children as $i => $child): ?>
     <? $item_class = "g-photo"; ?>
diff --git a/themes/night_wind/views/page.html.php b/themes/night_wind/views/page.html.php
index fab4ba9e..c8b08129 100644
--- a/themes/night_wind/views/page.html.php
+++ b/themes/night_wind/views/page.html.php
@@ -76,7 +76,7 @@
     <?= $theme->page_top() ?>
     <div id="doc4" class="yui-t5 g-view">
       <?= $theme->site_status() ?>
-      <div id="g-header" class="g-clearfix">
+      <div id="g-header" class="ui-helper-clearfix">
         <div id="g-banner">
           <?= $theme->header_top() ?>
           <? if ($header_text = module::get_var("gallery", "header_text")): ?>
diff --git a/themes/night_wind/views/pager.html.php b/themes/night_wind/views/pager.html.php
index 2075fd95..337d658f 100644
--- a/themes/night_wind/views/pager.html.php
+++ b/themes/night_wind/views/pager.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? // See http://docs.kohanaphp.com/libraries/pagination ?>
-<ul class="g-pager g-clearfix">
+<ul class="g-pager ui-helper-clearfix">
   <? /* @todo This message isn't easily localizable */
      $from_to_msg = t2("Photo %from_number of %count",
                        "Photos %from_number - %to_number of %count",
diff --git a/themes/night_wind/views/photo.html.php b/themes/night_wind/views/photo.html.php
index c9c30017..b33e2afa 100644
--- a/themes/night_wind/views/photo.html.php
+++ b/themes/night_wind/views/photo.html.php
@@ -15,7 +15,7 @@
 <div id="g-item">
   <?= $theme->photo_top() ?>
 
-  <ul class="g-pager g-clearfix">
+  <ul class="g-pager ui-helper-clearfix">
     <li>
       <? if ($previous_item): ?>
       <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
diff --git a/themes/night_wind/views/sidebar.html.php b/themes/night_wind/views/sidebar.html.php
index 151c6365..cd50fc01 100644
--- a/themes/night_wind/views/sidebar.html.php
+++ b/themes/night_wind/views/sidebar.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?= $theme->sidebar_top() ?>
-<div id="g-view-menu" class="g-buttonset g-clearfix">
+<div id="g-view-menu" class="g-buttonset ui-helper-clearfix">
   <? if ($page_type == "album"):?>
     <?= $theme->album_menu() ?>
   <? elseif ($page_type == "photo") : ?>
diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css
index 60abc08d..c32d2cab 100644
--- a/themes/wind/css/fix-ie.css
+++ b/themes/wind/css/fix-ie.css
@@ -2,7 +2,7 @@
  * Fix display in IE 6, 7
  */
 
-.g-clearfix {
+.ui-helper-clearfix {
   zoom: 1;
 }
 
diff --git a/themes/wind/views/album.html.php b/themes/wind/views/album.html.php
index 91646b1e..1163630d 100644
--- a/themes/wind/views/album.html.php
+++ b/themes/wind/views/album.html.php
@@ -6,7 +6,7 @@
   <div class="g-description"><?= nl2br(html::purify($item->description)) ?></div>
 </div>
 
-<ul id="g-album-grid" class="g-clearfix">
+<ul id="g-album-grid" class="ui-helper-clearfix">
 <? if (count($children)): ?>
   <? foreach ($children as $i => $child): ?>
     <? $item_class = "g-photo"; ?>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index fab4ba9e..c8b08129 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -76,7 +76,7 @@
     <?= $theme->page_top() ?>
     <div id="doc4" class="yui-t5 g-view">
       <?= $theme->site_status() ?>
-      <div id="g-header" class="g-clearfix">
+      <div id="g-header" class="ui-helper-clearfix">
         <div id="g-banner">
           <?= $theme->header_top() ?>
           <? if ($header_text = module::get_var("gallery", "header_text")): ?>
diff --git a/themes/wind/views/pager.html.php b/themes/wind/views/pager.html.php
index 2075fd95..337d658f 100644
--- a/themes/wind/views/pager.html.php
+++ b/themes/wind/views/pager.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? // See http://docs.kohanaphp.com/libraries/pagination ?>
-<ul class="g-pager g-clearfix">
+<ul class="g-pager ui-helper-clearfix">
   <? /* @todo This message isn't easily localizable */
      $from_to_msg = t2("Photo %from_number of %count",
                        "Photos %from_number - %to_number of %count",
diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php
index c9c30017..b33e2afa 100644
--- a/themes/wind/views/photo.html.php
+++ b/themes/wind/views/photo.html.php
@@ -15,7 +15,7 @@
 <div id="g-item">
   <?= $theme->photo_top() ?>
 
-  <ul class="g-pager g-clearfix">
+  <ul class="g-pager ui-helper-clearfix">
     <li>
       <? if ($previous_item): ?>
       <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
diff --git a/themes/wind/views/sidebar.html.php b/themes/wind/views/sidebar.html.php
index 151c6365..cd50fc01 100644
--- a/themes/wind/views/sidebar.html.php
+++ b/themes/wind/views/sidebar.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?= $theme->sidebar_top() ?>
-<div id="g-view-menu" class="g-buttonset g-clearfix">
+<div id="g-view-menu" class="g-buttonset ui-helper-clearfix">
   <? if ($page_type == "album"):?>
     <?= $theme->album_menu() ?>
   <? elseif ($page_type == "photo") : ?>
-- 
cgit v1.2.3