diff options
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/themes/base/menubar/menubar.css | 27 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/styles.css | 27 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/menubar/menubar.css | 23 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/reindeer/styles.css | 48 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/runo/menubar/menubar.css | 3 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/runo/styles.css | 30 |
6 files changed, 111 insertions, 47 deletions
diff --git a/WebContent/VAADIN/themes/base/menubar/menubar.css b/WebContent/VAADIN/themes/base/menubar/menubar.css index e39598d7f2..610fb4d9b4 100644 --- a/WebContent/VAADIN/themes/base/menubar/menubar.css +++ b/WebContent/VAADIN/themes/base/menubar/menubar.css @@ -1,23 +1,20 @@ .v-menubar table { - white-space: nowrap; - border-collapse: collapse; - padding: 0; - margin: 0; -} -.v-menubar table { - white-space: nowrap; border-collapse: collapse; padding: 0; margin: 0; } .v-menubar .menuitem { cursor: default; + vertical-align: middle; + white-space: nowrap; +} +.v-menubar .menuitem * { + vertical-align: middle; } .v-menubar-submenu { background: #fff; } .v-menubar-submenu table { - white-space: nowrap; border-collapse: collapse; padding: 0; margin: 0; @@ -34,4 +31,18 @@ } .v-menubar-submenu .menuitem { cursor: default; + vertical-align: middle; + white-space: nowrap; +} +.v-menubar-submenu .menuitem * { + vertical-align: middle; +} +.v-menubar .v-menubar-submenu-indicator { + display: none; +} +.v-menubar-submenu .v-menubar-submenu-indicator { + margin-left: 1em; + float: right; + height: 100%; + font-size: 0.9em; }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index 5752bd803b..6fbb87bf51 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -622,25 +622,22 @@ div.v-app-loading { } .v-menubar table { - white-space: nowrap; - border-collapse: collapse; - padding: 0; - margin: 0; -} -.v-menubar table { - white-space: nowrap; border-collapse: collapse; padding: 0; margin: 0; } .v-menubar .menuitem { cursor: default; + vertical-align: middle; + white-space: nowrap; +} +.v-menubar .menuitem * { + vertical-align: middle; } .v-menubar-submenu { background: #fff; } .v-menubar-submenu table { - white-space: nowrap; border-collapse: collapse; padding: 0; margin: 0; @@ -657,6 +654,20 @@ div.v-app-loading { } .v-menubar-submenu .menuitem { cursor: default; + vertical-align: middle; + white-space: nowrap; +} +.v-menubar-submenu .menuitem * { + vertical-align: middle; +} +.v-menubar .v-menubar-submenu-indicator { + display: none; +} +.v-menubar-submenu .v-menubar-submenu-indicator { + margin-left: 1em; + float: right; + height: 100%; + font-size: 0.9em; } .v-Notification { 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 diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css index 99aa1d9b45..ad09f5b1e5 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -622,25 +622,22 @@ div.v-app-loading { } .v-menubar table { - white-space: nowrap; - border-collapse: collapse; - padding: 0; - margin: 0; -} -.v-menubar table { - white-space: nowrap; border-collapse: collapse; padding: 0; margin: 0; } .v-menubar .menuitem { cursor: default; + vertical-align: middle; + white-space: nowrap; +} +.v-menubar .menuitem * { + vertical-align: middle; } .v-menubar-submenu { background: #fff; } .v-menubar-submenu table { - white-space: nowrap; border-collapse: collapse; padding: 0; margin: 0; @@ -657,6 +654,20 @@ div.v-app-loading { } .v-menubar-submenu .menuitem { cursor: default; + vertical-align: middle; + white-space: nowrap; +} +.v-menubar-submenu .menuitem * { + vertical-align: middle; +} +.v-menubar .v-menubar-submenu-indicator { + display: none; +} +.v-menubar-submenu .v-menubar-submenu-indicator { + margin-left: 1em; + float: right; + height: 100%; + font-size: 0.9em; } .v-Notification { @@ -2979,12 +2990,13 @@ td.v-datefield-calendarpanel-nextyear { 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; @@ -2999,6 +3011,7 @@ td.v-datefield-calendarpanel-nextyear { .v-menubar-submenu .menuitem { padding: 1px 15px 1px 10px; height: 16px; + line-height: 16px; } .v-menubar .menuitem-selected, .v-menubar-submenu .menuitem-selected { @@ -3014,13 +3027,18 @@ td.v-datefield-calendarpanel-nextyear { -background-image: url(common/img/vertical-sprites-ie6.png); background-position: left -423px; } - -/* Submenu icon (remove after #2849 is fixed) */ -.v-menubar-submenu .menuitem img[align="right"] { - margin-right: -15px; +.v-menubar-submenu .v-menubar-submenu-indicator { + background: transparent url(menubar/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-ie .v-menubar-submenu .menuitem img[align="right"] { - margin-top: -14px; +.v-menubar-submenu .menuitem-selected .v-menubar-submenu-indicator { + background-image: url(menubar/img/submenu-icon-hover.png); } .v-Notification { diff --git a/WebContent/VAADIN/themes/runo/menubar/menubar.css b/WebContent/VAADIN/themes/runo/menubar/menubar.css index 650d00b1f2..6ef4b93fc6 100644 --- a/WebContent/VAADIN/themes/runo/menubar/menubar.css +++ b/WebContent/VAADIN/themes/runo/menubar/menubar.css @@ -29,4 +29,7 @@ .v-menubar-submenu .menuitem-selected { color: #fff; background: #5daee8; +} +.v-menubar-submenu .v-menubar-submenu-indicator { + margin-right: -3px; }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css index 17b09dde1f..815d09cdc3 100644 --- a/WebContent/VAADIN/themes/runo/styles.css +++ b/WebContent/VAADIN/themes/runo/styles.css @@ -622,25 +622,22 @@ div.v-app-loading { } .v-menubar table { - white-space: nowrap; - border-collapse: collapse; - padding: 0; - margin: 0; -} -.v-menubar table { - white-space: nowrap; border-collapse: collapse; padding: 0; margin: 0; } .v-menubar .menuitem { cursor: default; + vertical-align: middle; + white-space: nowrap; +} +.v-menubar .menuitem * { + vertical-align: middle; } .v-menubar-submenu { background: #fff; } .v-menubar-submenu table { - white-space: nowrap; border-collapse: collapse; padding: 0; margin: 0; @@ -657,6 +654,20 @@ div.v-app-loading { } .v-menubar-submenu .menuitem { cursor: default; + vertical-align: middle; + white-space: nowrap; +} +.v-menubar-submenu .menuitem * { + vertical-align: middle; +} +.v-menubar .v-menubar-submenu-indicator { + display: none; +} +.v-menubar-submenu .v-menubar-submenu-indicator { + margin-left: 1em; + float: right; + height: 100%; + font-size: 0.9em; } .v-Notification { @@ -2142,6 +2153,9 @@ div.v-tree-node-leaf { color: #fff; background: #5daee8; } +.v-menubar-submenu .v-menubar-submenu-indicator { + margin-right: -3px; +} .v-Notification { font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif; |