diff options
| author | Jouni Koivuviita <jouni.koivuviita@itmill.com> | 2009-02-17 14:37:23 +0000 |
|---|---|---|
| committer | Jouni Koivuviita <jouni.koivuviita@itmill.com> | 2009-02-17 14:37:23 +0000 |
| commit | 44636af465e5bdc12fb94ab892c565d03f54354b (patch) | |
| tree | 8bfceb1d62acadf30e14020f3f665e9e053ebb39 /WebContent | |
| parent | 795cd1ae440b540b14f07d800de48de90cf68c3e (diff) | |
| download | vaadin-framework-44636af465e5bdc12fb94ab892c565d03f54354b.tar.gz vaadin-framework-44636af465e5bdc12fb94ab892c565d03f54354b.zip | |
Fixes the last issue in #1245: ITree wraps captions in IE6.
svn changeset:6878/svn branch:trunk
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/ITMILL/themes/default/styles.css | 45 | ||||
| -rw-r--r-- | WebContent/ITMILL/themes/default/tree/tree.css | 45 |
2 files changed, 48 insertions, 42 deletions
diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css index 146e51f6b2..88f18aff66 100644 --- a/WebContent/ITMILL/themes/default/styles.css +++ b/WebContent/ITMILL/themes/default/styles.css @@ -2526,27 +2526,6 @@ input.i-modified, text-align: left /* Force default alignment */ } -/* ie6compatnode is hidden from non ie6 browsers, for ie6 - * uses weird hack to sink all events properly - */ -.i-tree-node-ie6compatnode { - display: none; -} - -* html .i-tree-node-ie6compatnode { - display: inline; - float:left; - background: orange; - margin:0; - width:14px; - height:10px; - padding:1px; - filter: Alpha(opacity=0); -} -* html .i-tree-node { - clear: both; -} - .i-tree-node { background: transparent url(tree/img/collapsed.png) no-repeat 2px 1px; } @@ -2575,6 +2554,30 @@ input.i-modified, padding-left: 16px; } + +/* ie6compatnode is hidden from non ie6 browsers, for ie6 + * uses weird hack to sink all events properly + */ +.i-tree-node-ie6compatnode { + display: none; +} + +/* IMPORTANT keep the offsetWidth of this element the same as the margin-left of i-tree-node-caption */ +.i-ie6 .i-tree-node-ie6compatnode { + display: inline; + float: left; + background: orange; + margin: 0; + width: 14px; + height: 10px; + padding: 1px; + filter: Alpha(opacity=0); +} +.i-ie6 .i-tree-node, +.i-ie6 .i-tree-node-children { + clear: left; +} + /* ./WebContent/ITMILL/themes/default/window/window.css */ .i-window { color: #464f52; diff --git a/WebContent/ITMILL/themes/default/tree/tree.css b/WebContent/ITMILL/themes/default/tree/tree.css index 067483ebb0..ec3a776182 100644 --- a/WebContent/ITMILL/themes/default/tree/tree.css +++ b/WebContent/ITMILL/themes/default/tree/tree.css @@ -2,27 +2,6 @@ text-align: left /* Force default alignment */ } -/* ie6compatnode is hidden from non ie6 browsers, for ie6 - * uses weird hack to sink all events properly - */ -.i-tree-node-ie6compatnode { - display: none; -} - -* html .i-tree-node-ie6compatnode { - display: inline; - float:left; - background: orange; - margin:0; - width:14px; - height:10px; - padding:1px; - filter: Alpha(opacity=0); -} -* html .i-tree-node { - clear: both; -} - .i-tree-node { background: transparent url(img/collapsed.png) no-repeat 2px 1px; } @@ -50,3 +29,27 @@ .i-tree-node-children { padding-left: 16px; } + + +/* ie6compatnode is hidden from non ie6 browsers, for ie6 + * uses weird hack to sink all events properly + */ +.i-tree-node-ie6compatnode { + display: none; +} + +/* IMPORTANT keep the offsetWidth of this element the same as the margin-left of i-tree-node-caption */ +.i-ie6 .i-tree-node-ie6compatnode { + display: inline; + float: left; + background: orange; + margin: 0; + width: 14px; + height: 10px; + padding: 1px; + filter: Alpha(opacity=0); +} +.i-ie6 .i-tree-node, +.i-ie6 .i-tree-node-children { + clear: left; +}
\ No newline at end of file |