From: Jouni Koivuviita Date: Thu, 8 Oct 2009 08:35:20 +0000 (+0000) Subject: Reverted some read-only style fixes. X-Git-Tag: 6.7.0.beta1~2422 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e60e59551c1d2e77edf6fd07b2edb4a8251a7406;p=vaadin-framework.git Reverted some read-only style fixes. svn changeset:9136/svn branch:6.2 --- diff --git a/WebContent/VAADIN/themes/base/select/select.css b/WebContent/VAADIN/themes/base/select/select.css index 5899b48664..2b7bb52e84 100644 --- a/WebContent/VAADIN/themes/base/select/select.css +++ b/WebContent/VAADIN/themes/base/select/select.css @@ -55,11 +55,15 @@ font-style: italic; } .v-filterselect-button { - cursor: pointer; float: right; + cursor: pointer; } .v-filterselect.v-readonly .v-filterselect-button { - cursor: default; + display: none; +} +.v-filterselect.v-readonly, +.v-filterselect.v-readonly .v-filterselect-input { + background: transparent; } .v-filterselect-suggestpopup { background: #fff; diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index 886de8cc1c..a1b560ec23 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -887,11 +887,15 @@ div.v-progressindicator-indeterminate-disabled { font-style: italic; } .v-filterselect-button { - cursor: pointer; float: right; + cursor: pointer; } .v-filterselect.v-readonly .v-filterselect-button { - cursor: default; + display: none; +} +.v-filterselect.v-readonly, +.v-filterselect.v-readonly .v-filterselect-input { + background: transparent; } .v-filterselect-suggestpopup { background: #fff; @@ -1406,6 +1410,11 @@ textarea.v-textarea-prompt { color: #999; font-style: italic; } +.v-textfield.v-readonly, +.v-textarea.v-readonly { + background: transparent; + border: none; +} .v-richtextarea { border: 1px solid #aaa; overflow: hidden; diff --git a/WebContent/VAADIN/themes/base/textfield/textfield.css b/WebContent/VAADIN/themes/base/textfield/textfield.css index b6209403b5..261970a204 100644 --- a/WebContent/VAADIN/themes/base/textfield/textfield.css +++ b/WebContent/VAADIN/themes/base/textfield/textfield.css @@ -11,6 +11,11 @@ textarea.v-textarea-prompt { color: #999; font-style: italic; } +.v-textfield.v-readonly, +.v-textarea.v-readonly { + background: transparent; + border: none; +} .v-richtextarea { border: 1px solid #aaa; overflow: hidden; diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css index 31575a32b2..65e64a0724 100644 --- a/WebContent/VAADIN/themes/reindeer/styles.css +++ b/WebContent/VAADIN/themes/reindeer/styles.css @@ -887,11 +887,15 @@ div.v-progressindicator-indeterminate-disabled { font-style: italic; } .v-filterselect-button { - cursor: pointer; float: right; + cursor: pointer; } .v-filterselect.v-readonly .v-filterselect-button { - cursor: default; + display: none; +} +.v-filterselect.v-readonly, +.v-filterselect.v-readonly .v-filterselect-input { + background: transparent; } .v-filterselect-suggestpopup { background: #fff; @@ -1406,6 +1410,11 @@ textarea.v-textarea-prompt { color: #999; font-style: italic; } +.v-textfield.v-readonly, +.v-textarea.v-readonly { + background: transparent; + border: none; +} .v-richtextarea { border: 1px solid #aaa; overflow: hidden; @@ -4401,6 +4410,19 @@ textarea.v-textarea-prompt { .black input.v-textfield-prompt { color: #5f6366; } +/* Readonly */ +input.v-textfield-readonly, +.v-sa input.v-textfield-readonly, +.v-ff35 input.v-textfield-readonly, +.black input.v-textfield-readonly, +.v-sa .black input.v-textfield-readonly, +.v-ff35 .black input.v-textfield-readonly { + border: none; + background: transparent; + -webkit-border-image: none; + -moz-border-image: none; + border-width: 0; +} .v-tree-node { background: transparent url(tree/img/arrows.png) no-repeat 6px -10px; diff --git a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css index 129ebc13bc..3909d325b5 100644 --- a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css +++ b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css @@ -123,4 +123,17 @@ textarea.v-textarea-prompt { .black input.v-textfield-prompt { color: #5f6366; +} +/* Readonly */ +input.v-textfield-readonly, +.v-sa input.v-textfield-readonly, +.v-ff35 input.v-textfield-readonly, +.black input.v-textfield-readonly, +.v-sa .black input.v-textfield-readonly, +.v-ff35 .black input.v-textfield-readonly { + border: none; + background: transparent; + -webkit-border-image: none; + -moz-border-image: none; + border-width: 0; } \ 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 ac1eaf18fc..2dc3917211 100644 --- a/WebContent/VAADIN/themes/runo/select/select.css +++ b/WebContent/VAADIN/themes/runo/select/select.css @@ -1,13 +1,13 @@ -.v-select-select { - font-size: 13px; -} -/* Twincol style */ -.v-select-twincol-options, -.v-select-twincol-selections { - font-size: 13px; -} -.v-select-twincol-buttons { - padding: 2px; /* does not work in first render in FF ? */ +.v-select-select { + font-size: 13px; +} +/* Twincol style */ +.v-select-twincol-options, +.v-select-twincol-selections { + font-size: 13px; +} +.v-select-twincol-buttons { + padding: 2px; /* does not work in first render in FF ? */ } /** Filterselect aka ComboBox styles */ @@ -26,9 +26,9 @@ margin: 0; padding: 3px 0 0 2px; font-size: 13px; -} -.v-filterselect-prompt .v-filterselect-input { - font-style: normal; +} +.v-filterselect-prompt .v-filterselect-input { + font-style: normal; } .v-filterselect-input:focus { /* remove safari/mac outline from this element */ @@ -53,8 +53,10 @@ } .v-disabled .v-filterselect-button:hover, .v-readonly .v-filterselect-button:hover { - background-position: top left; - cursor: default; + background-position: top left; +} +.v-filterselect.v-readonly .v-filterselect-input { + background: transparent; } .v-filterselect-suggestpopup { background: #f6f7f7; @@ -69,9 +71,9 @@ padding: 1px 6px; cursor: pointer; height: 18px; -} -.v-ff .v-filterselect-suggestmenu .gwt-MenuItem { - height: 20px; +} +.v-ff .v-filterselect-suggestmenu .gwt-MenuItem { + height: 20px; } .v-filterselect-suggestmenu .gwt-MenuItem .v-icon { margin-right: 3px; diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css index 95f65f5770..94d2f81d33 100644 --- a/WebContent/VAADIN/themes/runo/styles.css +++ b/WebContent/VAADIN/themes/runo/styles.css @@ -887,11 +887,15 @@ div.v-progressindicator-indeterminate-disabled { font-style: italic; } .v-filterselect-button { - cursor: pointer; float: right; + cursor: pointer; } .v-filterselect.v-readonly .v-filterselect-button { - cursor: default; + display: none; +} +.v-filterselect.v-readonly, +.v-filterselect.v-readonly .v-filterselect-input { + background: transparent; } .v-filterselect-suggestpopup { background: #fff; @@ -1406,6 +1410,11 @@ textarea.v-textarea-prompt { color: #999; font-style: italic; } +.v-textfield.v-readonly, +.v-textarea.v-readonly { + background: transparent; + border: none; +} .v-richtextarea { border: 1px solid #aaa; overflow: hidden; @@ -2414,7 +2423,9 @@ div.v-tree-node-leaf { .v-disabled .v-filterselect-button:hover, .v-readonly .v-filterselect-button:hover { background-position: top left; - cursor: default; +} +.v-filterselect.v-readonly .v-filterselect-input { + background: transparent; } .v-filterselect-suggestpopup { background: #f6f7f7;