summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-08-04 11:30:02 +0200
committerThomas Bruederli <thomas@roundcube.net>2012-08-04 11:32:08 +0200
commitd0fe4b55519f12d61249e0c552d684a7edea0a93 (patch)
treeabfe0a51564ab0ad01f3f52cb10adc67da95fb19
parent713ae03bf4ba9aec572fe004f105c4eb967d2722 (diff)
Fix jQuery UI Larry theme (#1488533)
-rw-r--r--plugins/jqueryui/jqueryui.php10
-rwxr-xr-xplugins/jqueryui/themes/larry/jquery-ui-1.8.18.custom.css3
2 files changed, 12 insertions, 1 deletions
diff --git a/plugins/jqueryui/jqueryui.php b/plugins/jqueryui/jqueryui.php
index f82a149b8..5a0cfbd47 100644
--- a/plugins/jqueryui/jqueryui.php
+++ b/plugins/jqueryui/jqueryui.php
@@ -35,6 +35,16 @@ class jqueryui extends rcube_plugin
$this->include_stylesheet("themes/larry/jquery-ui-$version.custom.css");
}
+ if ($ui_theme == 'larry') {
+ // patch dialog position function in order to fully fit the close button into the window
+ $rcmail->output->add_script("jQuery.extend(jQuery.ui.dialog.prototype.options.position, {
+ using: function(pos) {
+ var topOffset = $(this).css(pos).offset().top - 12;
+ if (topOffset < 0) $(this).css('top', pos.top - topOffset);
+ }
+ });", 'foot');
+ }
+
// jquery UI localization
$jquery_ui_i18n = $rcmail->config->get('jquery_ui_i18n', array('datepicker'));
if (count($jquery_ui_i18n) > 0) {
diff --git a/plugins/jqueryui/themes/larry/jquery-ui-1.8.18.custom.css b/plugins/jqueryui/themes/larry/jquery-ui-1.8.18.custom.css
index e2737f5b2..b51fb9571 100755
--- a/plugins/jqueryui/themes/larry/jquery-ui-1.8.18.custom.css
+++ b/plugins/jqueryui/themes/larry/jquery-ui-1.8.18.custom.css
@@ -56,7 +56,7 @@
.ui-widget { font-family: Lucida Grande,Verdana,Arial,sans-serif; font-size: 1.0em; }
.ui-widget .ui-widget { font-size: 1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Lucida Grande,Verdana,Arial,sans-serif; font-size: 1em; }
-.ui-widget-content { border: 0; background: #fafafa url(images/ui-bg_highlight-soft_75_fafafa_1x100.png) 50% top repeat-x; color: #333; }
+.ui-widget-content { border: 1px solid #aaa; background: #fafafa url(images/ui-bg_highlight-soft_75_fafafa_1x100.png) 50% top repeat-x; color: #333; }
/*.ui-widget-content a { color: #333; }*/
.ui-widget-header { border: 2px solid #fafafa; background: #e4e4e4 url(images/ui-bg_highlight-soft_90_e4e4e4_1x100.png) 50% 50% repeat-x; color: #666666; font-weight: bold; }
.ui-widget-header a { color: #aaaaaa; }
@@ -505,6 +505,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
* http://docs.jquery.com/UI/Dialog#theming
*/
.ui-dialog { position: absolute; padding: 3px; width: 300px; background: #fff; border-radius:6px; box-shadow: 1px 1px 18px #666; -moz-box-shadow: 1px 1px 12px #666; -webkit-box-shadow: #666 1px 1px 12px; }
+.ui-dialog .ui-widget-content { border: 0 }
.ui-dialog .ui-dialog-titlebar { padding: 15px 1em 8px 1em; position: relative; border: 0; border-radius: 5px 5px 0 0; }
.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; font-size: 1.3em; text-shadow: 1px 1px 1px #fff; }
.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: -15px; top: -15px; margin:0; width: 30px; height: 30px; z-index:99999; }