diff options
author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2009-03-13 14:03:16 +0000 |
---|---|---|
committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2009-03-13 14:03:16 +0000 |
commit | 317c808505b7ce577e7879c3c2621a123345b99c (patch) | |
tree | 3ea1c63186f94942cd4793e00fcd99e6b0ec0da9 | |
parent | 1e34c818ca32198732264f224814b72933f0bdf5 (diff) | |
download | vaadin-framework-317c808505b7ce577e7879c3c2621a123345b99c.tar.gz vaadin-framework-317c808505b7ce577e7879c3c2621a123345b99c.zip |
css changes to fix FF2 and opera issues (#2652, #2749)
svn changeset:7080/svn branch:6.0
3 files changed, 34 insertions, 10 deletions
diff --git a/WebContent/ITMILL/themes/default/gridlayout/gridlayout.css b/WebContent/ITMILL/themes/default/gridlayout/gridlayout.css index 6e9205ca8a..493a952de6 100644 --- a/WebContent/ITMILL/themes/default/gridlayout/gridlayout.css +++ b/WebContent/ITMILL/themes/default/gridlayout/gridlayout.css @@ -33,7 +33,13 @@ padding-top:0px; } -.i-gridlayout { +/* Ensure that resizing gridlayout works in IE */ +* html .i-gridlayout { overflow:hidden; } +*+html .i-gridlayout { + overflow:hidden; +} + + diff --git a/WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css b/WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css index 01d9a78c5c..085ff1cee1 100644 --- a/WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css +++ b/WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css @@ -1,7 +1,3 @@ -.i-orderedlayout, .i-horizontallayout, .i-verticallayout { - overflow: hidden; -} - .i-orderedlayout-margin-top, .i-horizontallayout-margin-top, .i-verticallayout-margin-top { padding-top: 15px; } @@ -27,3 +23,13 @@ padding-top: 0px; padding-left: 0px; } + +/* + * To make sure IE don't expand elmenents larger than they should + */ +* html .i-orderedlayout, * html .i-horizontallayout, * html .i-verticallayout { + overflow: hidden; +} +*+html .i-orderedlayout, *+html .i-horizontallayout, *+html .i-verticallayout { + overflow: hidden; +} diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css index 88f18aff66..2e9c637b01 100644 --- a/WebContent/ITMILL/themes/default/styles.css +++ b/WebContent/ITMILL/themes/default/styles.css @@ -839,10 +839,16 @@ input.i-modified, padding-top:0px; } -.i-gridlayout { +/* Ensure that resizing gridlayout works in IE */ +* html .i-gridlayout { overflow:hidden; } +*+html .i-gridlayout { + overflow:hidden; +} + + /* ./WebContent/ITMILL/themes/default/link/link.css */ /** @@ -1015,10 +1021,6 @@ input.i-modified, } /* ./WebContent/ITMILL/themes/default/orderedlayout/orderedlayout.css */ -.i-orderedlayout, .i-horizontallayout, .i-verticallayout { - overflow: hidden; -} - .i-orderedlayout-margin-top, .i-horizontallayout-margin-top, .i-verticallayout-margin-top { padding-top: 15px; } @@ -1045,6 +1047,16 @@ input.i-modified, padding-left: 0px; } +/* + * To make sure IE don't expand elmenents larger than they should + */ +* html .i-orderedlayout, * html .i-horizontallayout, * html .i-verticallayout { + overflow: hidden; +} +*+html .i-orderedlayout, *+html .i-horizontallayout, *+html .i-verticallayout { + overflow: hidden; +} + /* ./WebContent/ITMILL/themes/default/panel/panel.css */ .i-panel, .i-panel-caption, |