diff options
| author | Artur Signell <artur@vaadin.com> | 2012-01-27 14:17:08 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-01-27 14:17:08 +0200 |
| commit | 8cc1ee0aa018012e6644723860a353d41d6af7f8 (patch) | |
| tree | 65ce329c2b82a498be734cb94b5c0f7caaa33379 /WebContent/VAADIN/themes/base/table | |
| parent | 08aef8e80937b3c81d8a6761827f72b65c25e71c (diff) | |
| parent | 9d8b8ee4376b14ca91c9fbc20506f88943116807 (diff) | |
| download | vaadin-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/table')
| -rw-r--r-- | WebContent/VAADIN/themes/base/table/table.css | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/WebContent/VAADIN/themes/base/table/table.css b/WebContent/VAADIN/themes/base/table/table.css index e2b2a16ffe..877faf364f 100644 --- a/WebContent/VAADIN/themes/base/table/table.css +++ b/WebContent/VAADIN/themes/base/table/table.css @@ -49,6 +49,12 @@ cursor: pointer; } +.v-table.v-disabled .v-table-header-cell, +.v-table.v-disabled .v-table-header-cell-asc, +.v-table.v-disabled .v-table-header-cell-desc { + cursor: default; +} + .v-table-footer-wrap { overflow: hidden; border: 1px solid #aaa; @@ -85,6 +91,9 @@ width: 1px; overflow: hidden; } +.v-table.v-disabled .v-table-resizer { + cursor: default; +} .v-table-caption-container { overflow: hidden; white-space: nowrap; @@ -174,6 +183,9 @@ position: relative; /* hide this from IE, it works without it */ cursor: pointer; } +.v-table.v-disabled .v-table-column-selector { + cursor: default; +} .v-table-focus-slot-left { border-left: 2px solid #999; float: none; |