summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes/base/tabsheet
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-01-27 14:17:08 +0200
committerArtur Signell <artur@vaadin.com>2012-01-27 14:17:08 +0200
commit8cc1ee0aa018012e6644723860a353d41d6af7f8 (patch)
tree65ce329c2b82a498be734cb94b5c0f7caaa33379 /WebContent/VAADIN/themes/base/tabsheet
parent08aef8e80937b3c81d8a6761827f72b65c25e71c (diff)
parent9d8b8ee4376b14ca91c9fbc20506f88943116807 (diff)
downloadvaadin-framework-8cc1ee0aa018012e6644723860a353d41d6af7f8.tar.gz
vaadin-framework-8cc1ee0aa018012e6644723860a353d41d6af7f8.zip
Merge remote-tracking branch 'origin/6.8'
Conflicts: WebContent/VAADIN/themes/base/table/table.css WebContent/release-notes.html build/build.xml src/com/vaadin/terminal/gwt/client/ApplicationConnection.java src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java src/com/vaadin/terminal/gwt/client/ui/VSlider.java src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java src/com/vaadin/terminal/gwt/client/ui/VWindow.java src/com/vaadin/ui/Table.java tests/integration_tests.xml tests/test.xml tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
Diffstat (limited to 'WebContent/VAADIN/themes/base/tabsheet')
-rw-r--r--WebContent/VAADIN/themes/base/tabsheet/tabsheet.css6
1 files changed, 5 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
index 7f978076b8..892b2958a4 100644
--- a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
@@ -88,7 +88,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;