From ea6a849b1ff9640d2d923bbbf6bfaf1a2c407851 Mon Sep 17 00:00:00 2001 From: Trevor Parscal Date: Wed, 8 Dec 2010 19:33:12 +0000 Subject: [PATCH] Moved button styles from dialog specific areas to button specific areas to make all buttons look similar. --- .../themes/vector/jquery.ui.button.css | 34 +++++++++++++++++-- .../themes/vector/jquery.ui.dialog.css | 28 +-------------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/resources/jquery.ui/themes/vector/jquery.ui.button.css b/resources/jquery.ui/themes/vector/jquery.ui.button.css index 5aaccf6fcf..874f7bf449 100644 --- a/resources/jquery.ui/themes/vector/jquery.ui.button.css +++ b/resources/jquery.ui/themes/vector/jquery.ui.button.css @@ -29,7 +29,35 @@ input.ui-button { padding: .4em 1em; } /* workarounds */ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */ - - - +body button.ui-button { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + padding: 0.2em 0.6em 0.15em !important; + margin: 0.5em 0 0.5em 0.4em !important; + border: 1px solid #a6a6a6 !important; + background: #f2f2f2 url(images/button-off.png) repeat-x scroll 50% 100% !important; + cursor: pointer; + font-size: 1em; + line-height: 1.4em; + width: auto; + overflow: visible; +} +body button.ui-button:hover { + border-color: #6e7273; + background: #e1e1e1 url(images/button-over.png) repeat-x scroll 50% 100% !important; +} +body button.ui-button:active, +body button.ui-button:focus { + border-color: #707271; + background: #bfbfbf url(images/button-down.png) repeat-x scroll 50% 100% !important; +} +body button.ui-button.disabled { + color: #7f7f7f; + border-color: #cccccc; + background: #f2f2f2 url(images/button-disabled.png) repeat-x scroll 50% 100% !important; +} +/* Disables the annoying dashed border Firefox puts on active buttons */ +body button.ui-button::-moz-focus-inner { + border: 0; +} diff --git a/resources/jquery.ui/themes/vector/jquery.ui.dialog.css b/resources/jquery.ui/themes/vector/jquery.ui.dialog.css index d7333de3b7..c5976da1bd 100644 --- a/resources/jquery.ui/themes/vector/jquery.ui.dialog.css +++ b/resources/jquery.ui/themes/vector/jquery.ui.dialog.css @@ -8,7 +8,7 @@ .ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; } .ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; } .ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } -.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; } +.ui-dialog .ui-dialog-buttonpane button { float: right; } .ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } .ui-draggable .ui-dialog-titlebar { cursor: move; } /* Customizations */ @@ -22,32 +22,6 @@ body .ui-dialog .ui-dialog-content .status-invalid input { body .ui-dialog .ui-dialog-titlebar { padding: 0.9em 1.4em 0.6em !important; } -body .ui-dialog .ui-dialog-buttonpane button { - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - padding: 0.2em 0.6em 0.15em !important; - margin: 0.5em 0 0.5em 0.4em !important; - border: 1px solid #a6a6a6 !important; - background: #f2f2f2 url(images/button-off.png) repeat-x scroll 50% 100% !important; -} -body .ui-dialog .ui-dialog-buttonpane button:hover { - border-color: #6e7273; - background: #e1e1e1 url(images/button-over.png) repeat-x scroll 50% 100% !important; -} -body .ui-dialog .ui-dialog-buttonpane button:active, -body .ui-dialog .ui-dialog-buttonpane button:focus { - border-color: #707271; - background: #bfbfbf url(images/button-down.png) repeat-x scroll 50% 100% !important; -} -body .ui-dialog .ui-dialog-buttonpane button.disabled { - color: #7f7f7f; - border-color: #cccccc; - background: #f2f2f2 url(images/button-disabled.png) repeat-x scroll 50% 100% !important; -} -/* Disables the annoying dashed border Firefox puts on active buttons */ -body .ui-dialog .ui-dialog-buttonpane button::-moz-focus-inner { - border: 0; -} body .ui-dialog .ui-widget-header { background: #f0f0f0 url(images/titlebar-fade.png) repeat-x scroll 50% 100% !important; } -- 2.20.1