diff options
Diffstat (limited to 'WebContent/VAADIN/themes/base')
| -rw-r--r-- | WebContent/VAADIN/themes/base/button/button.css | 37 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/styles.css | 37 |
2 files changed, 12 insertions, 62 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;
}
diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css index def4572a00..2a7f982948 100644 --- a/WebContent/VAADIN/themes/base/styles.css +++ b/WebContent/VAADIN/themes/base/styles.css @@ -159,44 +159,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; } |