diff options
author | Henri Sara <henri.sara@itmill.com> | 2011-06-16 07:19:43 +0000 |
---|---|---|
committer | Henri Sara <henri.sara@itmill.com> | 2011-06-16 07:19:43 +0000 |
commit | 79c52ac3d4756a6f8cbb94b9e7dc264ba61c5430 (patch) | |
tree | d2ede4345c21d3caffe5dd2873f10ccb4aabbfff /WebContent/VAADIN/themes/reindeer/menubar | |
parent | 3239587ad38fb20df82a235d732c10d88aebe5b8 (diff) | |
parent | 3547a37b82a25f2f8a7ecf4ca012094d62159ab3 (diff) | |
download | vaadin-framework-79c52ac3d4756a6f8cbb94b9e7dc264ba61c5430.tar.gz vaadin-framework-79c52ac3d4756a6f8cbb94b9e7dc264ba61c5430.zip |
Merge from 6.6
svn changeset:19412/svn branch:6.7
Diffstat (limited to 'WebContent/VAADIN/themes/reindeer/menubar')
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/menubar/img/checked-selected.png | bin | 0 -> 508 bytes | |||
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/menubar/img/checked.png | bin | 0 -> 393 bytes | |||
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png | bin | 0 -> 320 bytes | |||
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/menubar/img/unchecked.png | bin | 0 -> 261 bytes | |||
-rw-r--r-- | WebContent/VAADIN/themes/reindeer/menubar/menubar.css | 22 |
5 files changed, 21 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/checked-selected.png b/WebContent/VAADIN/themes/reindeer/menubar/img/checked-selected.png Binary files differnew file mode 100644 index 0000000000..192c404617 --- /dev/null +++ b/WebContent/VAADIN/themes/reindeer/menubar/img/checked-selected.png diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/checked.png b/WebContent/VAADIN/themes/reindeer/menubar/img/checked.png Binary files differnew file mode 100644 index 0000000000..418e951166 --- /dev/null +++ b/WebContent/VAADIN/themes/reindeer/menubar/img/checked.png diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png b/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png Binary files differnew file mode 100644 index 0000000000..bac6587c20 --- /dev/null +++ b/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked.png b/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked.png Binary files differnew file mode 100644 index 0000000000..92a2b582c5 --- /dev/null +++ b/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked.png diff --git a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css index f3e620353a..e5e337725e 100644 --- a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css +++ b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css @@ -49,4 +49,24 @@ } .v-menubar-submenu .v-menubar-menuitem-selected .v-menubar-submenu-indicator { background-image: url(img/submenu-icon-hover.png); -}
\ No newline at end of file +} + +/* Checkboxes for checkable/checked menu items */ +.v-menubar-submenu-check-column .v-menubar-menuitem { + padding-left: 6px; +} +.v-menubar-submenu-check-column .v-menubar-menuitem-caption { + padding-left: 18px; +} +.v-menubar-submenu .v-menubar-menuitem-checked .v-menubar-menuitem-caption { + background: transparent url(img/checked.png) no-repeat left; +} +.v-menubar-submenu .v-menubar-menuitem-unchecked .v-menubar-menuitem-caption { + background: transparent url(img/unchecked.png) no-repeat left; +} +.v-menubar-submenu .v-menubar-menuitem-selected-checked .v-menubar-menuitem-caption { + background: transparent url(img/checked-selected.png) no-repeat left; +} +.v-menubar-submenu .v-menubar-menuitem-selected-unchecked .v-menubar-menuitem-caption { + background: transparent url(img/unchecked-selected.png) no-repeat left; +} |