Merge branch 'master' of git@github.com:gallery/gallery3

gallery · Aug 30, 2009 · eca8a36 · eca8a36
2 parents 4bc7165 + c9d2e22
commit eca8a36
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
@@ -76,6 +76,7 @@
        var eCancel = '<a href="#" class="gCancel">' + MSG_CANCEL + '</a>';
        if ($("#gDialog .submit").length) {
          $("#gDialog .submit").addClass("ui-state-default ui-corner-all");
+         $.fn.gallery_hover_init();
          $("#gDialog .submit").parent().append(eCancel);
          $("#gDialog .gCancel").click(function(event) {
            $("#gDialog").dialog("close");

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
@@ -308,7 +308,7 @@ li.gError select {
 
 .gError {
   background-color: #f6cbca;
-  color: #fc0;
+  color: #f00;
   background-image: url('../images/ico-error.png');
 }