diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2013-03-02 14:08:19 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2013-03-02 14:08:19 -0800 |
| commit | d213ef3d3f79819571d42c69a75307dc7e19aaa7 (patch) | |
| tree | 33fe51b75d6e7418d7977317eaba3da74d040dfe | |
| parent | f3d37267861b0cb46e99b6206cf186f330de4ba7 (diff) | |
| parent | b83abf728fcc326d204e73ad7d0016b93e181269 (diff) | |
Merge pull request #175 from shadlaws/fix_1639
#1639 - Make dialog "Cancel" links into buttons like "Submit"
| -rw-r--r-- | lib/gallery.dialog.js | 4 | ||||
| -rw-r--r-- | themes/admin_wind/css/screen.css | 4 | ||||
| -rw-r--r-- | themes/wind/css/screen.css | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js index 8fe85165..1c810171 100644 --- a/lib/gallery.dialog.js +++ b/lib/gallery.dialog.js @@ -96,11 +96,11 @@ 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 g-left">' + MSG_CANCEL + '</a>'; + var eCancel = '<button class="g-cancel ui-state-default ui-corner-all">' + MSG_CANCEL + '</button>'; if ($("#g-dialog .submit").length) { $("#g-dialog .submit").addClass("ui-state-default ui-corner-all"); - $.fn.gallery_hover_init(); $("#g-dialog .submit").parent().append(eCancel); + $.fn.gallery_hover_init(); $("#g-dialog .g-cancel").click(function(event) { $("#g-dialog").dialog("close"); event.preventDefault(); diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 1deb3cda..d5fb70aa 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -994,7 +994,9 @@ div#g-action-status { } #g-dialog .g-cancel { - margin: .59em 1em; + margin: 0 .3em; + float: left; + padding: .2em; } #g-panel { diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 7ef8e2e4..cbeaed34 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -1044,7 +1044,9 @@ div#g-action-status { } #g-dialog .g-cancel { - margin: .59em 1em; + margin: 0 .3em; + float: left; + padding: .2em; } #g-panel { |