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.

6 files changed, 10 insertions, 26 deletions

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();
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index ca2b2752..3c58a282 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -268,7 +268,6 @@ li.g-error select {
   opacity: 0.4;
 }
 
-.g-pager .g-info,
 tr.g-error,
 tr.g-info,
 tr.g-success,
@@ -951,7 +950,6 @@ g-languages-form input {
 }
 
 .rtl .g-left,
-.rtl #g-dialog .g-cancel,
 .rtl form ul ul li,
 .rtl input[type="submit"],
 .rtl input[type="reset"],
diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css
index be6e22be..60abc08d 100644
--- a/themes/wind/css/fix-ie.css
+++ b/themes/wind/css/fix-ie.css
@@ -19,7 +19,7 @@ input.submit {
   width: 110px;
 }
 
-#g-dialog a.g-cancel {
+#g-dialog .g-cancel {
   display: inline-block !important;
   float: none !important;
 }
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 409cbcad..5c65e344 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -234,18 +234,6 @@ li.g-error select {
   margin-top: 1em;
 }
 
-/* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */
-
-form .g-error,
-.g-pager .g-info {
-  background-color: #fff !important;
-}
-
-.g-pager .g-info {
-  background-image: none !important;
-  padding: 0 !important;
-}
-
 /* Inline layout (forms, lists) ~~~~~~~~~~ */
 
 .g-short-form li {
@@ -408,7 +396,7 @@ form .g-error,
 
 #g-content #g-item .g-fullsize-link img {
   display: block;
-  margin: 1em auto !important;
+  margin: 1em auto;
 }
 
 #g-content #g-comments {
@@ -899,7 +887,6 @@ form .g-error,
 }
 
 .rtl .g-left,
-.rtl #g-dialog .g-cancel,
 .rtl form ul ul li,
 .rtl input[type="submit"],
 .rtl input[type="reset"],
diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php
index 2520cb0c..c9c30017 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">
+  <ul class="g-pager g-clearfix">
     <li>
       <? if ($previous_item): ?>
       <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">