summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes/base/button
diff options
context:
space:
mode:
authorJouni Koivuviita <jouni.koivuviita@itmill.com>2009-09-03 12:01:31 +0000
committerJouni Koivuviita <jouni.koivuviita@itmill.com>2009-09-03 12:01:31 +0000
commit85ff099f917fe62051ae99819884da5303775146 (patch)
tree354f6c9eda512247b2a0636fea23c5c68d6ba1c0 /WebContent/VAADIN/themes/base/button
parent7b4ee8d70ef4742002dc1b605bf470e01b218b5a (diff)
downloadvaadin-framework-85ff099f917fe62051ae99819884da5303775146.tar.gz
vaadin-framework-85ff099f917fe62051ae99819884da5303775146.zip
Fixes #3028: CheckBox captions wrap in IE
svn changeset:8652/svn branch:6.1
Diffstat (limited to 'WebContent/VAADIN/themes/base/button')
-rw-r--r--WebContent/VAADIN/themes/base/button/button.css37
1 files changed, 6 insertions, 31 deletions
diff --git a/WebContent/VAADIN/themes/base/button/button.css b/WebContent/VAADIN/themes/base/button/button.css
index 4e5c032af0..9dbc5e8309 100644
--- a/WebContent/VAADIN/themes/base/button/button.css
+++ b/WebContent/VAADIN/themes/base/button/button.css
@@ -125,44 +125,19 @@
.v-checkbox,
.v-checkbox label,
-.v-checkbox input {
+.v-checkbox input,
+.v-checkbox .v-icon {
vertical-align: middle;
white-space: nowrap;
}
-.v-checkbox img {
- display: inline;
- vertical-align: middle;
- margin-right: 3px;
+.v-checkbox .v-icon {
+ margin: 0 2px;
}
.v-checkbox .v-errorindicator {
float: none;
display: inline;
- padding-left: 1em;
- background-position: left;
-}
-/* Error indicator on checkbox fix for IE6 */
-.v-ie6 .v-checkbox * {
- float: left;
- display: inline; /* In effect, does nothing, since float:left forces block-rendering, but will fix "double-float-margin-bug" */
-}
-.v-ie6 .v-checkbox .v-errorindicator {
- background-position: right;
- display: inline;
- float: left;
- padding-left: 0;
- padding-right: 0.4em;
-}
-/* Error indicator on checkbox fix for IE7 */
-.v-ie7 .v-checkbox *,
-.v-ie8 .v-checkbox * {
- float: left;
-}
-.v-ie7 .v-checkbox .v-errorindicator,
-.v-ie8 .v-checkbox .v-errorindicator {
- background-position: right;
- float: left;
- padding-left: 0;
- padding-right: 0.7em;
+ display: inline-block;
+ zoom: 1;
}