From 12e69ce13dde67fbe4851b85bf50c1b21a5788e1 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 23 Jun 2013 12:22:46 +0200
Subject: Fix lack of space between searchfiler and quicksearchbar in Larry
 skin (#1489158)

---
 CHANGELOG              |  1 +
 skins/larry/styles.css |  2 ++
 skins/larry/ui.js      | 14 ++++++--------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7c759dbe3..27b7db342 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix lack of space between searchfiler and quicksearchbar in Larry skin (#1489158)
 - Fix so valid and set date.timezone is not required by installer checks (#1489180)
 - Canonize boolean ini_get() results (#1489189)
 - Cache LDAP's user_specific search and use vlv for better performance (#1489186)
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 8ddbb5960..9e61a7191 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -1862,6 +1862,7 @@ select.decorated {
 	filter: alpha(opacity=0);
 	-khtml-appearance: none;
 	-webkit-appearance: none;
+	border: 0;
 }
 
 html.opera select.decorated {
@@ -1877,6 +1878,7 @@ select.decorated option {
 	text-shadow: 0px 1px 1px #333;
 	padding: 4px 6px;
 	outline: none;
+	cursor: default;
 }
 
 
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 38d8539c7..ccc9cef67 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -221,6 +221,7 @@ function rcube_mail_ui()
       }
 
       var select = $(this),
+        parent = select.parent(),
         height = Math.max(select.height(), 26) - 2,
         width = select.width() - 22,
         title = $('option', this).first().text();
@@ -235,18 +236,15 @@ function rcube_mail_ui()
 
       overlay.children().width(width).height(height).css('line-height', (height - 1) + 'px');
 
-      select.change(function() {
-          var val = $('option:selected', this).text();
-          $(this).next().children().html(val);
-        });
-
-      var parent = select.parent();
       if (parent.css('position') != 'absolute')
         parent.css('position', 'relative');
 
       // re-set original select width to fix click action and options width in some browsers
-      if (!bw.mz)
-        select.width(overlay.width());
+      select.width(overlay.width())
+        .change(function() {
+          var val = $('option:selected', this).text();
+          $(this).next().children().text(val);
+        });
     });
 
     $(document.body)
-- 
cgit v1.2.3