diff options
| author | Marc Englund <marc.englund@itmill.com> | 2012-01-18 14:06:23 +0000 |
|---|---|---|
| committer | Marc Englund <marc.englund@itmill.com> | 2012-01-18 14:06:23 +0000 |
| commit | 22eb633dcb50ea7ce302cdf4a0af127e44bf36f6 (patch) | |
| tree | 3be0991c26de56ca74435d2587020c444d94c953 /WebContent/VAADIN | |
| parent | 69d6bf76820929777168055bf0a941d691463a6b (diff) | |
| download | vaadin-framework-22eb633dcb50ea7ce302cdf4a0af127e44bf36f6.tar.gz vaadin-framework-22eb633dcb50ea7ce302cdf4a0af127e44bf36f6.zip | |
Merged patch found in #7111 from 6.7, also for #5095 #5096 #6996
svn changeset:22691/svn branch:6.8
Diffstat (limited to 'WebContent/VAADIN')
3 files changed, 5 insertions, 3 deletions
diff --git a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css index 6fae7381a1..0cae436002 100644 --- a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css +++ b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css @@ -95,7 +95,11 @@ padding: 0.2em 0.5em; } .v-tabsheet-tabitem .v-caption { - cursor: pointer; + cursor: inherit; +} +.v-tabsheet.v-disabled .v-tabsheet-tabitem, +.v-tabsheet-tabitemcell-disabled .v-tabsheet-tabitem { + cursor: default; } .v-tabsheet-tabitem-selected { cursor: default; diff --git a/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css index 1c52c27576..4ca7359094 100644 --- a/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css +++ b/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css @@ -105,7 +105,6 @@ width: 16px; height: 14px; overflow: hidden; - cursor: default; opacity: .5; filter: alpha(opacity=50); } diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.css index 217676558e..18ad5c9194 100644 --- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.css +++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.css @@ -24,7 +24,6 @@ width: 18px; height: 17px; overflow: hidden; - cursor: default; } .v-tabsheet-scroller button::-moz-focus-inner { border: none; |