aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2010-12-20 18:22:11 +0100
committerFelix Nagel <info@felixnagel.com>2010-12-20 18:22:11 +0100
commita7c1d8c357ebc91aaca60914eda4afdc28be1b64 (patch)
treead728ce8681ca77bfe32f587fa7a5f0c2a77b2c0
parentecbf017f0d69e2556fe18a8bfb4fcd52c6c6b944 (diff)
downloadjquery-ui-a7c1d8c357ebc91aaca60914eda4afdc28be1b64.tar.gz
jquery-ui-a7c1d8c357ebc91aaca60914eda4afdc28be1b64.zip
added: display-inline (selectmenus side-by-side) support for modern browsers, works for all but FF2, see https://github.com/fnagel/jquery-ui/issues#issue/20
changed: height of the widget to match jQuery UI button height fixed: small margin issue for background image example
-rw-r--r--demos/selectmenu/background_image.html3
-rw-r--r--themes/base/jquery.ui.selectmenu.css8
2 files changed, 6 insertions, 5 deletions
diff --git a/demos/selectmenu/background_image.html b/demos/selectmenu/background_image.html
index 9a9913438..c34afc0cf 100644
--- a/demos/selectmenu/background_image.html
+++ b/demos/selectmenu/background_image.html
@@ -19,6 +19,7 @@
fieldset { border:0; }
label,select,.ui-select-menu { float: left; margin-right: 10px; }
select { width: 200px; }
+ .ui-selectmenu-menu li a, .ui-selectmenu-status { padding: 0.3em 2em; }
/* select with custom icons */
body a.customicons { height: 2.8em;}
@@ -29,7 +30,7 @@
body .rss .ui-selectmenu-item-icon { background: url(images/24-rss-square.png) 0 0 no-repeat; }
/* select with CSS avatar icons */
- option.css-avatar { background-repeat: no-repeat !important; padding-left: 20px;}
+ option.css-avatar { background-repeat: no-repeat !important; padding-left: 20px; }
/* select with big avatar icons */
a.avatar-big { height: 5em; }
diff --git a/themes/base/jquery.ui.selectmenu.css b/themes/base/jquery.ui.selectmenu.css
index 15c0e3237..6e1deaf08 100644
--- a/themes/base/jquery.ui.selectmenu.css
+++ b/themes/base/jquery.ui.selectmenu.css
@@ -1,22 +1,22 @@
/* Selectmenu
----------------------------------*/
-.ui-selectmenu { display: block; position:relative; height:2em; text-decoration: none; overflow:hidden;}
+.ui-selectmenu { display: block; display: inline-block; position: relative; height: 2.2em; text-decoration: none; overflow: hidden; zoom: 1; }
.ui-selectmenu-icon { position:absolute; right:6px; margin-top:-8px; top: 50%; }
.ui-selectmenu-menu { padding:0; margin:0; list-style:none; position:absolute; top: 0; visibility: hidden; overflow: auto; z-index: 1005;} /* z-index: 1005 to make selectmenu work with dialog */
.ui-selectmenu-open { visibility: visible; }
.ui-selectmenu-menu-popup { margin-top: -1px; }
.ui-selectmenu-menu-dropdown { }
.ui-selectmenu-menu li { padding:0; margin:0; display: block; border-top: 1px dotted transparent; border-bottom: 1px dotted transparent; border-right-width: 0 !important; border-left-width: 0 !important; font-weight: normal !important; }
-.ui-selectmenu-menu li a,.ui-selectmenu-status {line-height: 1.4em; display:block; padding:.3em 1em; outline:none; text-decoration:none; }
+.ui-selectmenu-menu li a,.ui-selectmenu-status { line-height: 1.4em; display: block; padding: .4em 1em; outline:none; text-decoration:none; }
.ui-selectmenu-menu li.ui-selectmenu-hasIcon a,
.ui-selectmenu-hasIcon .ui-selectmenu-status { padding-left: 20px; position: relative; margin-left: 5px; }
.ui-selectmenu-menu li .ui-icon, .ui-selectmenu-status .ui-icon { position: absolute; top: 1em; margin-top: -8px; left: 0; }
.ui-selectmenu-status { line-height: 1.4em; }
-.ui-selectmenu-open li.ui-selectmenu-item-focus a { }
+.ui-selectmenu-open li.ui-selectmenu-item-focus a { }
.ui-selectmenu-open li.ui-selectmenu-item-selected { }
.ui-selectmenu-menu li span,.ui-selectmenu-status span { display:block; margin-bottom: .2em; }
.ui-selectmenu-menu li .ui-selectmenu-item-header { font-weight: bold; }
-.ui-selectmenu-menu li .ui-selectmenu-item-content { }
+.ui-selectmenu-menu li .ui-selectmenu-item-content { }
.ui-selectmenu-menu li .ui-selectmenu-item-footer { opacity: .8; }
/*for optgroups*/
.ui-selectmenu-menu .ui-selectmenu-group { font-size: 1em; }