diff options
| author | Jouni Koivuviita <jouni.koivuviita@itmill.com> | 2009-11-08 20:17:30 +0000 |
|---|---|---|
| committer | Jouni Koivuviita <jouni.koivuviita@itmill.com> | 2009-11-08 20:17:30 +0000 |
| commit | 2b8e8c3f8f0853753fa904a53bb8e38a7aa5736a (patch) | |
| tree | 054591e03d8ebbfbfe8cf03fb65e72e2bdf07ecd /WebContent/VAADIN/themes/reindeer/menubar | |
| parent | b3261ba509f9b0ca2c4f7fa422e48225a6e033df (diff) | |
| download | vaadin-framework-2b8e8c3f8f0853753fa904a53bb8e38a7aa5736a.tar.gz vaadin-framework-2b8e8c3f8f0853753fa904a53bb8e38a7aa5736a.zip | |
MenuBar fixes:
* Fixes #2849: Deprecate MenuBar.setSubmenuIcon method, and provide the same functionality via CSS
* Fixes #2821: Sumbenu icon is not aligned with the menu item's text
* Fixes #3482: MenuItem: Subitem is wrongly marked as selected
Deprecated setCollapse method at the same time, redundant method (the feature should always be enabled).
svn changeset:9675/svn branch:6.2
Diffstat (limited to 'WebContent/VAADIN/themes/reindeer/menubar')
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/menubar/menubar.css | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css index a5090003cd..ae156fa596 100644 --- a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css +++ b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css @@ -7,12 +7,13 @@ text-shadow: rgba(0,0,0,.9) 0 1px 0; } .v-menubar table { - margin-left: 8px; + margin: 0 8px; height: 23px; } .v-menubar .menuitem { padding: 3px 8px; height: 17px; + line-height: 16px; } .v-menubar-submenu { background: #f8f8f9; @@ -27,6 +28,7 @@ .v-menubar-submenu .menuitem { padding: 1px 15px 1px 10px; height: 16px; + line-height: 16px; } .v-menubar .menuitem-selected, .v-menubar-submenu .menuitem-selected { @@ -38,11 +40,16 @@ .v-menubar .menuitem-selected { background-image: url(img/menu-sel-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */ } - -/* Submenu icon (remove after #2849 is fixed) */ -.v-menubar-submenu .menuitem img[align="right"] { - margin-right: -15px; -} -.v-ie .v-menubar-submenu .menuitem img[align="right"] { - margin-top: -14px; +.v-menubar-submenu .v-menubar-submenu-indicator { + background: transparent url(img/submenu-icon.png) no-repeat right 50%; + display: inline; + display: inline-block; + zoom: 1; + width: 16px; + margin: 0 -15px 0 5px; + text-indent: -999px; + vertical-align: middle; +} +.v-menubar-submenu .menuitem-selected .v-menubar-submenu-indicator { + background-image: url(img/submenu-icon-hover.png); }
\ No newline at end of file |