From 80bb78fa4ef3fe718cdee56fc98d5584dcd7d5b2 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Fri, 9 Oct 2009 12:07:27 -0600
Subject: Fixed resized photo float issue, added g-clearfix to g-pager on the
 photo view. Tightened up g-pager styles. Removed a few unecessary
 !importants.

---
 lib/gallery.common.css | 13 ++++++-------
 lib/gallery.dialog.js  |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index bb92e409..cc44b663 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -137,11 +137,13 @@ form .g-error {
  **********************************************************************/
 
 .g-left {
+  clear: none;
   float: left;
   margin: 1em 1em 1em 0;
 }
 
 .g-right {
+  clear: none;
   float: right;
   margin: 1em 0 1em 1em;
 }
@@ -256,19 +258,18 @@ form .g-error {
 /* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .g-pager {
-  clear: both;
-  margin: 0;
-  padding: 5px 0 !important;
+  padding: 5px 0;
   width: 100%;
 }
 
 .g-pager li {
   float: left;
-  margin: 0;
   width: 30%;
 }
 
 .g-pager .g-info {
+  background: none;
+  padding: .2em 0;
   text-align: center;
   width: 40%;
 }
@@ -309,9 +310,7 @@ form .g-error {
 }
 
 #g-dialog .g-cancel {
-  clear: none;
-  float: left;
-  margin: .3em 1em;
+  margin: .4em 1em;
 }
 
 /** *******************************************************************
diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index c162ab2a..89470519 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -73,7 +73,7 @@
      form_loaded: function(event, ui) {
        // Should be defined (and localized) in the theme
        MSG_CANCEL = MSG_CANCEL || 'Cancel';
-       var eCancel = '<a href="#" class="g-cancel">' + MSG_CANCEL + '</a>';
+       var eCancel = '<a href="#" class="g-cancel g-left">' + MSG_CANCEL + '</a>';
        if ($("#g-dialog .submit").length) {
          $("#g-dialog .submit").addClass("ui-state-default ui-corner-all");
          $.fn.gallery_hover_init();
-- 
cgit v1.2.3