From: Joonas Lehtinen Date: Thu, 3 Jul 2008 08:29:56 +0000 (+0000) Subject: Rollbackking [5002] from button.css X-Git-Tag: 6.7.0.beta1~4509 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ed68f05a1d4d84468e752da4339afec82cf2bcd3;p=vaadin-framework.git Rollbackking [5002] from button.css svn changeset:5013/svn branch:trunk --- diff --git a/WebContent/ITMILL/themes/default/button/button.css b/WebContent/ITMILL/themes/default/button/button.css index 19bdb742f5..65b4f87172 100644 --- a/WebContent/ITMILL/themes/default/button/button.css +++ b/WebContent/ITMILL/themes/default/button/button.css @@ -44,24 +44,3 @@ background-color: #FFE0E0; } */ - -.i-checkbox *, .i-button * { - float: left; -} - -.i-checkbox:after, .i-button:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} - -.i-checkbox, .i-button { - display: inline-block; -} - -/* Hides from IE-mac \*/ -* html .i-caption, * html .i-orderedlayout-wrap { height: 1%; } -.i-caption, .i-orderedlayout-wrap { display: block; } -/* End hide from IE-mac */ diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css index f19394780a..eacde80159 100644 --- a/WebContent/ITMILL/themes/default/styles.css +++ b/WebContent/ITMILL/themes/default/styles.css @@ -49,6 +49,19 @@ text-decoration: underline; } +/* fixes streched buttons in IE6 */ +* html .i-button { + overflow: visible; + padding-left: 10px; + padding-right: 10px; +} +/* fixes streched buttons in IE7 */ +*+html .i-button { + overflow: visible; + padding-left: 10px; + padding-right: 10px; +} + /* Disabled by default .i-checkbox-error { background:transparent; @@ -62,27 +75,6 @@ background-color: #FFE0E0; } */ - -.i-checkbox *, .i-button * { - float: left; -} - -.i-checkbox:after, .i-button:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} - -.i-checkbox, .i-button { - display: inline-block; -} - -/* Hides from IE-mac \*/ -* html .i-caption, * html .i-orderedlayout-wrap { height: 1%; } -.i-caption, .i-orderedlayout-wrap { display: block; } -/* End hide from IE-mac */ /* Provide some extra whitespace for wrapped elements (these elements usually need the extra space, since they aren't even handling their own caption) */