aboutsummaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/themes
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2011-08-30 07:47:55 +0000
committerLeif Åstrand <leif@vaadin.com>2011-08-30 07:47:55 +0000
commitec9a9942ce91079389fef74091325853d7f09bc9 (patch)
tree3f6e8aa24f13a521bb172d1fc6b7f272dfcea56d /WebContent/VAADIN/themes
parenta121cfeb8f9c7ad504cb3a75de2a7c272f8eddeb (diff)
downloadvaadin-framework-ec9a9942ce91079389fef74091325853d7f09bc9.tar.gz
vaadin-framework-ec9a9942ce91079389fef74091325853d7f09bc9.zip
#5780 TreeTable uses images that not display transparent in IE6 - reverted previous fix causing problems with safari 4. Added new fix using gif-versions of the arrows in IE6
svn changeset:20726/svn branch:6.7
Diffstat (limited to 'WebContent/VAADIN/themes')
-rw-r--r--WebContent/VAADIN/themes/base/treetable/img/arrow-down.gifbin0 -> 1426 bytes
-rw-r--r--WebContent/VAADIN/themes/base/treetable/img/arrow-right.gifbin0 -> 1428 bytes
-rw-r--r--WebContent/VAADIN/themes/base/treetable/treetable.css30
3 files changed, 7 insertions, 23 deletions
diff --git a/WebContent/VAADIN/themes/base/treetable/img/arrow-down.gif b/WebContent/VAADIN/themes/base/treetable/img/arrow-down.gif
new file mode 100644
index 0000000000..ad599674a1
--- /dev/null
+++ b/WebContent/VAADIN/themes/base/treetable/img/arrow-down.gif
Binary files differ
diff --git a/WebContent/VAADIN/themes/base/treetable/img/arrow-right.gif b/WebContent/VAADIN/themes/base/treetable/img/arrow-right.gif
new file mode 100644
index 0000000000..cbe21ac7c0
--- /dev/null
+++ b/WebContent/VAADIN/themes/base/treetable/img/arrow-right.gif
Binary files differ
diff --git a/WebContent/VAADIN/themes/base/treetable/treetable.css b/WebContent/VAADIN/themes/base/treetable/treetable.css
index 2dd2b92197..f1fcf25542 100644
--- a/WebContent/VAADIN/themes/base/treetable/treetable.css
+++ b/WebContent/VAADIN/themes/base/treetable/treetable.css
@@ -1,7 +1,6 @@
.v-treetable-treespacer {
display: inline-block;
background: transparent;
- position: relative;
height: 9px;
/* defines the amount of indent per level */
width: 18px;
@@ -14,32 +13,17 @@
background: url(../treetable/img/arrow-right.png) right center no-repeat;
}
+.v-ie6 .v-treetable-node-closed {
+ background-image: url(../treetable/img/arrow-right.gif);
+}
+
.v-treetable-node-open {
background: url(../treetable/img/arrow-down.png) right center no-repeat;
}
-/* Show the tree arrows in a separate element in IE 6 to emulate background-position: right when using AlphaImageLoader */
-.v-ie6 .v-treetable-node-closed, .v-ie6 .v-treetable-node-open {
- background-image: none;
-}
-
-.v-treetable-spacer-ie {
- position: absolute;
- height: 9px;
- width: 10px;
- right: 0;
- top: -1px;
-}
-
-.v-treetable-node-closed .v-treetable-spacer-ie {
- /* vaadin.setAlphaImageLoader used to get relative paths (relative to the themeUrl) with AlphaImageLoader */
- zoom: expression((function(e) {vaadin.setAlphaImageLoader(e, "../base/treetable/img/arrow-right.png")})(this));
-}
-
-.v-treetable-node-open .v-treetable-spacer-ie {
- /* vaadin.setAlphaImageLoader used to get relative paths (relative to the themeUrl) with AlphaImageLoader */
- zoom: expression((function(e) {vaadin.setAlphaImageLoader(e, "../base/treetable/img/arrow-down.png")})(this));
-}
+.v-ie6 .v-treetable-node-open {
+ background-image: url(../treetable/img/arrow-down.gif);
+}
.v-treetable .v-checkbox {
display: inline-block;