diff options
| author | Leif Åstrand <leif@vaadin.com> | 2011-08-10 07:04:37 +0000 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2011-08-10 07:04:37 +0000 |
| commit | 35887c66f84f0ca4f0b5d5803f24bbcc32cca15a (patch) | |
| tree | 7cb57050db06a9e5e709bfa000a5bde783e2c829 /WebContent/VAADIN/themes | |
| parent | a41fbd0e685cc8f63b79805a5171777b2153807f (diff) | |
| download | vaadin-framework-35887c66f84f0ca4f0b5d5803f24bbcc32cca15a.tar.gz vaadin-framework-35887c66f84f0ca4f0b5d5803f24bbcc32cca15a.zip | |
#7187 Allow HTML content in an MenuItem
svn changeset:20245/svn branch:6.7
Diffstat (limited to 'WebContent/VAADIN/themes')
| -rw-r--r-- | WebContent/VAADIN/themes/base/menubar/menubar.css | 2 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/menubar/menubar.css | 2 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/runo/menubar/menubar.css | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/WebContent/VAADIN/themes/base/menubar/menubar.css b/WebContent/VAADIN/themes/base/menubar/menubar.css index 042ec15d1d..8b44085c28 100644 --- a/WebContent/VAADIN/themes/base/menubar/menubar.css +++ b/WebContent/VAADIN/themes/base/menubar/menubar.css @@ -10,7 +10,7 @@ display: inline-block; zoom: 1; } -.v-menubar .v-menubar-menuitem-caption * { +.v-menubar .v-menubar-menuitem-caption .v-icon { vertical-align: middle; white-space: nowrap; } diff --git a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css index e5e337725e..165eacc840 100644 --- a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css +++ b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css @@ -28,7 +28,7 @@ padding: 1px 26px 1px 10px; line-height: 16px; } -.v-menubar-submenu .v-menubar-menuitem-caption * { +.v-menubar-submenu .v-menubar-menuitem-caption .v-icon { vertical-align: middle; } .v-menubar .v-menubar-menuitem-selected, diff --git a/WebContent/VAADIN/themes/runo/menubar/menubar.css b/WebContent/VAADIN/themes/runo/menubar/menubar.css index 7c1a4036b3..91cf78189d 100644 --- a/WebContent/VAADIN/themes/runo/menubar/menubar.css +++ b/WebContent/VAADIN/themes/runo/menubar/menubar.css @@ -30,6 +30,6 @@ line-height: 16px; padding-left: 10px; } -.v-menubar-submenu .v-menubar-menuitem-caption * { +.v-menubar-submenu .v-menubar-menuitem-caption .v-icon { vertical-align: middle; }
\ No newline at end of file |