summaryrefslogtreecommitdiffstats
path: root/WebContent
diff options
context:
space:
mode:
authorJouni Koivuviita <jouni.koivuviita@itmill.com>2009-11-09 14:36:28 +0000
committerJouni Koivuviita <jouni.koivuviita@itmill.com>2009-11-09 14:36:28 +0000
commitff991344bb16604fd60a1302c370edcaaf8f9cd1 (patch)
tree68be8a51d64b0b6f44dfccc7de78f5789b3dc94e /WebContent
parent80dc4982a2483b141bd05fa7bc66b685744594df (diff)
downloadvaadin-framework-ff991344bb16604fd60a1302c370edcaaf8f9cd1.tar.gz
vaadin-framework-ff991344bb16604fd60a1302c370edcaaf8f9cd1.zip
MenuBar fixes & enhancements
* fixes #3507: Menubar.MenuItem needs setEnabled() * "More" menuitem now presented as an arrow * menu opening/closing now more intuitive * client side stylename for menuitems changed to v-menuitem svn changeset:9688/svn branch:6.2
Diffstat (limited to 'WebContent')
-rw-r--r--WebContent/VAADIN/themes/base/menubar/menubar.css25
-rw-r--r--WebContent/VAADIN/themes/base/styles.css44
-rw-r--r--WebContent/VAADIN/themes/reindeer/menubar/menubar.css15
-rw-r--r--WebContent/VAADIN/themes/reindeer/styles.css62
-rw-r--r--WebContent/VAADIN/themes/runo/menubar/menubar.css14
-rw-r--r--WebContent/VAADIN/themes/runo/styles.css58
-rw-r--r--WebContent/VAADIN/themes/sampler/sampler/styles.css1
7 files changed, 150 insertions, 69 deletions
diff --git a/WebContent/VAADIN/themes/base/menubar/menubar.css b/WebContent/VAADIN/themes/base/menubar/menubar.css
index 610fb4d9b4..909d714f13 100644
--- a/WebContent/VAADIN/themes/base/menubar/menubar.css
+++ b/WebContent/VAADIN/themes/base/menubar/menubar.css
@@ -3,12 +3,12 @@
padding: 0;
margin: 0;
}
-.v-menubar .menuitem {
+.v-menubar .v-menubar-menuitem {
cursor: default;
vertical-align: middle;
white-space: nowrap;
}
-.v-menubar .menuitem * {
+.v-menubar .v-menubar-menuitem * {
vertical-align: middle;
}
.v-menubar-submenu {
@@ -24,25 +24,36 @@
padding: 0;
margin: 0;
}
-.v-menubar .menuitem-selected,
-.v-menubar-submenu .menuitem-selected {
+.v-menubar-menuitem-selected{
background: #333;
color: #fff;
}
-.v-menubar-submenu .menuitem {
+.v-menubar-submenu .v-menubar-menuitem {
cursor: default;
vertical-align: middle;
white-space: nowrap;
}
-.v-menubar-submenu .menuitem * {
+.v-menubar-submenu .v-menubar-menuitem * {
vertical-align: middle;
}
-.v-menubar .v-menubar-submenu-indicator {
+.v-menubar-submenu-indicator {
display: none;
+ /* Arial has the most coverage for geometric entity characters */
+ font-family: arial, helvetica, sans-serif;
}
.v-menubar-submenu .v-menubar-submenu-indicator {
+ display: inline;
+ display: inline-block;
+ zoom: 1;
margin-left: 1em;
float: right;
height: 100%;
font-size: 0.9em;
+}
+.v-menubar-menuitem-disabled {
+ color: #999;
+}
+.v-menubar-more-menuitem {
+ /* Arial has the most coverage for geometric entity characters */
+ font-family: arial, helvetica, sans-serif;
} \ No newline at end of file
diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index 6fbb87bf51..27afc8c299 100644
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
@@ -626,12 +626,12 @@ div.v-app-loading {
padding: 0;
margin: 0;
}
-.v-menubar .menuitem {
+.v-menubar .v-menubar-menuitem {
cursor: default;
vertical-align: middle;
white-space: nowrap;
}
-.v-menubar .menuitem * {
+.v-menubar .v-menubar-menuitem * {
vertical-align: middle;
}
.v-menubar-submenu {
@@ -647,28 +647,39 @@ div.v-app-loading {
padding: 0;
margin: 0;
}
-.v-menubar .menuitem-selected,
-.v-menubar-submenu .menuitem-selected {
+.v-menubar-menuitem-selected{
background: #333;
color: #fff;
}
-.v-menubar-submenu .menuitem {
+.v-menubar-submenu .v-menubar-menuitem {
cursor: default;
vertical-align: middle;
white-space: nowrap;
}
-.v-menubar-submenu .menuitem * {
+.v-menubar-submenu .v-menubar-menuitem * {
vertical-align: middle;
}
-.v-menubar .v-menubar-submenu-indicator {
+.v-menubar-submenu-indicator {
display: none;
+ /* Arial has the most coverage for geometric entity characters */
+ font-family: arial, helvetica, sans-serif;
}
.v-menubar-submenu .v-menubar-submenu-indicator {
+ display: inline;
+ display: inline-block;
+ zoom: 1;
margin-left: 1em;
float: right;
height: 100%;
font-size: 0.9em;
}
+.v-menubar-menuitem-disabled {
+ color: #999;
+}
+.v-menubar-more-menuitem {
+ /* Arial has the most coverage for geometric entity characters */
+ font-family: arial, helvetica, sans-serif;
+}
.v-Notification {
background: #999;
@@ -1377,6 +1388,19 @@ div.v-progressindicator-indeterminate-disabled {
.v-tabsheet-tabs .v-caption span {
white-space: nowrap;
}
+.v-tabsheet-caption-close {
+ display: inline;
+ display: inline-block;
+ zoom: 1;
+ width: 16px;
+ height: 16px;
+ background: url(common/img/close.png) no-repeat;
+ cursor: pointer;
+ vertical-align: middle;
+}
+.v-disabled .v-tabsheet-caption-close {
+ cursor: default;
+}
.v-tabsheet-tabitem {
border: 1px solid #aaa;
border-right: none;
@@ -1600,9 +1624,9 @@ div.v-tree-node-leaf {
position: absolute;
top: 0;
right: 0;
- width: 1em;
- height: 1em;
- background: red;
+ width: 16px;
+ height: 16px;
+ background: url(common/img/close.png) no-repeat;
cursor: pointer;
overflow: hidden;
}
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css
index ae156fa596..787453d15c 100644
--- a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css
+++ b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css
@@ -10,7 +10,7 @@
margin: 0 8px;
height: 23px;
}
-.v-menubar .menuitem {
+.v-menubar .v-menubar-menuitem {
padding: 3px 8px;
height: 17px;
line-height: 16px;
@@ -25,31 +25,28 @@
overflow: hidden;
padding: 4px 0;
}
-.v-menubar-submenu .menuitem {
+.v-menubar-submenu .v-menubar-menuitem {
padding: 1px 15px 1px 10px;
height: 16px;
line-height: 16px;
}
-.v-menubar .menuitem-selected,
-.v-menubar-submenu .menuitem-selected {
+.v-menubar .v-menubar-menuitem-selected,
+.v-menubar-submenu .v-menubar-menuitem-selected {
background: #4d749f repeat-x;
background-image: url(../common/img/sel-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */
color: #fff;
text-shadow: #3b5a7a 0 1px 0;
}
-.v-menubar .menuitem-selected {
+.v-menubar .v-menubar-menuitem-selected {
background-image: url(img/menu-sel-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */
}
.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 {
+.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
diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index ad09f5b1e5..02fbb27d08 100644
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -626,12 +626,12 @@ div.v-app-loading {
padding: 0;
margin: 0;
}
-.v-menubar .menuitem {
+.v-menubar .v-menubar-menuitem {
cursor: default;
vertical-align: middle;
white-space: nowrap;
}
-.v-menubar .menuitem * {
+.v-menubar .v-menubar-menuitem * {
vertical-align: middle;
}
.v-menubar-submenu {
@@ -647,28 +647,39 @@ div.v-app-loading {
padding: 0;
margin: 0;
}
-.v-menubar .menuitem-selected,
-.v-menubar-submenu .menuitem-selected {
+.v-menubar-menuitem-selected{
background: #333;
color: #fff;
}
-.v-menubar-submenu .menuitem {
+.v-menubar-submenu .v-menubar-menuitem {
cursor: default;
vertical-align: middle;
white-space: nowrap;
}
-.v-menubar-submenu .menuitem * {
+.v-menubar-submenu .v-menubar-menuitem * {
vertical-align: middle;
}
-.v-menubar .v-menubar-submenu-indicator {
+.v-menubar-submenu-indicator {
display: none;
+ /* Arial has the most coverage for geometric entity characters */
+ font-family: arial, helvetica, sans-serif;
}
.v-menubar-submenu .v-menubar-submenu-indicator {
+ display: inline;
+ display: inline-block;
+ zoom: 1;
margin-left: 1em;
float: right;
height: 100%;
font-size: 0.9em;
}
+.v-menubar-menuitem-disabled {
+ color: #999;
+}
+.v-menubar-more-menuitem {
+ /* Arial has the most coverage for geometric entity characters */
+ font-family: arial, helvetica, sans-serif;
+}
.v-Notification {
background: #999;
@@ -1377,6 +1388,19 @@ div.v-progressindicator-indeterminate-disabled {
.v-tabsheet-tabs .v-caption span {
white-space: nowrap;
}
+.v-tabsheet-caption-close {
+ display: inline;
+ display: inline-block;
+ zoom: 1;
+ width: 16px;
+ height: 16px;
+ background: url(../base/common/img/close.png) no-repeat;
+ cursor: pointer;
+ vertical-align: middle;
+}
+.v-disabled .v-tabsheet-caption-close {
+ cursor: default;
+}
.v-tabsheet-tabitem {
border: 1px solid #aaa;
border-right: none;
@@ -1600,9 +1624,9 @@ div.v-tree-node-leaf {
position: absolute;
top: 0;
right: 0;
- width: 1em;
- height: 1em;
- background: red;
+ width: 16px;
+ height: 16px;
+ background: url(../base/common/img/close.png) no-repeat;
cursor: pointer;
overflow: hidden;
}
@@ -2993,7 +3017,7 @@ td.v-datefield-calendarpanel-nextyear {
margin: 0 8px;
height: 23px;
}
-.v-menubar .menuitem {
+.v-menubar .v-menubar-menuitem {
padding: 3px 8px;
height: 17px;
line-height: 16px;
@@ -3008,13 +3032,13 @@ td.v-datefield-calendarpanel-nextyear {
overflow: hidden;
padding: 4px 0;
}
-.v-menubar-submenu .menuitem {
+.v-menubar-submenu .v-menubar-menuitem {
padding: 1px 15px 1px 10px;
height: 16px;
line-height: 16px;
}
-.v-menubar .menuitem-selected,
-.v-menubar-submenu .menuitem-selected {
+.v-menubar .v-menubar-menuitem-selected,
+.v-menubar-submenu .v-menubar-menuitem-selected {
background: #4d749f repeat-x;
background-image: url(common/img/vertical-sprites.png);
-background-image: url(common/img/vertical-sprites-ie6.png);
@@ -3022,22 +3046,19 @@ td.v-datefield-calendarpanel-nextyear {
color: #fff;
text-shadow: #3b5a7a 0 1px 0;
}
-.v-menubar .menuitem-selected {
+.v-menubar .v-menubar-menuitem-selected {
background-image: url(common/img/vertical-sprites.png);
-background-image: url(common/img/vertical-sprites-ie6.png);
background-position: left -423px;
}
.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-menubar-submenu .menuitem-selected .v-menubar-submenu-indicator {
+.v-menubar-submenu .v-menubar-menuitem-selected .v-menubar-submenu-indicator {
background-image: url(menubar/img/submenu-icon-hover.png);
}
@@ -3965,6 +3986,9 @@ td.v-datefield-calendarpanel-nextyear {
height: 16px;
line-height: 16px;
}
+.v-tabsheet-caption-close {
+
+}
.v-tabsheet-tabitemcell-selected {
background-image: url(common/img/vertical-sprites.png);
-background-image: url(common/img/vertical-sprites-ie6.png);
diff --git a/WebContent/VAADIN/themes/runo/menubar/menubar.css b/WebContent/VAADIN/themes/runo/menubar/menubar.css
index 6ef4b93fc6..55890d686f 100644
--- a/WebContent/VAADIN/themes/runo/menubar/menubar.css
+++ b/WebContent/VAADIN/themes/runo/menubar/menubar.css
@@ -1,14 +1,14 @@
.v-menubar {
color: #464f52;
- border: 1px solid #c6cbcc;
- border-right: none;
+ border-left: 1px solid #c6cbcc;
}
-.v-menubar .menuitem {
+.v-menubar .v-menubar-menuitem {
padding: 0 10px;
margin: 0 10px;
- border-right: 1px solid #c6cbcc;
+ border: 1px solid #c6cbcc;
+ border-left: none;
}
-.v-menubar .menuitem-selected {
+.v-menubar .v-menubar-menuitem-selected {
color: #fff;
background: #5daee8;
}
@@ -23,10 +23,10 @@
border-top: 1px solid #d0d4d5;
border-left: 1px solid #d0d4d5;
}
-.v-menubar-submenu .menuitem {
+.v-menubar-submenu .v-menubar-menuitem {
padding: 2px 10px;
}
-.v-menubar-submenu .menuitem-selected {
+.v-menubar-submenu .v-menubar-menuitem-selected {
color: #fff;
background: #5daee8;
}
diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index 815d09cdc3..cb949ff131 100644
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/styles.css
@@ -626,12 +626,12 @@ div.v-app-loading {
padding: 0;
margin: 0;
}
-.v-menubar .menuitem {
+.v-menubar .v-menubar-menuitem {
cursor: default;
vertical-align: middle;
white-space: nowrap;
}
-.v-menubar .menuitem * {
+.v-menubar .v-menubar-menuitem * {
vertical-align: middle;
}
.v-menubar-submenu {
@@ -647,28 +647,39 @@ div.v-app-loading {
padding: 0;
margin: 0;
}
-.v-menubar .menuitem-selected,
-.v-menubar-submenu .menuitem-selected {
+.v-menubar-menuitem-selected{
background: #333;
color: #fff;
}
-.v-menubar-submenu .menuitem {
+.v-menubar-submenu .v-menubar-menuitem {
cursor: default;
vertical-align: middle;
white-space: nowrap;
}
-.v-menubar-submenu .menuitem * {
+.v-menubar-submenu .v-menubar-menuitem * {
vertical-align: middle;
}
-.v-menubar .v-menubar-submenu-indicator {
+.v-menubar-submenu-indicator {
display: none;
+ /* Arial has the most coverage for geometric entity characters */
+ font-family: arial, helvetica, sans-serif;
}
.v-menubar-submenu .v-menubar-submenu-indicator {
+ display: inline;
+ display: inline-block;
+ zoom: 1;
margin-left: 1em;
float: right;
height: 100%;
font-size: 0.9em;
}
+.v-menubar-menuitem-disabled {
+ color: #999;
+}
+.v-menubar-more-menuitem {
+ /* Arial has the most coverage for geometric entity characters */
+ font-family: arial, helvetica, sans-serif;
+}
.v-Notification {
background: #999;
@@ -1377,6 +1388,19 @@ div.v-progressindicator-indeterminate-disabled {
.v-tabsheet-tabs .v-caption span {
white-space: nowrap;
}
+.v-tabsheet-caption-close {
+ display: inline;
+ display: inline-block;
+ zoom: 1;
+ width: 16px;
+ height: 16px;
+ background: url(../base/common/img/close.png) no-repeat;
+ cursor: pointer;
+ vertical-align: middle;
+}
+.v-disabled .v-tabsheet-caption-close {
+ cursor: default;
+}
.v-tabsheet-tabitem {
border: 1px solid #aaa;
border-right: none;
@@ -1600,9 +1624,9 @@ div.v-tree-node-leaf {
position: absolute;
top: 0;
right: 0;
- width: 1em;
- height: 1em;
- background: red;
+ width: 16px;
+ height: 16px;
+ background: url(../base/common/img/close.png) no-repeat;
cursor: pointer;
overflow: hidden;
}
@@ -2123,15 +2147,15 @@ div.v-tree-node-leaf {
.v-menubar {
color: #464f52;
- border: 1px solid #c6cbcc;
- border-right: none;
+ border-left: 1px solid #c6cbcc;
}
-.v-menubar .menuitem {
+.v-menubar .v-menubar-menuitem {
padding: 0 10px;
margin: 0 10px;
- border-right: 1px solid #c6cbcc;
+ border: 1px solid #c6cbcc;
+ border-left: none;
}
-.v-menubar .menuitem-selected {
+.v-menubar .v-menubar-menuitem-selected {
color: #fff;
background: #5daee8;
}
@@ -2146,10 +2170,10 @@ div.v-tree-node-leaf {
border-top: 1px solid #d0d4d5;
border-left: 1px solid #d0d4d5;
}
-.v-menubar-submenu .menuitem {
+.v-menubar-submenu .v-menubar-menuitem {
padding: 2px 10px;
}
-.v-menubar-submenu .menuitem-selected {
+.v-menubar-submenu .v-menubar-menuitem-selected {
color: #fff;
background: #5daee8;
}
diff --git a/WebContent/VAADIN/themes/sampler/sampler/styles.css b/WebContent/VAADIN/themes/sampler/sampler/styles.css
index a60db36a75..3eb778ab2d 100644
--- a/WebContent/VAADIN/themes/sampler/sampler/styles.css
+++ b/WebContent/VAADIN/themes/sampler/sampler/styles.css
@@ -304,6 +304,7 @@
line-height: 16px;
color: #787b7e;
float: left;
+ clear: left;
width: 155px;
height: 131px;
padding: 15px 175px 0 15px;