diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2010-05-21 12:06:51 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2010-05-21 12:06:51 +0000 |
| commit | 69c2c0d7ce71e857997cd82d3050fce52559fcb3 (patch) | |
| tree | be401899f605eda39c3a6dc1ab20a47e954dd550 /WebContent | |
| parent | eeb590805ab8875752282ad0810c679db50c8d4f (diff) | |
| parent | 211358bd93db47a63b74cab37e16e557ff363270 (diff) | |
| download | vaadin-framework-69c2c0d7ce71e857997cd82d3050fce52559fcb3.tar.gz vaadin-framework-69c2c0d7ce71e857997cd82d3050fce52559fcb3.zip | |
merged bug fixes from 6.3 to 6.4
svn changeset:13304/svn branch:6.4
Diffstat (limited to 'WebContent')
4 files changed, 14 insertions, 2 deletions
diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.css b/WebContent/VAADIN/themes/base/datefield/datefield.css index 0103be41da..e7a26a97fd 100644 --- a/WebContent/VAADIN/themes/base/datefield/datefield.css +++ b/WebContent/VAADIN/themes/base/datefield/datefield.css @@ -8,7 +8,7 @@ .v-datefield-button { cursor: pointer; } -.v-readonly .v-datefield-button { +.v-datefield .v-datefield-button-readonly { display: none; } .v-datefield-calendarpanel table { diff --git a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css index 8529082ea5..2ae4cb59ee 100644 --- a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css +++ b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css @@ -252,7 +252,7 @@ td.v-datefield-calendarpanel-nextyear { -webkit-border-bottom-right-radius: 0; height: 14px; } -.v-readonly input.v-datefield-textfield { +.v-datefield.v-readonly input.v-datefield-textfield { border-right-width: 1px; border-radius: 3px; -moz-border-radius: 3px; diff --git a/WebContent/VAADIN/themes/reindeer/select/select.css b/WebContent/VAADIN/themes/reindeer/select/select.css index 94c364df1b..f8ae987b8a 100644 --- a/WebContent/VAADIN/themes/reindeer/select/select.css +++ b/WebContent/VAADIN/themes/reindeer/select/select.css @@ -270,4 +270,10 @@ .v-ie6 .v-select-twincol-buttons .v-button { padding-left: 12px; padding-right: 12px; +} + +/* IE6 needs some help identifying when the input is readonly */ +.v-ie6 .v-filterselect.v-readonly, +.v-ie6 .v-filterselect .v-filterselect-input-readonly { + background: transparent; }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/runo/select/select.css b/WebContent/VAADIN/themes/runo/select/select.css index 2dc3917211..e00e033017 100644 --- a/WebContent/VAADIN/themes/runo/select/select.css +++ b/WebContent/VAADIN/themes/runo/select/select.css @@ -127,6 +127,12 @@ border-top: 1px solid #b6bbbc; } +/* IE6 needs some help identifying when the input is readonly */ +.v-ie6 .v-filterselect.v-readonly, +.v-ie6 .v-filterselect .v-filterselect-input-readonly { + background: transparent; +} + /* Error styles (disabled by default) ---------------------------------- |