From 7fff35a8588eae4b0ebad74d0952ad5a94bef2a2 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Wed, 7 Oct 2009 10:40:37 +0000 Subject: Fix for #2611: ComboBox in readonly differs from readonly TextField svn changeset:9124/svn branch:6.2 --- WebContent/VAADIN/themes/base/datefield/datefield.css | 1 + WebContent/VAADIN/themes/base/select/select.css | 4 ++-- WebContent/VAADIN/themes/base/styles.css | 5 +++-- WebContent/VAADIN/themes/reindeer/styles.css | 5 +++-- WebContent/VAADIN/themes/runo/select/select.css | 7 ++----- WebContent/VAADIN/themes/runo/styles.css | 10 ++++------ 6 files changed, 15 insertions(+), 17 deletions(-) (limited to 'WebContent') diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.css b/WebContent/VAADIN/themes/base/datefield/datefield.css index 1427ff2195..720a80716f 100644 --- a/WebContent/VAADIN/themes/base/datefield/datefield.css +++ b/WebContent/VAADIN/themes/base/datefield/datefield.css @@ -1,5 +1,6 @@ .v-datefield { white-space: nowrap; + float: left; /* Force minimum width */ } .v-datefield-textfield { vertical-align: top; diff --git a/WebContent/VAADIN/themes/base/select/select.css b/WebContent/VAADIN/themes/base/select/select.css index 7da7c1201f..5899b48664 100644 --- a/WebContent/VAADIN/themes/base/select/select.css +++ b/WebContent/VAADIN/themes/base/select/select.css @@ -55,11 +55,11 @@ font-style: italic; } .v-filterselect-button { - float: right; cursor: pointer; + float: right; } .v-filterselect.v-readonly .v-filterselect-button { - display: none; + cursor: default; } .v-filterselect-suggestpopup { background: #fff; diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index 93258c44fc..886de8cc1c 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -454,6 +454,7 @@ div.v-app-loading { .v-datefield { white-space: nowrap; + float: left; /* Force minimum width */ } .v-datefield-textfield { vertical-align: top; @@ -886,11 +887,11 @@ div.v-progressindicator-indeterminate-disabled { font-style: italic; } .v-filterselect-button { - float: right; cursor: pointer; + float: right; } .v-filterselect.v-readonly .v-filterselect-button { - display: none; + cursor: default; } .v-filterselect-suggestpopup { background: #fff; diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css index 88b8acccc4..31575a32b2 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -454,6 +454,7 @@ div.v-app-loading { .v-datefield { white-space: nowrap; + float: left; /* Force minimum width */ } .v-datefield-textfield { vertical-align: top; @@ -886,11 +887,11 @@ div.v-progressindicator-indeterminate-disabled { font-style: italic; } .v-filterselect-button { - float: right; cursor: pointer; + float: right; } .v-filterselect.v-readonly .v-filterselect-button { - display: none; + cursor: default; } .v-filterselect-suggestpopup { background: #fff; diff --git a/WebContent/VAADIN/themes/runo/select/select.css b/WebContent/VAADIN/themes/runo/select/select.css index a677dde1c6..ac1eaf18fc 100644 --- a/WebContent/VAADIN/themes/runo/select/select.css +++ b/WebContent/VAADIN/themes/runo/select/select.css @@ -53,11 +53,8 @@ } .v-disabled .v-filterselect-button:hover, .v-readonly .v-filterselect-button:hover { - background-position: top left; -} -.v-filterselect.v-readonly .v-filterselect-input { - background: transparent; - color: black; + background-position: top left; + cursor: default; } .v-filterselect-suggestpopup { background: #f6f7f7; diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css index ec5fcb2de1..95f65f5770 100644 --- a/WebContent/VAADIN/themes/runo/styles.css +++ b/WebContent/VAADIN/themes/runo/styles.css @@ -454,6 +454,7 @@ div.v-app-loading { .v-datefield { white-space: nowrap; + float: left; /* Force minimum width */ } .v-datefield-textfield { vertical-align: top; @@ -886,11 +887,11 @@ div.v-progressindicator-indeterminate-disabled { font-style: italic; } .v-filterselect-button { - float: right; cursor: pointer; + float: right; } .v-filterselect.v-readonly .v-filterselect-button { - display: none; + cursor: default; } .v-filterselect-suggestpopup { background: #fff; @@ -2413,10 +2414,7 @@ div.v-tree-node-leaf { .v-disabled .v-filterselect-button:hover, .v-readonly .v-filterselect-button:hover { background-position: top left; -} -.v-filterselect.v-readonly .v-filterselect-input { - background: transparent; - color: black; + cursor: default; } .v-filterselect-suggestpopup { background: #f6f7f7; -- cgit v1.2.3